svn commit: r391394 - in head/math/jakarta-commons-math: . files

[Muhammad Moinur Rahman]

Author: bofh
Date: Mon Jul  6 08:57:43 2015
New Revision: 391394
URL: https://svnweb.freebsd.org/changeset/ports/391394

Log:
  math/jakarta-commons-math: Restrict build to 1.6 and 1.7 [1]
  
  - Unmute INSTALL_ macros
  - Fix patch files to reflect 'make makepatch'
  
  PR:		201352 [1]
  Submitted by:	glewis [1]

Modified:
  head/math/jakarta-commons-math/Makefile
  head/math/jakarta-commons-math/files/patch-build.xml

Modified: head/math/jakarta-commons-math/Makefile
==============================================================================
--- head/math/jakarta-commons-math/Makefile	Mon Jul  6 08:17:38 2015	(r391393)
+++ head/math/jakarta-commons-math/Makefile	Mon Jul  6 08:57:43 2015	(r391394)
@@ -19,7 +19,7 @@ COMMENT=	Java library of self-contained 
 LICENSE=	APACHE20
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
+JAVA_VERSION=	1.6 1.7
 USE_ANT=	yes
 
 ALL_TARGET=	jar
@@ -53,7 +53,7 @@ post-extract:
 do-install:
 	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${DESTJARFILE}..."
 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
-	@${INSTALL_DATA} ${WRKSRC}/target/${JARFILE} ${STAGEDIR}${JAVAJARDIR}/${DESTJARFILE}
+	${INSTALL_DATA} ${WRKSRC}/target/${JARFILE} ${STAGEDIR}${JAVAJARDIR}/${DESTJARFILE}
 	@${ECHO_MSG} " [ DONE ]"
 
 .if ${PORT_OPTIONS:MDOCS}
@@ -62,7 +62,7 @@ do-install:
 	@cd ${WRKSRC}/target \
 	  && ${FIND} -s apidocs -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; \
 	  && ${FIND} -s apidocs -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \;
-	@${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
 	@${ECHO_MSG} " [ DONE ]"
 .endif
 

Modified: head/math/jakarta-commons-math/files/patch-build.xml
==============================================================================
--- head/math/jakarta-commons-math/files/patch-build.xml	Mon Jul  6 08:17:38 2015	(r391393)
+++ head/math/jakarta-commons-math/files/patch-build.xml	Mon Jul  6 08:57:43 2015	(r391394)
@@ -1,5 +1,5 @@
---- build.xml.bak	2014-04-19 21:14:45.345201138 +0600
-+++ build.xml	2014-04-19 21:17:15.132174422 +0600
+--- build.xml.orig	2011-02-26 18:12:55 UTC
++++ build.xml
 @@ -167,7 +167,7 @@
  
  <!-- ========== Unit Test Targets ========================================= -->