1. Update to 2.0

2. Use new java port infrastructure.

3. Since we require swing, we require Java 1.2+. This also simplifies
the script, since we can presume 'javavm -jar foo.jar' will work.

4 files changed, 11 insertions, 26 deletions

diff --git a/net/airport/Makefile b/net/airport/Makefile
index 72d869058901..b040dd7e2d58 100644
--- a/net/airport/Makefile
+++ b/net/airport/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	airport
-PORTVERSION=	1.5.2
+PORTVERSION=	2.0
 CATEGORIES=	net java
 MASTER_SITES=	http://edge.mcs.drexel.edu/GICL/people/sevy/airport/
 DISTFILES=	configurator_${PORTVERSION:S/.//g}${EXTRACT_SUFX} \
@@ -16,23 +16,19 @@ DISTFILES=	configurator_${PORTVERSION:S/.//g}${EXTRACT_SUFX} \
 
 MAINTAINER=	ports@freebsd.org
 
-RUN_DEPENDS=	${LOCALBASE}/jdk${JDK_VERSION}/bin/java:${PORTSDIR}/java/jdk \
-		${LOCALBASE}/share/java/classes/jfc-${JFC_VERSION}/swingall.jar:${PORTSDIR}/java/jfc \
-		${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper
+RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
 
 EXTRACT_BEFORE_ARGS=	-q -o
 
 USE_ZIP=	YES
+USE_JAVA=	1.2+
 
 NO_WRKSUBDIR=	YES
+NO_BUILD=	yes
 
-JDK_VERSION=	1.1.8
-JFC_VERSION=	1.1.1
 LINKMONVERSION=	1.1
 HOSTMONVERSION=	1.0
-MODEMVERSION=	1.4
-
-NO_BUILD=	yes
+MODEMVERSION=	2.0
 
 .include <bsd.port.pre.mk>
 
@@ -42,14 +38,12 @@ do-install:
 		${MKDIR} ${PREFIX}/share/java; \
 		${INSTALL_DATA} ${WRKSRC}/*jar ${PREFIX}/share/java; \
 		${INSTALL_DATA} ${WRKSRC}/configurator_${PORTVERSION:S/.//g}/*jar ${PREFIX}/share/java; \
+		${INSTALL_DATA} ${WRKSRC}/airportmodemutility_${PORTVERSION:S/.//g}/*jar ${PREFIX}/share/java; \
 		${INSTALL_DATA} ${WRKSRC}/AUTHORS ${PREFIX}/share/doc/airport; \
 		${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/airport; \
-		${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/airport; \
 		${INSTALL_DATA} ${WRKSRC}/configurator_${PORTVERSION:S/.//g}/helpdocs/* ${PREFIX}/share/doc/airport/helpdocs; \
 		${SED} \
 			-e s,%%PREFIX%%,${PREFIX},g \
-			-e s/%%JFC_VERSION%%/${JFC_VERSION}/ \
-			-e s/%%JDK_VERSION%%/${JDK_VERSION}/ \
 			< ${FILESDIR}/airport > ${PREFIX}/bin/airport; \
 		${CHMOD} a+x ${PREFIX}/bin/airport
 		${LN} ${PREFIX}/bin/airport ${PREFIX}/bin/hostmon
diff --git a/net/airport/distinfo b/net/airport/distinfo
index 70449de3f8c3..40edbf990b38 100644
--- a/net/airport/distinfo
+++ b/net/airport/distinfo
@@ -1,4 +1,4 @@
-MD5 (configurator_152.zip) = 1abe6dc50d85dfbca51101dd689e6fea
+MD5 (configurator_20.zip) = 656bf8a262ae6efe9ddfc9297537d24d
 MD5 (link_monitor_11.zip) = e6837268e0edcdfd1566dec35b09deb7
 MD5 (host_monitor_10.zip) = 8f413a9a283c28d3e7ba461b79da1b45
-MD5 (airportmodemutility_14.zip) = 327bf3449d90b1c70c224ee106feef20
+MD5 (airportmodemutility_20.zip) = 502cb25bddd0ba95c2d5c746a6b47844
diff --git a/net/airport/files/airport b/net/airport/files/airport
index d4905a709842..db90951dd305 100644
--- a/net/airport/files/airport
+++ b/net/airport/files/airport
@@ -2,19 +2,15 @@
 
 case $0 in
 	*airport)
-		class=AirportBaseStationConfigurator
-		file=AirportBaseStationConfig
+		file=Airport2BaseStationConfig
 	;;
 	*hostmon)
-		class=HostMonitor
 		file=HostMonitor
 	;;
 	*linkmon)
-		class=LinkMonitor
 		file=LinkMonitor
 	;;
 	*airmodem)
-		class=AirportBaseStationHangup
 		file=AirportModemUtility
 	;;
 	*)
@@ -22,10 +18,6 @@ case $0 in
 	exit 1
 esac
 
-# Use this one for JDK 1.2 and beyond:
-# exec %%PREFIX%%/bin/javavm -jar %%PREFIX%%/share/java/${file}.jar
-
-# Use this one for the default installation -- JDK 1.1.x + JFC:
-exec %%PREFIX%%/bin/javavm -classpath "%%PREFIX%%/jdk%%JDK_VERSION%%/lib/classes.zip:%%PREFIX%%/share/java/classes/jfc-%%JFC_VERSION%%/swingall.jar:%%PREFIX%%/share/java/${file}.jar" $class
+exec %%PREFIX%%/bin/javavm -jar %%PREFIX%%/share/java/${file}.jar
 
 exit 1
diff --git a/net/airport/pkg-plist b/net/airport/pkg-plist
index 05d63c816afa..a7488f6f5d9d 100644
--- a/net/airport/pkg-plist
+++ b/net/airport/pkg-plist
@@ -2,13 +2,12 @@ bin/airport
 bin/hostmon
 bin/linkmon
 bin/airmodem
-share/java/AirportBaseStationConfig.jar
+share/java/Airport2BaseStationConfig.jar
 share/java/HostMonitor.jar
 share/java/LinkMonitor.jar
 share/java/AirportModemUtility.jar
 share/doc/airport/AUTHORS
 share/doc/airport/COPYING
-share/doc/airport/README
 share/doc/airport/helpdocs/ReadMe.txt
 share/doc/airport/helpdocs/mainscreen.jpg
 share/doc/airport/helpdocs/manual.html