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

Fri Jan 24 19:02:47 UTC 2020

Author: pfg
Date: Fri Jan 24 19:02:45 2020
New Revision: 523978
URL: https://svnweb.freebsd.org/changeset/ports/523978

Log:
  math/jakarta-commons-math3 update and rename to apache-commons-math
  
  Unbreak and move as it now an Apache Commons project.
  
  PR:		241380
  Approved by:	bofh (maintainer)

Added:
  head/math/apache-commons-math/
     - copied from r523977, head/math/jakarta-commons-math3/
Deleted:
  head/math/jakarta-commons-math3/
Modified:
  head/MOVED
  head/math/Makefile
  head/math/apache-commons-math/Makefile
  head/math/apache-commons-math/distinfo
  head/math/apache-commons-math/files/patch-build.xml
  head/math/apache-commons-math/pkg-descr

Modified: head/MOVED
==============================================================================

--- head/MOVED	Fri Jan 24 18:26:04 2020	(r523977)
+++ head/MOVED	Fri Jan 24 19:02:45 2020	(r523978)
@@ -13750,3 +13750,4 @@ graphics/py-pivy-devel|graphics/py-pivy|2020-01-17|Thi
 net/py-coherence||2020-01-18|fails with python-3.X, and python-2.7 is EOLed (GH bug#32)
 net/py-upnp-inspector||2020-01-18|Missing dependency: net/py-coherence is python-2.7-only
 security/py-pymacaroons-pynacl|security/py-pymacaroons|2020-01-20|Rename to match upstream naming
+math/jakarta-commons-math3|apache-commons-math|2020-01-24|Renamed upstream

Modified: head/math/Makefile
==============================================================================
--- head/math/Makefile	Fri Jan 24 18:26:04 2020	(r523977)
+++ head/math/Makefile	Fri Jan 24 19:02:45 2020	(r523978)
@@ -132,6 +132,7 @@
     SUBDIR += ann
     SUBDIR += antic
     SUBDIR += apc
+    SUBDIR += apache-commons-math
     SUBDIR += apron
     SUBDIR += arb
     SUBDIR += aribas
@@ -300,7 +301,6 @@
     SUBDIR += ised
     SUBDIR += jacal
     SUBDIR += jags
-    SUBDIR += jakarta-commons-math3
     SUBDIR += jama
     SUBDIR += jeuclid
     SUBDIR += jlatexmath

Modified: head/math/apache-commons-math/Makefile
==============================================================================
--- head/math/jakarta-commons-math3/Makefile	Fri Jan 24 18:26:04 2020	(r523977)
+++ head/math/apache-commons-math/Makefile	Fri Jan 24 19:02:45 2020	(r523978)
@@ -1,13 +1,13 @@
 # Created by: Muhammad Moinur Rahmanh <5u623l20 at gmail.com>
 # $FreeBSD$
 
-PORTNAME=	commons-math3
-PORTVERSION=	3.3
+PORTNAME=	commons-math
+PORTVERSION=	3.6.1
 CATEGORIES=	math java
 MASTER_SITES=	APACHE_COMMONS_SOURCE \
 		http://repo1.maven.org/maven2/junit/junit/4.8.2/:source2
-PKGNAMEPREFIX=	jakarta-
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
+PKGNAMEPREFIX=	apache-
+DISTNAME=	${PORTNAME}3-${PORTVERSION}-src
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		junit-4.8.2.jar:source2
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
@@ -15,8 +15,6 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	bofh at FreeBSD.org
 COMMENT=	Java library of self-contained mathematics and statistics components
 
-BROKEN=		unfetchable
-
 LICENSE=	APACHE20
 
 BROKEN_armv6=		fails to compile: build.xml: Compile failed; see the compiler error output for details
@@ -29,9 +27,9 @@ USE_LOCALE=	en_US.ISO8859-1
 ALL_TARGET=	jar
 MAKE_ARGS=	-Dlibdir=${WRKDIR} -Dnoget=true
 
-JARFILE=	${PORTNAME:S,3,,}-${PORTVERSION}-SNAPSHOT.jar
+JARFILE=	${PORTNAME:S,3,,}-3.6.jar
 DESTJARFILE=	${PORTNAME}.jar
-PLIST_FILES+=	%%JAVAJARDIR%%/${DESTJARFILE}
+PLIST_FILES+=	${JAVAJARDIR}/${DESTJARFILE}
 
 OPTIONS_DEFINE=	DOCS
 
@@ -43,11 +41,6 @@ OTHERDOCS=	LICENSE.txt NOTICE.txt
 PORTDOCS=	apidocs ${OTHERDOCS}
 .endif
 
-JDK_API=	${FIND} -s ${LOCALBASE}/share/doc/jdk1.? -maxdepth 1 -name api -type d 2>/dev/null || ${ECHO_CMD} | ${TAIL} -n 1
-.if ${JDK_API} != ""
-MAKE_ARGS+=	-Djdk.api=$$(${JDK_API})
-.endif
-
 post-extract:
 	${MKDIR} ${WRKSRC}/lib
 	${CP} ${DISTDIR}/junit-4.8.2.jar ${WRKSRC}/lib/
@@ -57,11 +50,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/target/${JARFILE} ${STAGEDIR}${JAVAJARDIR}/${DESTJARFILE}
 
 .if ${PORT_OPTIONS:MDOCS}
-	${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}/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/apidocs
+	(cd ${WRKSRC}/target/apidocs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/apidocs/${SDIR})
+	${INSTALL_DATA} ${WRKSRC}/*.txt ${STAGEDIR}${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>

Modified: head/math/apache-commons-math/distinfo
==============================================================================
--- head/math/jakarta-commons-math3/distinfo	Fri Jan 24 18:26:04 2020	(r523977)
+++ head/math/apache-commons-math/distinfo	Fri Jan 24 19:02:45 2020	(r523978)
@@ -1,4 +1,5 @@
-SHA256 (commons-math3-3.3-src.tar.gz) = f0803e31a6361fe6a0fc105e33b084211dbf7efb8c419415e783fa1fe4855e0b
-SIZE (commons-math3-3.3-src.tar.gz) = 3409107
+TIMESTAMP = 1571601170
+SHA256 (commons-math3-3.6.1-src.tar.gz) = 46171449bcfb7d76912275ed1af9ef7de03f7eb1cb9a801e3faf304cc8f586a6
+SIZE (commons-math3-3.6.1-src.tar.gz) = 3665572
 SHA256 (junit-4.8.2.jar) = a2aa2c3bb2b72da76c3e6a71531f1eefdc350494819baf2b1d80d7146e020f9e
 SIZE (junit-4.8.2.jar) = 237344

Modified: head/math/apache-commons-math/files/patch-build.xml
==============================================================================
--- head/math/jakarta-commons-math3/files/patch-build.xml	Fri Jan 24 18:26:04 2020	(r523977)
+++ head/math/apache-commons-math/files/patch-build.xml	Fri Jan 24 19:02:45 2020	(r523978)
@@ -1,14 +1,5 @@
---- 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.3-SNAPSHOT"/>
- 
-   <!-- The base directory for component sources -->
-   <property name="source.home"             value="src/main/java"/>
+--- build.xml.orig	2016-03-17 12:14:52 UTC
++++ build.xml
 @@ -174,7 +174,7 @@
  
  <!-- ========== Unit Test Targets ========================================= -->
@@ -27,20 +18,21 @@
  
      <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 @@
+@@ -339,38 +339,11 @@
  
  <!-- ========== 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"/>
++  <target name="gump" depends="clean,javadoc,jar" description="Gump Target - clean,test,javadoc,jar"/>
  
  
--<!-- ========== Download Dependencies =========================================== -->
--
+ <!-- ========== Download Dependencies =========================================== -->
+ 
 -    <target name="download-dependencies" 
--           depends="check-availability" unless="skip.download">
+-         depends="check-availability" unless="skip.download">
 -        <echo message="doing download-dependencies..." />
 -        <antcall target="download-junit" />
+-        <antcall target="download-hamcrest" />
 -    </target>
 -
 -    <target name="check-availability">
@@ -55,6 +47,14 @@
 -            usetimestamp="true" ignoreerrors="true"
 -            src="http://repo1.maven.org/maven2/junit/junit/${junit.version}/junit-${junit.version}.jar"/>
 -    </target>
--      
+-
+-	<target name="download-hamcrest" unless="hamcrest.found">
+-	        <echo message="Downloading hamcrest..."/>
+-	        <mkdir dir="${download.lib.dir}" />
+-	        <get dest="${download.lib.dir}/${hamcrest.jar}"
+-	            usetimestamp="true" ignoreerrors="true"
+-	            src="http://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
+-	</target>
+       
  </project>
  

Modified: head/math/apache-commons-math/pkg-descr
==============================================================================
--- head/math/jakarta-commons-math3/pkg-descr	Fri Jan 24 18:26:04 2020	(r523977)
+++ head/math/apache-commons-math/pkg-descr	Fri Jan 24 19:02:45 2020	(r523978)
@@ -2,4 +2,16 @@ Commons Math is a library of lightweight, self-contain
 statistics components addressing the most common problems not available in the
 Java programming language or Commons Lang.
 
-WWW: http://jakarta.apache.org/commons/math/
+Guiding principles:
+
+ * Real-world application use cases determine development priority.
+ * This package emphasizes small, easily integrated components rather than
+	large libraries with complex dependencies and configurations.
+ * All algorithms are fully documented and follow generally accepted best
+	practices.
+ * In situations where multiple standard algorithms exist, a Strategy pattern
+	is used to support multiple implementations.
+ * Limited dependencies. No external dependencies beyond Commons components
+	and the core Java platform.
+
+WWW: http://commons.apache.org/proper/commons-math/
