Date: Tue, 1 Sep 2009 07:09:34 GMT From: Wen Heping <wenheping@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/138437: [Maintainer Update]math/jakarta-commons-math:update to 2.0 Message-ID: <200909010709.n8179YoQ002347@www.freebsd.org> Resent-Message-ID: <200909010710.n817A5Ga093455@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 138437
>Category: ports
>Synopsis: [Maintainer Update]math/jakarta-commons-math:update to 2.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Sep 01 07:10:05 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Wen Heping
>Release: FreeBSD 8.0-Current
>Organization:
ChangAn Middle School
>Environment:
FreeBSD fb8.wenjing.com 8.0-CURRENT FreeBSD 8.0-CURRENT #4: Fri Apr 10 16:36:28 HKT 2009 root@fb8.wenjing.com:/usr/obj/usr/src/sys/wen1 i386
>Description:
update to 2.0 from 1.2
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -urN jakarta-commons-math/Makefile jakarta-commons-math.new/Makefile
--- jakarta-commons-math/Makefile 2009-09-01 16:28:30.000000000 +0800
+++ jakarta-commons-math.new/Makefile 2009-09-01 17:06:39.000000000 +0800
@@ -6,7 +6,7 @@
#
PORTNAME= commons-math
-PORTVERSION= 1.2
+PORTVERSION= 2.0
CATEGORIES= math java
MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE}
MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,}
@@ -29,10 +29,12 @@
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}
@@ -41,7 +43,7 @@
.if !defined(NOPORTDOCS)
ALL_TARGET+= javadoc
OTHERDOCS= LICENSE.txt NOTICE.txt
-PORTDOCS= api ${OTHERDOCS}
+PORTDOCS= apidocs ${OTHERDOCS}
.endif
JARFILE= ${PORTNAME}-${PORTVERSION}.jar
DESTJARFILE= ${PORTNAME}.jar
@@ -63,9 +65,9 @@
.if !defined(NOPORTDOCS)
@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
@${MKDIR} ${DOCSDIR}
- @cd ${WRKSRC}/dist/docs \
- && ${FIND} -s api -type d -exec ${MKDIR} ${DOCSDIR}/{} \; \
- && ${FIND} -s api -type f -exec ${INSTALL_DATA} {} ${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}/
@${ECHO_MSG} " [ DONE ]"
.endif
diff -urN jakarta-commons-math/distinfo jakarta-commons-math.new/distinfo
--- jakarta-commons-math/distinfo 2009-09-01 16:28:32.000000000 +0800
+++ jakarta-commons-math.new/distinfo 2009-09-01 16:39:31.000000000 +0800
@@ -1,3 +1,3 @@
-MD5 (commons-math-1.2-src.tar.gz) = d1c24d181e4ec8233ad164db371aa2c5
-SHA256 (commons-math-1.2-src.tar.gz) = 7ce779da04546b29f5b5401c327ff317879808ce0c228796240c6265a36aea4b
-SIZE (commons-math-1.2-src.tar.gz) = 602243
+MD5 (commons-math-2.0-src.tar.gz) = 0572a2e542c0e138328466ff2c8dafce
+SHA256 (commons-math-2.0-src.tar.gz) = 5c40855b63e5614fd68f77a45588c92ccd4af2e8162d9ebee3e33e225b04b802
+SIZE (commons-math-2.0-src.tar.gz) = 1044286
diff -urN jakarta-commons-math/files/patch-build.xml jakarta-commons-math.new/files/patch-build.xml
--- jakarta-commons-math/files/patch-build.xml 2006-06-20 17:23:05.000000000 +0800
+++ jakarta-commons-math.new/files/patch-build.xml 1970-01-01 08:00:00.000000000 +0800
@@ -1,14 +0,0 @@
-$FreeBSD: ports/math/jakarta-commons-math/files/patch-build.xml,v 1.2 2006/06/20 09:23:05 hq Exp $
-
---- build.xml.orig Sun Dec 18 20:37:46 2005
-+++ build.xml Tue Jun 20 11:16:15 2006
-@@ -179,6 +179,9 @@
- <property name="title" value="Math 1.1 API">
- </property>
- <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="${basedir}/src/java" packagenames="org.apache.commons.math.*">
-+ <link offline="true" packagelistLoc="${commons-discovery.api}" href="${commons-discovery.api}"/>
-+ <link offline="true" packagelistLoc="${commons-discovery.api}" href="${commons-discovery.api}"/>
-+ <link offline="true" packagelistLoc="${jdk.api}" href="${jdk.api}"/>
- <classpath>
- <path refid="build.classpath">
- </path>
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200909010709.n8179YoQ002347>