- Update to bsd.java.mk 2.0

- Use SUB_FILES to configure launcher shell script
- Set JAVA_VERSION in launcher shell script
- Install JAR files in DATADIR=${JAVASHAREDIR}/${PORTNAME}
- Use %%JAVAJARDIR%% and %%DOCSDIR%% in pkg-plist
- Add $FreeBSD$ tags
- Honor NOPORTDOCS
- Bump PORTREVISION

3 files changed, 41 insertions, 35 deletions

diff --git a/net-mgmt/airport/Makefile b/net-mgmt/airport/Makefile
index 380dee872a9d..ff351c05e79f 100644
--- a/net-mgmt/airport/Makefile
+++ b/net-mgmt/airport/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	airport
 PORTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	net-mgmt java
 MASTER_SITES=	http://edge.cs.drexel.edu/GICL/people/sevy/airport/
 DISTFILES=	configurator_${PORTVERSION:S/.0.1/01/g}${EXTRACT_SUFX} \
@@ -18,12 +19,13 @@ DISTFILES=	configurator_${PORTVERSION:S/.0.1/01/g}${EXTRACT_SUFX} \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Apple Airport / Lucent RG-1000 configuration program
 
-RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
+RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
 EXTRACT_BEFORE_ARGS=	-q -o
 
 USE_ZIP=	YES
-USE_JAVA=	1.2+
+USE_JAVA=	yes
+JAVA_VERSION=	1.2+
 
 NO_WRKSUBDIR=	YES
 NO_BUILD=	yes
@@ -33,24 +35,26 @@ LINKMONVERSION=	1.1
 HOSTMONVERSION=	1.0
 MODEMVERSION=	2.0
 
+SUB_FILES=	airport.sh
+
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
+
 do-install:
-	@cd ${WRKSRC}; \
-		${MKDIR} ${PREFIX}/share/doc/airport/helpdocs; \
-		${MKDIR} ${PREFIX}/share/java; \
-		${INSTALL_DATA} ${WRKSRC}/*jar ${PREFIX}/share/java; \
-		${INSTALL_DATA} ${WRKSRC}/configurator_${PORTVERSION:S/.0.1/0/g}/*jar ${PREFIX}/share/java; \
-		${INSTALL_DATA} ${WRKSRC}/configurator_${OLDAPCVERSION:S/.//g}/*jar ${PREFIX}/share/java; \
-		${INSTALL_DATA} ${WRKSRC}/airportmodemutility_${PORTVERSION:S/.0.1/0/g}/*jar ${PREFIX}/share/java; \
-		${INSTALL_DATA} ${WRKSRC}/AUTHORS ${PREFIX}/share/doc/airport; \
-		${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/airport; \
-		${INSTALL_DATA} ${WRKSRC}/configurator_${PORTVERSION:S/.0.1/0/g}/helpdocs/* ${PREFIX}/share/doc/airport/helpdocs; \
-		${SED} \
-			-e s,%%PREFIX%%,${PREFIX},g \
-			< ${FILESDIR}/airport > ${PREFIX}/bin/airport; \
-		${CHMOD} a+x ${PREFIX}/bin/airport
-		${LN} ${PREFIX}/bin/airport ${PREFIX}/bin/airport2
-		${LN} ${PREFIX}/bin/airport ${PREFIX}/bin/hostmon
-		${LN} ${PREFIX}/bin/airport ${PREFIX}/bin/linkmon
-		${LN} ${PREFIX}/bin/airport ${PREFIX}/bin/airmodem
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/*jar ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/configurator_${PORTVERSION:S/.0.1/0/g}/*jar ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/configurator_${OLDAPCVERSION:S/.//g}/*jar ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/airportmodemutility_${PORTVERSION:S/.0.1/0/g}/*jar ${DATADIR}
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}/helpdocs
+	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/configurator_${PORTVERSION:S/.0.1/0/g}/helpdocs/* ${DOCSDIR}/helpdocs
+.endif
+	${INSTALL_SCRIPT} ${WRKDIR}/airport.sh ${PREFIX}/bin/airport
+	${LN} ${PREFIX}/bin/airport ${PREFIX}/bin/airport2
+	${LN} ${PREFIX}/bin/airport ${PREFIX}/bin/hostmon
+	${LN} ${PREFIX}/bin/airport ${PREFIX}/bin/linkmon
+	${LN} ${PREFIX}/bin/airport ${PREFIX}/bin/airmodem
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/airport/files/airport b/net-mgmt/airport/files/airport.sh.in
index b5cd960bcc44..05e4b58b64f7 100644
--- a/net-mgmt/airport/files/airport
+++ b/net-mgmt/airport/files/airport.sh.in
@@ -1,4 +1,6 @@
 #! /bin/sh
+#
+# $FreeBSD$
 
 case $0 in
 	*airport)
@@ -21,6 +23,5 @@ case $0 in
 	exit 1
 esac
 
-exec %%PREFIX%%/bin/javavm -jar %%PREFIX%%/share/java/${file}.jar
-
-exit 1
+JAVA_VERSION="%%JAVA_VERSION%%" \
+	exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/${file}.jar" "$@"
diff --git a/net-mgmt/airport/pkg-plist b/net-mgmt/airport/pkg-plist
index a12f95c4e5c5..c24b9bc24dfd 100644
--- a/net-mgmt/airport/pkg-plist
+++ b/net-mgmt/airport/pkg-plist
@@ -1,17 +1,18 @@
+@comment $FreeBSD$
 bin/airport
 bin/airport2
 bin/hostmon
 bin/linkmon
 bin/airmodem
-share/java/Airport2BaseStationConfig.jar
-share/java/AirportBaseStationConfig.jar
-share/java/HostMonitor.jar
-share/java/LinkMonitor.jar
-share/java/AirportModemUtility.jar
-share/doc/airport/AUTHORS
-share/doc/airport/COPYING
-share/doc/airport/helpdocs/ReadMe.txt
-share/doc/airport/helpdocs/mainscreen.jpg
-share/doc/airport/helpdocs/manual.html
-@dirrm share/doc/airport/helpdocs
-@dirrm share/doc/airport
+%%DATADIR%%/Airport2BaseStationConfig.jar
+%%DATADIR%%/AirportBaseStationConfig.jar
+%%DATADIR%%/HostMonitor.jar
+%%DATADIR%%/LinkMonitor.jar
+%%DATADIR%%/AirportModemUtility.jar
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/helpdocs/ReadMe.txt
+%%PORTDOCS%%%%DOCSDIR%%/helpdocs/mainscreen.jpg
+%%PORTDOCS%%%%DOCSDIR%%/helpdocs/manual.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/helpdocs
+%%PORTDOCS%%@dirrm %%DOCSDIR%%