diff options
Diffstat (limited to 'math')
| -rw-r--r-- | math/Makefile | 2 | ||||
| -rw-r--r-- | math/apache-commons-math/Makefile (renamed from math/jakarta-commons-math3/Makefile) | 27 | ||||
| -rw-r--r-- | math/apache-commons-math/distinfo | 5 | ||||
| -rw-r--r-- | math/apache-commons-math/files/patch-build.xml (renamed from math/jakarta-commons-math3/files/patch-build.xml) | 34 | ||||
| -rw-r--r-- | math/apache-commons-math/pkg-descr | 17 | ||||
| -rw-r--r-- | math/jakarta-commons-math3/distinfo | 4 | ||||
| -rw-r--r-- | math/jakarta-commons-math3/pkg-descr | 5 |
7 files changed, 49 insertions, 45 deletions
diff --git a/math/Makefile b/math/Makefile index b880e0840d54..09bd7ac9214a 100644 --- a/math/Makefile +++ b/math/Makefile @@ -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 diff --git a/math/jakarta-commons-math3/Makefile b/math/apache-commons-math/Makefile index 5e885ab3e9ad..8093a59cc4a1 100644 --- a/math/jakarta-commons-math3/Makefile +++ b/math/apache-commons-math/Makefile @@ -1,13 +1,13 @@ # Created by: Muhammad Moinur Rahmanh <5u623l20@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@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> diff --git a/math/apache-commons-math/distinfo b/math/apache-commons-math/distinfo new file mode 100644 index 000000000000..860016f63547 --- /dev/null +++ b/math/apache-commons-math/distinfo @@ -0,0 +1,5 @@ +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 diff --git a/math/jakarta-commons-math3/files/patch-build.xml b/math/apache-commons-math/files/patch-build.xml index afc0843e6093..256c8c63f281 100644 --- a/math/jakarta-commons-math3/files/patch-build.xml +++ b/math/apache-commons-math/files/patch-build.xml @@ -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> diff --git a/math/apache-commons-math/pkg-descr b/math/apache-commons-math/pkg-descr new file mode 100644 index 000000000000..3a15b8bccae8 --- /dev/null +++ b/math/apache-commons-math/pkg-descr @@ -0,0 +1,17 @@ +Commons Math is a library of lightweight, self-contained mathematics and +statistics components addressing the most common problems not available in the +Java programming language or Commons Lang. + +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/ diff --git a/math/jakarta-commons-math3/distinfo b/math/jakarta-commons-math3/distinfo deleted file mode 100644 index fede7ab3d7a4..000000000000 --- a/math/jakarta-commons-math3/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -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 diff --git a/math/jakarta-commons-math3/pkg-descr b/math/jakarta-commons-math3/pkg-descr deleted file mode 100644 index 483415d92224..000000000000 --- a/math/jakarta-commons-math3/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Commons Math is a library of lightweight, self-contained mathematics and -statistics components addressing the most common problems not available in the -Java programming language or Commons Lang. - -WWW: http://jakarta.apache.org/commons/math/ |