diff options
author | Herve Quiroz <hq@FreeBSD.org> | 2005-11-28 16:05:36 +0000 |
---|---|---|
committer | Herve Quiroz <hq@FreeBSD.org> | 2005-11-28 16:05:36 +0000 |
commit | 6a3be72a2b0b8ea12d7c61102e194362e8943062 (patch) | |
tree | d1b109f4e7e853ef79210f59dfd533ca2486a0eb | |
parent | update to 0.5.4 (diff) |
- Update to 0.6.0
" The new version delivers a cumulative update of new developments, bug
fixes, and improvements, including an upgrade to JDK 1.4. "
- Set JAVA_VERSION=1.4+
- Add 'math' category [1]
- Use USE_ANT
- Fix COMMENT: some words seemed to be missing, turning the comment to a
nonsense sentence
- ECHO_CMD -> ECHO_MSG
- Cleanup: remove "ex:ts=8" and uneeded targets
- Use ${FIND} | ${INSTALL_DATA} to install documentation files
- Take maintainership
Reported by: portlint [1]
Notes
Notes:
svn path=/head/; revision=149792
-rw-r--r-- | java/jgrapht/Makefile | 63 | ||||
-rw-r--r-- | java/jgrapht/distinfo | 6 | ||||
-rw-r--r-- | java/jgrapht/files/patch-build.xml | 14 |
3 files changed, 46 insertions, 37 deletions
diff --git a/java/jgrapht/Makefile b/java/jgrapht/Makefile index 61e6814f6bf9..97820ba589dd 100644 --- a/java/jgrapht/Makefile +++ b/java/jgrapht/Makefile @@ -1,4 +1,3 @@ -# ex:ts=8 # Ports collection makefile for: jgrapht # Date created: Jul 9, 2004 # Whom: ijliao @@ -7,37 +6,41 @@ # PORTNAME= jgrapht -PORTVERSION= 0.5.3 -CATEGORIES= java +PORTVERSION= 0.6.0 +CATEGORIES= java math MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} -MAINTAINER= ports@FreeBSD.org -COMMENT= A Java class provides mathematical graph-theory objects and algorithms +MAINTAINER= hq@FreeBSD.org +COMMENT= Java package for mathematical graph-theory objects and algorithms USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.3+ -JAVA_RUN= yes - -.if !defined(WITHOUT_COMPILE) || !defined(NOPORTDOCS) -BUILD_DEPENDS+= ${ANT_CMD}:${PORTSDIR}/devel/apache-ant -ANT_CMD?= ${LOCALBASE}/bin/ant -ANT= ${SETENV} JAVA_HOME=${JAVA_HOME} ${ANT_CMD} -.endif +JAVA_VERSION= 1.4+ .if !defined(WITHOUT_COMPILE) -JAVA_BUILD= yes -ANT_TARGETS= jar +USE_ANT= yes +ALL_TARGET= jar +.if !defined(NOPORTDOCS) +ALL_TARGET+= javadoc +.endif +.else +NO_BUILD= yes .endif .if !defined(NOPORTDOCS) -ANT_TARGETS+= javadoc PORTDOCS= * .endif PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar +.include <bsd.port.pre.mk> + +JAVA_PORT_API= ${LOCALBASE}/share/doc/jdk${JAVA_PORT_VERSION:C/([0-9]\.[0-9])\.[0-9]/\1/}/api +.if exists(${JAVA_PORT_API}) +MAKE_ARGS+= -Djdk.api="${JAVA_PORT_API}" +.endif + pre-fetch: @${ECHO_MSG} "" @${ECHO_MSG} "You may use the following build options:" @@ -45,26 +48,18 @@ pre-fetch: @${ECHO_MSG} " WITHOUT_COMPILE=yes Install the pre-compiled .jar file" @${ECHO_MSG} "" -do-build: -.if !defined(WITHOUT_COMPILE) || !defined(NOPORTDOCS) - @cd ${WRKSRC} && ${ANT} ${ANT_TARGETS} - @${MV} -f ${WRKSRC}/${PORTNAME}-${PORTVERSION}-local.jar ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar -.endif +post-build: + ${MV} ${WRKSRC}/${PORTNAME}-${PORTVERSION}-local.jar ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar -do-install: do-install-jar do-install-javadoc - -do-install-jar: - @${ECHO_CMD} -n ">> Installing .jar file..." +do-install: + @${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${PORTNAME}.jar..." @${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar ${JAVAJARDIR}/${PORTNAME}.jar - @${ECHO_CMD} " [DONE]" - -do-install-javadoc: + @${ECHO_MSG} " [DONE]" .if !defined(NOPORTDOCS) - @${ECHO_CMD} -n ">> Installing documentation in ${DOCSDIR}..." - @${MKDIR} ${DOCSDIR} - @cd ${WRKSRC}/javadoc && ${FIND} . \ - | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} - @${ECHO_CMD} " [DONE]" + @${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..." + @cd ${WRKSRC}/javadoc && ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/{} \; + @cd ${WRKSRC}/javadoc && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \; + @${ECHO_MSG} " [DONE]" .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/java/jgrapht/distinfo b/java/jgrapht/distinfo index 6d1da41999c3..3d84bdcef60f 100644 --- a/java/jgrapht/distinfo +++ b/java/jgrapht/distinfo @@ -1,3 +1,3 @@ -MD5 (jgrapht-0.5.3.zip) = 24795c1d575eb21af724f712e906da26 -SHA256 (jgrapht-0.5.3.zip) = fbf5f4bd6ada6a55b88439c4ddac03e5b11d86147f420ff7ccbbfba3bc712bd3 -SIZE (jgrapht-0.5.3.zip) = 818759 +MD5 (jgrapht-0.6.0.zip) = df5ed0913b2b259856d99b3f1a06b198 +SHA256 (jgrapht-0.6.0.zip) = eaa7fb484b26bd76f67cc634f6884df82cc81f523a789f57bfb580ee83cd8245 +SIZE (jgrapht-0.6.0.zip) = 926098 diff --git a/java/jgrapht/files/patch-build.xml b/java/jgrapht/files/patch-build.xml new file mode 100644 index 000000000000..0dbc69640b36 --- /dev/null +++ b/java/jgrapht/files/patch-build.xml @@ -0,0 +1,14 @@ +$FreeBSD$ + +Patch to allow the JDK API location to be passed to Ant using -Djdk.api + +--- build.xml.orig Mon Nov 28 16:49:46 2005 ++++ build.xml Mon Nov 28 16:50:27 2005 +@@ -284,6 +284,7 @@ + <include name="**"/>
+ <exclude name="org/_3pq/jgrapht/experimental/**"/>
+ </packageset>
++ <link offline="true" packagelistLoc="${jdk.api}" href="${jdk.api}"/>
+ </javadoc>
+ </target>
+
|