diff options
| author | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2002-03-28 14:48:49 +0000 |
|---|---|---|
| committer | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2002-03-28 14:48:49 +0000 |
| commit | dc2fbbac16f970b328a8b5de99a3ec04b500206c (patch) | |
| tree | 4304537aca69450fcca4e05659f7e452cdab9786 /net-p2p | |
| parent | 16f43853300226997946d477774d0b3b581e2278 (diff) | |
| download | ports-dc2fbbac16f970b328a8b5de99a3ec04b500206c.tar.gz ports-dc2fbbac16f970b328a8b5de99a3ec04b500206c.zip | |
Update to new java infrastructure, deploy USE_JAVA
Notes
Notes:
svn path=/head/; revision=56789
Diffstat (limited to 'net-p2p')
| -rw-r--r-- | net-p2p/javadc/Makefile | 13 | ||||
| -rw-r--r-- | net-p2p/phex/Makefile | 7 | ||||
| -rw-r--r-- | net-p2p/xnap/Makefile | 6 |
3 files changed, 7 insertions, 19 deletions
diff --git a/net-p2p/javadc/Makefile b/net-p2p/javadc/Makefile index c31bc8549da4..eb764bc11756 100644 --- a/net-p2p/javadc/Makefile +++ b/net-p2p/javadc/Makefile @@ -13,19 +13,12 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= lioux@FreeBSD.org -BUILD_DEPENDS= ${LOCALBASE}/jdk${JDK_VERSION}/bin/jar:${PORTSDIR}/java/jdk12-beta -RUN_DEPENDS= ${JAVAVM}:${PORTSDIR}/java/javavmwrapper \ - ${LOCALBASE}/etc/javavms:${PORTSDIR}/java/jre \ - ${LOCALBASE}/jdk${JDK_VERSION}/bin/java:${PORTSDIR}/java/jdk12-beta - +USE_JAVA= 1.2+ WRKSRC= ${WRKDIR}/DirectConnect${PORTVERSION} BUILD_WRKSRC= ${WRKDIR}/classes PLIST_SUB= JAR_DIR=${JAR_DIR} \ JAR_FILE=${JAR_FILE} -JDK_VERSION= 1.2.2 -JAVAC_CMD= ${LOCALBASE}/jdk${JDK_VERSION}/bin/javac -JAR_CMD= ${LOCALBASE}/jdk${JDK_VERSION}/bin/jar JAVAVM= ${LOCALBASE}/bin/javavm JAR_DIR= share/java/jar/${PORTNAME} JAR_MANIFEST= ${FILESDIR}/manifest @@ -41,9 +34,9 @@ post-patch: # as far as build goes... ;) do-build: @${MKDIR} ${BUILD_WRKSRC} - @${JAVAC_CMD} -d ${BUILD_WRKSRC} -classpath ${BUILD_WRKSRC} ${CLASS_SRCDIR}/*.java 2>/dev/null + @${JAVAC} -d ${BUILD_WRKSRC} -classpath ${BUILD_WRKSRC} ${CLASS_SRCDIR}/*.java 2>/dev/null @${CP} ${CLASS_SRCDIR}/*.txt ${BUILD_WRKSRC} - @cd ${BUILD_WRKSRC} && ${JAR_CMD} -cmf ${JAR_MANIFEST} ${WRKDIR}/${JAR_FILE} * + @cd ${BUILD_WRKSRC} && ${JAR} -cmf ${JAR_MANIFEST} ${WRKDIR}/${JAR_FILE} * do-install: @${MKDIR} ${PREFIX}/${JAR_DIR} diff --git a/net-p2p/phex/Makefile b/net-p2p/phex/Makefile index fc519531b4f3..1af35f56ac07 100644 --- a/net-p2p/phex/Makefile +++ b/net-p2p/phex/Makefile @@ -14,16 +14,13 @@ DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= lioux@FreeBSD.org -RUN_DEPENDS= ${JAVAVM}:${PORTSDIR}/java/javavmwrapper \ - ${LOCALBASE}/etc/javavms:${PORTSDIR}/java/jre \ - ${LOCALBASE}/jdk${JDK_VERSION}/bin/java:${PORTSDIR}/java/jdk13 - +USE_JAVA= 1.3+ USE_ZIP= yes NO_BUILD= yes +JAVA_NO_BUILD_DEPENDS= yes PLIST_SUB= JAR_DIR=${JAR_DIR} \ JAR_FILE=${JAR_FILE} -JDK_VERSION= 1.3.1 JAVAVM= ${LOCALBASE}/bin/javavm JAR_DIR= share/java/jar/${PORTNAME}/ JAR_MANIFEST= ${FILESDIR}/manifest diff --git a/net-p2p/xnap/Makefile b/net-p2p/xnap/Makefile index 81baf1673196..70ea58112b2c 100644 --- a/net-p2p/xnap/Makefile +++ b/net-p2p/xnap/Makefile @@ -15,11 +15,9 @@ EXTRACT_SUFX= .tgz MAINTAINER= lioux@FreeBSD.org -RUN_DEPENDS= ${JAVAVM}:${PORTSDIR}/java/javavmwrapper \ - ${LOCALBASE}/etc/javavms:${PORTSDIR}/java/jre \ - ${LOCALBASE}/jdk1.3.1/bin/java:${PORTSDIR}/java/jdk13 - +USE_JAVA= 1.3+ NO_BUILD= yes +JAVA_NO_BUILD_DEPENDS= yes PLIST_SUB= JAR_DIR=${JAR_DIR} JAVAVM= ${LOCALBASE}/bin/javavm |