diff -ruN /usr/ports//math/jakarta-commons-math3/Makefile ./Makefile --- /usr/ports//math/jakarta-commons-math3/Makefile 2014-02-21 19:38:05.000000000 +0600 +++ ./Makefile 2014-04-20 01:45:24.420065460 +0600 @@ -2,47 +2,34 @@ # $FreeBSD: head/math/jakarta-commons-math3/Makefile 345420 2014-02-21 13:38:05Z ehaupt $ PORTNAME= commons-math3 -PORTVERSION= 3.1 +PORTVERSION= 3.2 CATEGORIES= math java -MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE} -MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-math3,math,} +MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE}/:source1 \ + http://repo1.maven.org/maven2/junit/junit/4.8.2/:source2 +MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-math3,math,}/:source1 PKGNAMEPREFIX= jakarta- -DISTNAME= ${PORTNAME}-${PORTVERSION}-src +DISTFILES= ${PORTNAME}-${PORTVERSION}-src.tar.gz:source1 \ + junit-4.8.2.jar:source2 +EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}-src.tar.gz MAINTAINER= 5u623l20@gmail.com COMMENT= Java library of self-contained mathematics and statistics components -BUILD_DEPENDS= ${JAVAJARDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging \ - ${JAVAJARDIR}/junit.jar:${PORTSDIR}/java/junit \ - ${JAVAJARDIR}/commons-discovery.jar:${PORTSDIR}/java/jakarta-commons-discovery -RUN_DEPENDS= ${JAVAJARDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging \ - ${JAVAJARDIR}/commons-discovery.jar:${PORTSDIR}/java/jakarta-commons-discovery +LICENSE= APACHE20 + +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-src USE_JAVA= yes JAVA_VERSION= 1.6+ USE_ANT= yes ALL_TARGET= jar -MAKE_ARGS= -Dlibdir=${WRKDIR} -Dnoget=true \ - -Dcommons-logging.jar="file://${JAVAJARDIR}/commons-logging.jar" \ - -Dcommons-discovery.jar="file://${JAVAJARDIR}/commons-discovery.jar" - -COMMONS_LOGGING_API= ${LOCALBASE}/share/doc/commons-logging/api -.if exists(${COMMONS_LOGGING_API}) -MAKE_ARGS+= -Dcommons-logging.api=${COMMONS_LOGGING_API} -.endif - -COMMONS_DISCOVERY_API= ${LOCALBASE}/share/doc/commons-discovery/api -.if exists(${COMMONS_DISCOVERY_API}) -MAKE_ARGS+= -Dcommons-logging.api=${COMMONS_DISCOVERY_API} -.endif +MAKE_ARGS= -Dlibdir=${WRKDIR} -Dnoget=true JARFILE= ${PORTNAME:S,3,,}-${PORTVERSION}-SNAPSHOT.jar DESTJARFILE= ${PORTNAME}.jar PLIST_FILES+= %%JAVAJARDIR%%/${DESTJARFILE} -NO_STAGE= yes - OPTIONS_DEFINE= DOCS .include @@ -53,30 +40,28 @@ 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 +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} +MAKE_ARGS+= -Djdk.api=$$(${JDK_API}) .endif -post-patch: - ${REINPLACE_CMD} -e 's#4.4##g' \ - -e 's#junit-#junit#g' \ - -e 's#/usr/share/junit#${JAVAJARDIR}#g' \ - ${WRKSRC}/build.xml +post-extract: + ${MKDIR} ${WRKSRC}/lib + ${CP} ${DISTDIR}/junit-4.8.2.jar ${WRKSRC}/lib/ do-install: @${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${DESTJARFILE}..." - @${MKDIR} ${JAVAJARDIR} - @${INSTALL_DATA} ${WRKSRC}/target/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE} + @${MKDIR} ${STAGEDIR}${JAVAJARDIR} + @${INSTALL_DATA} ${WRKSRC}/target/${JARFILE} ${STAGEDIR}${JAVAJARDIR}/${DESTJARFILE} @${ECHO_MSG} " [ DONE ]" .if ${PORT_OPTIONS:MDOCS} @${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..." - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} @cd ${WRKSRC}/target \ - && ${FIND} -s apidocs -type d -exec ${MKDIR} ${DOCSDIR}/{} \; \ - && ${FIND} -s apidocs -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \; - @${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/ + && ${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 ]" .endif diff -ruN /usr/ports//math/jakarta-commons-math3/distinfo ./distinfo --- /usr/ports//math/jakarta-commons-math3/distinfo 2014-04-19 18:50:25.465782033 +0600 +++ ./distinfo 2014-04-19 18:59:59.633742318 +0600 @@ -1,2 +1,4 @@ -SHA256 (commons-math3-3.1-src.tar.gz) = 0cd25ae24b5d026f729f3be9fac7a3cc0ad3b6b5352335e63538c53c0a54470c -SIZE (commons-math3-3.1-src.tar.gz) = 2481249 +SHA256 (commons-math3-3.2-src.tar.gz) = 07992f0630aea0e973c41a34330fe8109b867fc30507b566142a62ec2e483310 +SIZE (commons-math3-3.2-src.tar.gz) = 2602474 +SHA256 (junit-4.8.2.jar) = a2aa2c3bb2b72da76c3e6a71531f1eefdc350494819baf2b1d80d7146e020f9e +SIZE (junit-4.8.2.jar) = 237344 diff -ruN /usr/ports//math/jakarta-commons-math3/files/patch-build.xml ./files/patch-build.xml --- /usr/ports//math/jakarta-commons-math3/files/patch-build.xml 1970-01-01 06:00:00.000000000 +0600 +++ ./files/patch-build.xml 2014-04-19 21:20:56.166173831 +0600 @@ -0,0 +1,47 @@ +--- build.xml.bak 2014-04-19 21:14:45.345201138 +0600 ++++ build.xml 2014-04-19 21:17:15.132174422 +0600 +@@ -52,7 +52,7 @@ + + + +- ++ + + + +@@ -174,7 +174,7 @@ + + + +- ++ + + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + +