Attachment #141906 for bug #188820

View | Details | Raw Unified | Return to bug 188820
Collapse All | Expand All





PORTNAME=	commons-math
PORTVERSION=	2.2
PORTREVISION=	1
CATEGORIES=	math java
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-math,math,}/:source1
PKGNAMEPREFIX=	jakarta-
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

LICENSE=	APACHE20

WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
RUN_DEPENDS=	${JAVAJARDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging \
		${JAVAJARDIR}/commons-discovery.jar:${PORTSDIR}/java/jakarta-commons-discovery

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

JARFILE=	${PORTNAME:S,3,,}-${PORTVERSION}.jar
DESTJARFILE=	${PORTNAME}.jar
PLIST_FILES+=	%%JAVAJARDIR%%/${DESTJARFILE}
.endif

OPTIONS_DEFINE=	DOCS

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MDOCS}
ALL_TARGET+=	javadoc
OTHERDOCS=	LICENSE.txt NOTICE.txt
PORTDOCS=	apidocs ${OTHERDOCS}
.endif
JARFILE=	${PORTNAME}-${PORTVERSION}.jar
DESTJARFILE=	${PORTNAME}.jar
PLIST_FILES+=	%%JAVAJARDIR%%/${DESTJARFILE}

NO_STAGE=	yes
.include <bsd.port.pre.mk>

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/
			${WRKSRC}/build.xml

do-install:
	@${ECHO_MSG} -n ">> Installing JAR as ${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} ${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 ]"
.endif

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)./distinfo (+2 lines)
1	SHA256 (commons-math-2.2-src.tar.gz) = a7624c3a3e2581d9905f1f1090c78c25448678bddcec2a48a4dc8a80f16ed1b8	1	SHA256 (commons-math-2.2-src.tar.gz) = a7624c3a3e2581d9905f1f1090c78c25448678bddcec2a48a4dc8a80f16ed1b8
2	SIZE (commons-math-2.2-src.tar.gz) = 1321209	2	SIZE (commons-math-2.2-src.tar.gz) = 1321209
		3	SHA256 (junit-4.8.2.jar) = a2aa2c3bb2b72da76c3e6a71531f1eefdc350494819baf2b1d80d7146e020f9e
		4	SIZE (junit-4.8.2.jar) = 237344




--- build.xml.bak	2014-04-19 21:14:45.345201138 +0600
+++ build.xml	2014-04-19 21:17:15.132174422 +0600
@@ -167,7 +167,7 @@
   <!-- Junit -->
   <property name="junit.version"           value="4.8.2"/>
   <property name="junit.home"              value="/usr/share/junit"/>
-  <property name="junit.jar"               value="${junit.home}/junit-${junit.version}.jar"/>
+  <property name="junit.jar"               value="${junit.home}/junit.jar"/>
 
 <!-- ========== Unit Test Targets ========================================= -->
 
-    <target name="compile.tests" depends="compile, download-dependencies" description="Compile unit tests.">
+    <target name="compile.tests" depends="compile" description="Compile unit tests.">
 
       <javac srcdir="${test.home}"
              destdir="${build.home}/test-classes"
@@ -332,27 +332,5 @@
 
   <target name="gump" depends="clean,test,javadoc,jar" description="Gump Target - clean,test,javadoc,jar"/>
 
-
-<!-- ========== Download Dependencies =========================================== -->
-
-    <target name="download-dependencies" 
-           depends="check-availability" unless="skip.download">
-        <echo message="doing download-dependencies..." />
-        <antcall target="download-junit" />
-    </target>
-
-    <target name="check-availability">
-        <echo message="doing check-availability..." />
-        <available file="${junit.jar}" property="junit.found"/>
-    </target>
-
-    <target name="download-junit" unless="junit.found">
-        <echo message="Downloading junit..."/>
-        <mkdir dir="${download.lib.dir}" />
-        <get dest="${download.lib.dir}/junit-${junit.version}.jar"
-            usetimestamp="true" ignoreerrors="true"
-            src="http://repo1.maven.org/maven2/junit/junit/${junit.version}/junit-${junit.version}.jar"/>
-    </target>
-      
 </project>
 
 <!-- ========== Component Declarations ==================================== -->

Return to bug 188820

Lines 3-78 Link Here

(-)./Makefile (-41 / +32 lines)
3		3
4	PORTNAME= commons-math	4	PORTNAME= commons-math
5	PORTVERSION= 2.2	5	PORTVERSION= 2.2
		6	PORTREVISION= 1
