Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 4 Jun 2014 21:50:22 +0000 (UTC)
From:      Jung-uk Kim <jkim@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r356548 - head/java/jgrapht
Message-ID:  <201406042150.s54LoMud035098@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: jkim
Date: Wed Jun  4 21:50:22 2014
New Revision: 356548
URL: http://svnweb.freebsd.org/changeset/ports/356548
QAT: https://qat.redports.org/buildarchive/r356548/

Log:
  Fix build with java/openjdk7 and support staging.  Note it does not build
  with java/openjdk8.
  
  Reported by:	exp-run (PR190511)

Modified:
  head/java/jgrapht/Makefile

Modified: head/java/jgrapht/Makefile
==============================================================================
--- head/java/jgrapht/Makefile	Wed Jun  4 21:17:35 2014	(r356547)
+++ head/java/jgrapht/Makefile	Wed Jun  4 21:50:22 2014	(r356548)
@@ -12,7 +12,7 @@ COMMENT=	Java package for mathematical g
 
 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

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406042150.s54LoMud035098>