diff options
| author | edwin <edwin@FreeBSD.org> | 2003-09-29 19:44:09 +0800 |
|---|---|---|
| committer | edwin <edwin@FreeBSD.org> | 2003-09-29 19:44:09 +0800 |
| commit | b02831ae12aed2fd51c7e245cfeb20529e46a24c (patch) | |
| tree | c1faba8cbe10e64ced9a39c48db33745249db730 /comms | |
| parent | d9513f2807d8d35e36ed8c76cf9e86e1da221745 (diff) | |
| download | freebsd-ports-gnome-b02831ae12aed2fd51c7e245cfeb20529e46a24c.tar.gz freebsd-ports-gnome-b02831ae12aed2fd51c7e245cfeb20529e46a24c.tar.zst freebsd-ports-gnome-b02831ae12aed2fd51c7e245cfeb20529e46a24c.zip | |
javax.comm ports should use USE_JAVA
Java ports should use the new USE_JAVA infrastructure to
auto-discover the installed JRE
Informed maintainer.
PR: ports/56927
Submitted by: Nick Sayer <nsayer@kfu.com>
Diffstat (limited to 'comms')
| -rw-r--r-- | comms/java-commapi-freebsd/Makefile | 13 | ||||
| -rw-r--r-- | comms/java-commapi-freebsd/pkg-plist | 8 | ||||
| -rw-r--r-- | comms/java-commapi/Makefile | 6 | ||||
| -rw-r--r-- | comms/java-commapi/pkg-plist | 2 |
4 files changed, 17 insertions, 12 deletions
diff --git a/comms/java-commapi-freebsd/Makefile b/comms/java-commapi-freebsd/Makefile index 342fe7f3d37a..3e821fd90b0e 100644 --- a/comms/java-commapi-freebsd/Makefile +++ b/comms/java-commapi-freebsd/Makefile @@ -14,12 +14,15 @@ DISTNAME= freebsd-commapi-0.2 MAINTAINER= ari.suutari@syncrontech.com COMMENT= Java Communication API for FreeBSD -BUILD_DEPENDS= ${JDKDIR}/bin/javac:${PORTSDIR}/java/jdk13 \ - ${JDKDIR}/jre/lib/ext/comm.jar:${PORTSDIR}/comms/java-commapi -RUN_DEPENDS= ${JDKDIR}/bin/java:${PORTSDIR}/java/jdk13 \ - ${JDKDIR}/jre/lib/ext/comm.jar:${PORTSDIR}/comms/java-commapi +BUILD_DEPENDS= ${JDKDIR}/jre/lib/ext/comm.jar:${PORTSDIR}/comms/java-commapi +RUN_DEPENDS= ${JDKDIR}/jre/lib/ext/comm.jar:${PORTSDIR}/comms/java-commapi + +USE_JAVA= 1.1+ + +JDKDIR= ${JAVA_HOME} -JDKDIR= ${LOCALBASE}/jdk1.3.1 MAKE_ENV= JAVA_HOME=${JDKDIR} +PLIST_SUB+= JAVA_HOME=${JAVA_HOME:S/${PREFIX}\///} + .include <bsd.port.mk> diff --git a/comms/java-commapi-freebsd/pkg-plist b/comms/java-commapi-freebsd/pkg-plist index 39cd27844688..9729ac00e701 100644 --- a/comms/java-commapi-freebsd/pkg-plist +++ b/comms/java-commapi-freebsd/pkg-plist @@ -1,4 +1,4 @@ -jdk1.3.1/jre/lib/ext/CommDriver.jar -jdk1.3.1/jre/lib/i386/libSerial.so -jdk1.3.1/jre/lib/i386/libParallel.so -jdk1.3.1/jre/lib/javax.comm.properties +%%JAVA_HOME%%/jre/lib/ext/CommDriver.jar +%%JAVA_HOME%%/jre/lib/i386/libSerial.so +%%JAVA_HOME%%/jre/lib/i386/libParallel.so +%%JAVA_HOME%%/jre/lib/javax.comm.properties diff --git a/comms/java-commapi/Makefile b/comms/java-commapi/Makefile index b5a2789054fa..d129d6ba97ea 100644 --- a/comms/java-commapi/Makefile +++ b/comms/java-commapi/Makefile @@ -15,7 +15,7 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= ari.suutari@syncrontech.com COMMENT= Sun's Java Communications API -RUN_DEPENDS= ${LOCALBASE}/jdk1.3.1/bin/java:${PORTSDIR}/java/jdk13 +USE_JAVA= 1.3+ NO_CDROM= "Sun has a funky license for this software" RESTRICTED= "no commercial use" @@ -24,10 +24,12 @@ NO_BUILD= YES WRKSRC= ${WRKDIR}/commapi DISTDESCR= "the Java Communications API ${PORTVERSION} for Solaris/SPARC" DOWNLOAD_URL= "http://java.sun.com/products/javacomm/" -PORTDESTDIR= ${PREFIX}/jdk1.3.1/jre/lib/ext +PORTDESTDIR= ${JAVA_HOME}/jre/lib/ext DISTFILE= ${DISTNAME}${EXTRACT_SUFX} DISTPATH= ${DISTDIR}/${DISTFILE} +PLIST_SUB+= JAVA_HOME=${JAVA_HOME:S/${PREFIX}\///} + .if defined(BATCH) || defined(PACKAGE_BUILDING) IGNORE= "Should be fetched manually" .endif diff --git a/comms/java-commapi/pkg-plist b/comms/java-commapi/pkg-plist index e5e606b12690..7dd3d57abf80 100644 --- a/comms/java-commapi/pkg-plist +++ b/comms/java-commapi/pkg-plist @@ -1 +1 @@ -jdk1.3.1/jre/lib/ext/comm.jar +%%JAVA_HOME%%/jre/lib/ext/comm.jar |