6	CATEGORIES= math java	7	CATEGORIES= math java
7	MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE}	8	MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE}/:source1 \
8	MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,}	9	http://repo1.maven.org/maven2/junit/junit/4.8.2/:source2
		10	MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-math,math,}/:source1
9	PKGNAMEPREFIX= jakarta-	11	PKGNAMEPREFIX= jakarta-
10	DISTNAME= ${PORTNAME}-${PORTVERSION}-src	12	DISTFILES= ${PORTNAME}-${PORTVERSION}-src.tar.gz:source1 \
		13	junit-4.8.2.jar:source2
		14	EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}-src.tar.gz
11		15
12	MAINTAINER= 5u623l20@gmail.com	16	MAINTAINER= 5u623l20@gmail.com
13	COMMENT= Java library of self-contained mathematics and statistics components	17	COMMENT= Java library of self-contained mathematics and statistics components
14		18
15	BUILD_DEPENDS= ${JAVAJARDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging \	19	LICENSE= APACHE20
16	${JAVAJARDIR}/junit.jar:${PORTSDIR}/java/junit \	20
17	${JAVAJARDIR}/commons-discovery.jar:${PORTSDIR}/java/jakarta-commons-discovery	21	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
18	RUN_DEPENDS= ${JAVAJARDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging \
19	${JAVAJARDIR}/commons-discovery.jar:${PORTSDIR}/java/jakarta-commons-discovery
20		22
21	USE_JAVA= yes	23	USE_JAVA= yes
22	JAVA_VERSION= 1.6+	24	JAVA_VERSION= 1.6+
23	USE_ANT= yes	25	USE_ANT= yes
24		26
25	ALL_TARGET= jar	27	ALL_TARGET= jar
26	MAKE_ARGS= -Dlibdir=${WRKDIR} -Dnoget=true \	28	MAKE_ARGS= -Dlibdir=${WRKDIR} -Dnoget=true
27	-Dcommons-logging.jar="file://${JAVAJARDIR}/commons-logging.jar" \
28	-Dcommons-discovery.jar="file://${JAVAJARDIR}/commons-discovery.jar"
29
30	COMMONS_LOGGING_API= ${LOCALBASE}/share/doc/commons-logging/api
31	.if exists(${COMMONS_LOGGING_API})
32	MAKE_ARGS+= -Dcommons-logging.api=${COMMONS_LOGGING_API}
33	.endif
34		29
35	COMMONS_DISCOVERY_API= ${LOCALBASE}/share/doc/commons-discovery/api	30	JARFILE= ${PORTNAME:S,3,,}-${PORTVERSION}.jar
36	.if exists(${COMMONS_DISCOVERY_API})	31	DESTJARFILE= ${PORTNAME}.jar
37	MAKE_ARGS+= -Dcommons-logging.api=${COMMONS_DISCOVERY_API}	32	PLIST_FILES+= %%JAVAJARDIR%%/${DESTJARFILE}
38	.endif
39		33
40	.if !defined(NOPORTDOCS)	34	OPTIONS_DEFINE= DOCS
		35
		36	.include <bsd.port.options.mk>
		37
		38	.if ${PORT_OPTIONS:MDOCS}
41	ALL_TARGET+= javadoc	39	ALL_TARGET+= javadoc
42	OTHERDOCS= LICENSE.txt NOTICE.txt	40	OTHERDOCS= LICENSE.txt NOTICE.txt
43	PORTDOCS= apidocs ${OTHERDOCS}	41	PORTDOCS= apidocs ${OTHERDOCS}
44	.endif	42	.endif
45	JARFILE= ${PORTNAME}-${PORTVERSION}.jar
46	DESTJARFILE= ${PORTNAME}.jar
47	PLIST_FILES+= %%JAVAJARDIR%%/${DESTJARFILE}
48
49	NO_STAGE= yes
50	.include <bsd.port.pre.mk>
51		43
52	JDK_API!= (${FIND} -s ${LOCALBASE}/share/doc/jdk1.? -maxdepth 1 -name api -type d 2>/dev/null \|\| ${ECHO_CMD}) \| ${TAIL} -n 1	44	JDK_API= ${FIND} -s ${LOCALBASE}/share/doc/jdk1.? -maxdepth 1 -name api -type d 2>/dev/null \|\| ${ECHO_CMD} \| ${TAIL} -n 1
53	.if ${JDK_API} != ""	45	.if ${JDK_API} != ""
54	MAKE_ARGS+= -Djdk.api=${JDK_API}	46	MAKE_ARGS+= -Djdk.api=$$(${JDK_API})
55	.endif	47	.endif
56		48
57	post-patch:	49	post-extract:
58	${REINPLACE_CMD} -e 's#junit-#junit#g' \	50	${MKDIR} ${WRKSRC}/lib
59	-e 's#/usr/share/junit#${JAVAJARDIR}#g' \	51	${CP} ${DISTDIR}/junit-4.8.2.jar ${WRKSRC}/lib/
60	${WRKSRC}/build.xml
61		52
62	do-install:	53	do-install:
63	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${DESTJARFILE}..."	54	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${DESTJARFILE}..."
64	@${MKDIR} ${JAVAJARDIR}	55	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
65	@${INSTALL_DATA} ${WRKSRC}/target/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE}	56	@${INSTALL_DATA} ${WRKSRC}/target/${JARFILE} ${STAGEDIR}${JAVAJARDIR}/${DESTJARFILE}
66	@${ECHO_MSG} " [ DONE ]"	57	@${ECHO_MSG} " [ DONE ]"
67		58
68	.if !defined(NOPORTDOCS)	59	.if ${PORT_OPTIONS:MDOCS}
69	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."	60	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
70	@${MKDIR} ${DOCSDIR}	61	@${MKDIR} ${STAGEDIR}${DOCSDIR}
71	@cd ${WRKSRC}/target \	62	@cd ${WRKSRC}/target \
72	&& ${FIND} -s apidocs -type d -exec ${MKDIR} ${DOCSDIR}/{} \; \	63	&& ${FIND} -s apidocs -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; \
73	&& ${FIND} -s apidocs -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;	64	&& ${FIND} -s apidocs -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \;
74	@${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/	65	@${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
75	@${ECHO_MSG} " [ DONE ]"	66	@${ECHO_MSG} " [ DONE ]"
76	.endif	67	.endif
77		68
78	.include <bsd.port.post.mk>	69	.include <bsd.port.mk>

Lines 1-11 Link Here

(-)./files/patch-build.xml (-9 / +37 lines)
1	--- build.xml.orig 2012-03-26 01:38:37.000000000 +0600	1	--- build.xml.bak 2014-04-19 21:14:45.345201138 +0600
2	+++ build.xml 2012-03-26 01:38:56.000000000 +0600	2	+++ build.xml 2014-04-19 21:17:15.132174422 +0600
3	@@ -36,7 +36,7 @@	3	@@ -167,7 +167,7 @@
4	<!-- Junit -->
5	<property name="junit.version" value="4.8.2"/>
6	<property name="junit.home" value="/usr/share/junit"/>
7	- <property name="junit.jar" value="${junit.home}/junit-${junit.version}.jar"/>
8	+ <property name="junit.jar" value="${junit.home}/junit.jar"/>
9		4
		5	<!-- ========== Unit Test Targets ========================================= -->
		6
		7	- <target name="compile.tests" depends="compile, download-dependencies" description="Compile unit tests.">
		8	+ <target name="compile.tests" depends="compile" description="Compile unit tests.">
		9
		10	<javac srcdir="${test.home}"
		11	destdir="${build.home}/test-classes"
		12	@@ -332,27 +332,5 @@
		13
		14	<target name="gump" depends="clean,test,javadoc,jar" description="Gump Target - clean,test,javadoc,jar"/>
		15
		16	-
		17	-<!-- ========== Download Dependencies =========================================== -->
		18	-
		19	- <target name="download-dependencies"
		20	- depends="check-availability" unless="skip.download">
		21	- <echo message="doing download-dependencies..." />
		22	- <antcall target="download-junit" />
		23	- </target>
		24	-
		25	- <target name="check-availability">
		26	- <echo message="doing check-availability..." />
		27	- <available file="${junit.jar}" property="junit.found"/>
		28	- </target>
		29	-
		30	- <target name="download-junit" unless="junit.found">
		31	- <echo message="Downloading junit..."/>
		32	- <mkdir dir="${download.lib.dir}" />
		33	- <get dest="${download.lib.dir}/junit-${junit.version}.jar"
		34	- usetimestamp="true" ignoreerrors="true"
		35	- src="http://repo1.maven.org/maven2/junit/junit/${junit.version}/junit-${junit.version}.jar"/>
		36	- </target>
		37	-
		38	</project>
10		39
11	<!-- ========== Component Declarations ==================================== -->