diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2014-06-05 05:50:22 +0800 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2014-06-05 05:50:22 +0800 |
| commit | b7b91fc0fd1d24b0cbda1f17a4da898882f40241 (patch) | |
| tree | c1f2c3122e9700f3111c51815645a6961dbdfd7c /java | |
| parent | d0ab2246667bff2b04e05f9e58a3440d1c2e785e (diff) | |
| download | freebsd-ports-gnome-b7b91fc0fd1d24b0cbda1f17a4da898882f40241.tar.gz freebsd-ports-gnome-b7b91fc0fd1d24b0cbda1f17a4da898882f40241.tar.zst freebsd-ports-gnome-b7b91fc0fd1d24b0cbda1f17a4da898882f40241.zip | |
Fix build with java/openjdk7 and support staging. Note it does not build
with java/openjdk8.
Reported by: exp-run (PR190511)
Diffstat (limited to 'java')
| -rw-r--r-- | java/jgrapht/Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/java/jgrapht/Makefile b/java/jgrapht/Makefile index bc2ae75447e0..12e1d3bdea9f 100644 --- a/java/jgrapht/Makefile +++ b/java/jgrapht/Makefile @@ -12,7 +12,7 @@ COMMENT= Java package for mathematical graph-theory objects and algorithms USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ +JAVA_VERSION= 1.6 1.7 .if !defined(WITHOUT_COMPILE) USE_ANT= yes @@ -30,7 +30,6 @@ PORTDOCS= * PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar -NO_STAGE= yes .include <bsd.port.pre.mk> JAVA_PORT_API= ${LOCALBASE}/share/doc/jdk${JAVA_PORT_VERSION:C/([0-9]\.[0-9])\.[0-9]/\1/}/api @@ -47,12 +46,12 @@ pre-fetch: do-install: @${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${PORTNAME}.jar..." - @${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-jdk${JAVA_PORT_VERSION:C/1\.4\.[0-9]/1.4/:C/1\.[56]\.[0-9]/1.5/}.jar ${JAVAJARDIR}/${PORTNAME}.jar + @${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-jdk1.5.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar @${ECHO_MSG} " [DONE]" .if !defined(NOPORTDOCS) @${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}/{} \; + @cd ${WRKSRC}/javadoc && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; + @cd ${WRKSRC}/javadoc && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \; @${ECHO_MSG} " [DONE]" .endif |