Attachment #141890 for bug #188801

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




# $FreeBSD: head/math/jakarta-commons-math3/Makefile 345420 2014-02-21 13:38:05Z ehaupt $

PORTNAME=	commons-math3
PORTVERSION=	3.2
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-math3,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

COMMONS_DISCOVERY_API=	${LOCALBASE}/share/doc/commons-discovery/api
.if exists(${COMMONS_DISCOVERY_API})
MAKE_ARGS+=	-Dcommons-logging.api=${COMMONS_DISCOVERY_API}
.endif

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

NO_STAGE=	yes

OPTIONS_DEFINE=	DOCS

.include <bsd.port.options.mk>

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/
			-e 's#/usr/share/junit#${JAVAJARDIR}#g' \
			${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


Lines 1-2 Link Here

(-)./distinfo (-2 / +4 lines)
1	SHA256 (commons-math3-3.1-src.tar.gz) = 0cd25ae24b5d026f729f3be9fac7a3cc0ad3b6b5352335e63538c53c0a54470c	1	SHA256 (commons-math3-3.2-src.tar.gz) = 07992f0630aea0e973c41a34330fe8109b867fc30507b566142a62ec2e483310
2	SIZE (commons-math3-3.1-src.tar.gz) = 2481249	2	SIZE (commons-math3-3.2-src.tar.gz) = 2602474
		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
@@ -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.2-SNAPSHOT"/>
 
   <!-- The base directory for component sources -->
   <property name="source.home"             value="src/main/java"/>
@@ -174,7 +174,7 @@
 
 <!-- ========== 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"
@@ -341,26 +341,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>
 

Return to bug 188801

Lines 2-48 Link Here

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

Line 0 Link Here

(-)./files/patch-build.xml (+47 lines)
	1	--- build.xml.bak 2014-04-19 21:14:45.345201138 +0600
	2	+++ build.xml 2014-04-19 21:17:15.132174422 +0600
	3	@@ -52,7 +52,7 @@
	4	<property name="component.title" value="Commons MATH"/>
	5
	6	<!-- The current version number of this component -->
	7	- <property name="component.version" value="3.1-SNAPSHOT"/>
	8	+ <property name="component.version" value="3.2-SNAPSHOT"/>
	9
	10	<!-- The base directory for component sources -->
	11	<property name="source.home" value="src/main/java"/>
	12	@@ -174,7 +174,7 @@
	13
	14	<!-- ========== Unit Test Targets ========================================= -->
	15
	16	- <target name="compile.tests" depends="compile, download-dependencies" description="Compile unit tests.">
	17	+ <target name="compile.tests" depends="compile" description="Compile unit tests.">
	18
	19	<javac srcdir="${test.home}"
	20	destdir="${build.home}/test-classes"
	21	@@ -341,26 +341,5 @@
	22	<target name="gump" depends="clean,test,javadoc,jar" description="Gump Target - clean,test,javadoc,jar"/>
	23
	24
	25	-<!-- ========== Download Dependencies =========================================== -->
	26	-
	27	- <target name="download-dependencies"
	28	- depends="check-availability" unless="skip.download">
	29	- <echo message="doing download-dependencies..." />
	30	- <antcall target="download-junit" />
	31	- </target>
	32	-
	33	- <target name="check-availability">
	34	- <echo message="doing check-availability..." />
	35	- <available file="${junit.jar}" property="junit.found"/>
	36	- </target>
	37	-
	38	- <target name="download-junit" unless="junit.found">
	39	- <echo message="Downloading junit..."/>
	40	- <mkdir dir="${download.lib.dir}" />
	41	- <get dest="${download.lib.dir}/junit-${junit.version}.jar"
	42	- usetimestamp="true" ignoreerrors="true"
	43	- src="http://repo1.maven.org/maven2/junit/junit/${junit.version}/junit-${junit.version}.jar"/>
	44	- </target>
	45	-
	46	</project>
	47