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

[Steve Wills]

Author: swills
Date: Sat Jun 14 02:23:00 2014
New Revision: 357730
URL: http://svnweb.freebsd.org/changeset/ports/357730
QAT: https://qat.redports.org/buildarchive/r357730/

Log:
  - Update to 3.3
  - Enabled build on JDK 1.7 since newer version builds with 1.7 with the MAKE_ENV set
  - Disable tests since they are fail intermittently due to system load
  - Remove echo during install and unmute install commands
  
  PR:		190721
  Submitted by:	swills (myself)
  Approved by:	Muhammad Moinur Rahman <5u623l20 at gmail.com> (maintainer) (all except test disable)

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

Modified: head/math/jakarta-commons-math3/Makefile
==============================================================================
--- head/math/jakarta-commons-math3/Makefile	Sat Jun 14 01:00:58 2014	(r357729)
+++ head/math/jakarta-commons-math3/Makefile	Sat Jun 14 02:23:00 2014	(r357730)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	commons-math3
-PORTVERSION=	3.2
+PORTVERSION=	3.3
 CATEGORIES=	math java
 MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}/:source1 \
 		http://repo1.maven.org/maven2/junit/junit/4.8.2/:source2
@@ -20,7 +20,7 @@ LICENSE=	APACHE20
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6
+JAVA_VERSION=	1.6+
 USE_ANT=	yes
 
 ALL_TARGET=	jar
@@ -32,6 +32,8 @@ PLIST_FILES+=	%%JAVAJARDIR%%/${DESTJARFI
 
 OPTIONS_DEFINE=	DOCS
 
+MAKE_ENV=	LANG=en_US.ISO8859-1
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
@@ -50,19 +52,15 @@ post-extract:
 	${CP} ${DISTDIR}/junit-4.8.2.jar ${WRKSRC}/lib/
 
 do-install:
-	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${DESTJARFILE}..."
-	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
-	@${INSTALL_DATA} ${WRKSRC}/target/${JARFILE} ${STAGEDIR}${JAVAJARDIR}/${DESTJARFILE}
-	@${ECHO_MSG} " [ DONE ]"
+	${MKDIR} ${STAGEDIR}${JAVAJARDIR}
+	${INSTALL_DATA} ${WRKSRC}/target/${JARFILE} ${STAGEDIR}${JAVAJARDIR}/${DESTJARFILE}
 
 .if ${PORT_OPTIONS:MDOCS}
-	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@cd ${WRKSRC}/target \
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	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}/
-	@${ECHO_MSG} " [ DONE ]"
+	${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>

Modified: head/math/jakarta-commons-math3/distinfo
==============================================================================
--- head/math/jakarta-commons-math3/distinfo	Sat Jun 14 01:00:58 2014	(r357729)
+++ head/math/jakarta-commons-math3/distinfo	Sat Jun 14 02:23:00 2014	(r357730)
@@ -1,4 +1,4 @@
-SHA256 (commons-math3-3.2-src.tar.gz) = 07992f0630aea0e973c41a34330fe8109b867fc30507b566142a62ec2e483310
-SIZE (commons-math3-3.2-src.tar.gz) = 2602474
+SHA256 (commons-math3-3.3-src.tar.gz) = f0803e31a6361fe6a0fc105e33b084211dbf7efb8c419415e783fa1fe4855e0b
+SIZE (commons-math3-3.3-src.tar.gz) = 3409107
 SHA256 (junit-4.8.2.jar) = a2aa2c3bb2b72da76c3e6a71531f1eefdc350494819baf2b1d80d7146e020f9e
 SIZE (junit-4.8.2.jar) = 237344

Modified: head/math/jakarta-commons-math3/files/patch-build.xml
==============================================================================
--- head/math/jakarta-commons-math3/files/patch-build.xml	Sat Jun 14 01:00:58 2014	(r357729)
+++ head/math/jakarta-commons-math3/files/patch-build.xml	Sat Jun 14 02:23:00 2014	(r357730)
@@ -1,11 +1,11 @@
---- build.xml.bak	2014-04-19 21:14:45.345201138 +0600
-+++ build.xml	2014-04-19 21:17:15.132174422 +0600
+--- build.xml.orig	2014-05-07 20:40:45.000000000 +0000
++++ build.xml	2014-06-13 18:53:29.152647282 +0000
 @@ -52,7 +52,7 @@
    <property name="component.title"         value="Commons MATH"/>
  
    <!-- The current version number of this component -->
 -  <property name="component.version"       value="3.1-SNAPSHOT"/>
-+  <property name="component.version"       value="3.2-SNAPSHOT"/>
++  <property name="component.version"       value="3.3-SNAPSHOT"/>
  
    <!-- The base directory for component sources -->
    <property name="source.home"             value="src/main/java"/>
@@ -18,8 +18,21 @@
  
        <javac srcdir="${test.home}"
               destdir="${build.home}/test-classes"
-@@ -341,26 +341,5 @@
-   <target name="gump" depends="clean,test,javadoc,jar" description="Gump Target - clean,test,javadoc,jar"/>
+@@ -256,7 +256,7 @@
+ 
+ <!-- ========== Create Jar ================================================ -->
+ 
+-  <target name="jar" depends="test" description="Create jar file">
++  <target name="jar" description="Create jar file">
+ 
+     <copy file="LICENSE.txt" tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
+     <copy file="NOTICE.txt"  tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
+@@ -339,29 +339,8 @@
+ 
+ <!-- ========== Gump Target ===================================================== -->
+ 
+-  <target name="gump" depends="clean,test,javadoc,jar" description="Gump Target - clean,test,javadoc,jar"/>
++  <target name="gump" depends="clean,javadoc,jar" description="Gump Target - clean,javadoc,jar"/>
  
  
 -<!-- ========== Download Dependencies =========================================== -->