ports/56927: javax.comm ports should use USE_JAVA

[Nick Sayer]

>Number:         56927
>Category:       ports
>Synopsis:       javax.comm ports should use USE_JAVA
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 16 13:00:32 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Nick Sayer
>Release:        FreeBSD 4.8-RELEASE i386
>Organization:
Just me
>Environment:
System: FreeBSD medusa.kfu.com 4.8-RELEASE FreeBSD 4.8-RELEASE #56: Wed Apr 2 08:52:36 PST 2003 nsayer at medusa.kfu.com:/usr/obj/usr/src/sys/MEDUSA i386


>Description:

Java ports should use the new USE_JAVA infrastructure to auto-discover
the installed JRE

>How-To-Repeat:
>Fix:

For comms/java-commapi:

--- Makefile.orig	Wed Jun 11 07:48:00 2003
+++ Makefile	Tue Sep 16 12:36:03 2003
@@ -15,7 +15,7 @@
 MAINTAINER=	ari.suutari at 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,9 +24,11 @@
 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"
--- pkg-plist.orig	Fri Jul  5 01:33:58 2002
+++ pkg-plist	Tue Sep 16 12:27:21 2003
@@ -1 +1 @@
-jdk1.3.1/jre/lib/ext/comm.jar
+%%JAVA_HOME%%/jre/lib/ext/comm.jar

For comms/java-commapi-freebsd:

--- Makefile.orig	Tue Jun 10 09:41:16 2003
+++ Makefile	Tue Sep 16 12:38:01 2003
@@ -14,12 +14,15 @@
 MAINTAINER=	ari.suutari at 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>
--- pkg-plist.orig	Wed Aug  7 12:44:31 2002
+++ pkg-plist	Tue Sep 16 12:36:46 2003
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted: