From dc2fbbac16f970b328a8b5de99a3ec04b500206c Mon Sep 17 00:00:00 2001 From: Mario Sergio Fujikawa Ferreira Date: Thu, 28 Mar 2002 14:48:49 +0000 Subject: [PATCH] Update to new java infrastructure, deploy USE_JAVA --- audio/xnap/Makefile | 6 ++---- net-p2p/javadc/Makefile | 13 +++---------- net-p2p/phex/Makefile | 7 ++----- net-p2p/xnap/Makefile | 6 ++---- net/edonkey-gui-java/Makefile | 8 +++----- net/javadc/Makefile | 13 +++---------- net/jift/Makefile | 13 +++---------- net/phex/Makefile | 7 ++----- net/xnap/Makefile | 6 ++---- 9 files changed, 22 insertions(+), 57 deletions(-) diff --git a/audio/xnap/Makefile b/audio/xnap/Makefile index 81baf1673196..70ea58112b2c 100644 --- a/audio/xnap/Makefile +++ b/audio/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 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 diff --git a/net/edonkey-gui-java/Makefile b/net/edonkey-gui-java/Makefile index c0f036f774b8..39810cf34248 100644 --- a/net/edonkey-gui-java/Makefile +++ b/net/edonkey-gui-java/Makefile @@ -16,17 +16,15 @@ EXTRACT_ONLY= MAINTAINER= lioux@FreeBSD.org -RUN_DEPENDS= donkey:${PORTSDIR}/net/edonkey-core \ - ${JAVAVM}:${PORTSDIR}/java/javavmwrapper \ - ${LOCALBASE}/etc/javavms:${PORTSDIR}/java/jre \ - ${LOCALBASE}/jdk${JDK_VERSION}/bin/java:${PORTSDIR}/java/jdk13 +RUN_DEPENDS= donkey:${PORTSDIR}/net/edonkey-core +USE_JAVA= 1.3+ NO_BUILD= yes +JAVA_NO_BUILD_DEPENDS= yes PLIST_SUB= JAR_DIR=${JAR_DIR} \ JAR_FILE=${JAR_FILE} \ WRAPPER=${PORTNAME}${PKGNAMESUFFIX} -JDK_VERSION= 1.3.1 JAVAVM= ${LOCALBASE}/bin/javavm JAR_DIR= share/java/jar/${PORTNAME} diff --git a/net/javadc/Makefile b/net/javadc/Makefile index c31bc8549da4..eb764bc11756 100644 --- a/net/javadc/Makefile +++ b/net/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/jift/Makefile b/net/jift/Makefile index 07991cacabc8..b808af31cc5c 100644 --- a/net/jift/Makefile +++ b/net/jift/Makefile @@ -13,22 +13,15 @@ MASTER_SITE_SUBDIR= ${PORTNAME:L} 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 - BROKEN= 'Does not currently work' +USE_JAVA= 1.2+ USE_ZIP= yes NO_WRKSUBDIR= yes BUILD_WRKSRC= ${WRKSRC}/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 @@ -52,9 +45,9 @@ post-patch: do-build: @${MKDIR} ${BUILD_WRKSRC} .for dir in ${CLASS_SRCDIRS} - @${JAVAC_CMD} -d ${BUILD_WRKSRC} -classpath ${BUILD_WRKSRC} -sourcepath ${WRKDIR} ${WRKDIR}/${CLASS_PACKAGE}/${dir}/*.java + @${JAVAC} -d ${BUILD_WRKSRC} -classpath ${BUILD_WRKSRC} -sourcepath ${WRKDIR} ${WRKDIR}/${CLASS_PACKAGE}/${dir}/*.java .endfor - @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/phex/Makefile b/net/phex/Makefile index fc519531b4f3..1af35f56ac07 100644 --- a/net/phex/Makefile +++ b/net/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/xnap/Makefile b/net/xnap/Makefile index 81baf1673196..70ea58112b2c 100644 --- a/net/xnap/Makefile +++ b/net/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