From b02831ae12aed2fd51c7e245cfeb20529e46a24c Mon Sep 17 00:00:00 2001
From: edwin <edwin@FreeBSD.org>
Date: Mon, 29 Sep 2003 11:44:09 +0000
Subject: 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>
---
 comms/java-commapi-freebsd/Makefile  | 13 ++++++++-----
 comms/java-commapi-freebsd/pkg-plist |  8 ++++----
 comms/java-commapi/Makefile          |  6 ++++--
 comms/java-commapi/pkg-plist         |  2 +-
 4 files changed, 17 insertions(+), 12 deletions(-)

(limited to 'comms')

diff --git a/comms/java-commapi-freebsd/Makefile b/comms/java-commapi-freebsd/Makefile
index 342fe7f..3e821fd 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 39cd278..9729ac0 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 b5a2789..d129d6b 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 e5e606b..7dd3d57 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
-- 
cgit v1.1