diff options
| -rw-r--r-- | net-mgmt/airport/Makefile | 13 | ||||
| -rw-r--r-- | net-mgmt/airport/files/airport | 2 | ||||
| -rw-r--r-- | net-mgmt/airport/pkg-plist | 1 | ||||
| -rw-r--r-- | net/airport/Makefile | 13 | ||||
| -rw-r--r-- | net/airport/files/airport | 2 | ||||
| -rw-r--r-- | net/airport/pkg-plist | 1 |
6 files changed, 20 insertions, 12 deletions
diff --git a/net-mgmt/airport/Makefile b/net-mgmt/airport/Makefile index 7c0173003bb0..cae4c39b1513 100644 --- a/net-mgmt/airport/Makefile +++ b/net-mgmt/airport/Makefile @@ -6,20 +6,22 @@ # PORTNAME= airport -PORTVERSION= 1.0 +PORTVERSION= 1.2 CATEGORIES= net java MASTER_SITES= http://edge.mcs.drexel.edu/GICL/people/sevy/airport/ -DISTFILES= configurator${EXTRACT_SUFX} swing${EXTRACT_SUFX} +DISTFILES= configurator${EXTRACT_SUFX} MAINTAINER= nsayer@freebsd.org -RUN_DEPENDS= ${LOCALBASE}/jre${JDK_VERSION}/bin/jre:${PORTSDIR}/java/jre +RUN_DEPENDS= ${LOCALBASE}/jdk${JDK_VERSION}/bin/java:${PORTSDIR}/java/jdk \ + ${LOCALBASE}/share/java/classes/jfc-${JFC_VERSION}/swingall.jar:${PORTSDIR}/java/jfc USE_ZIP= YES NO_WRKSUBDIR= YES JDK_VERSION= 1.1.8 +JFC_VERSION= 1.1.1 NO_BUILD= yes @@ -29,7 +31,10 @@ do-install: @cd ${WRKSRC}; \ ${MKDIR} ${PREFIX}/share/airport; \ ${CP} -r ${WRKSRC}/* ${PREFIX}/share/airport; \ - ${SED} -e s,%%PREFIX%%,${PREFIX}, -e s/%%JDK_VERSION%%/${JDK_VERSION}/ < ${FILESDIR}/airport > ${PREFIX}/bin/airport; \ + ${SED} -e s,%%PREFIX%%,${PREFIX},g \ + -e s/%%JDK_VERSION%%/${JDK_VERSION}/ \ + -e s/%%JFC_VERSION%%/${JFC_VERSION}/ \ + < ${FILESDIR}/airport > ${PREFIX}/bin/airport; \ ${CHMOD} a+x ${PREFIX}/bin/airport .include <bsd.port.post.mk> diff --git a/net-mgmt/airport/files/airport b/net-mgmt/airport/files/airport index 42a555f74305..e95361cfca46 100644 --- a/net-mgmt/airport/files/airport +++ b/net-mgmt/airport/files/airport @@ -2,6 +2,6 @@ cd %%PREFIX%%/share/airport -exec %%PREFIX%%/jre%%JDK_VERSION%%/bin/jre -cp "AirportBaseStationConfig.jar:swingall.jar" AirportBaseStationConfigurator +exec %%PREFIX%%/jdk%%JDK_VERSION%%/bin/jre -cp "%%PREFIX%%/share/java/classes/jfc-%%JFC_VERSION%%/swingall.jar:AirportBaseStationConfig.jar" AirportBaseStationConfigurator exit 1 diff --git a/net-mgmt/airport/pkg-plist b/net-mgmt/airport/pkg-plist index fc2bbcb4a20e..68fe8b4f540f 100644 --- a/net-mgmt/airport/pkg-plist +++ b/net-mgmt/airport/pkg-plist @@ -1,7 +1,6 @@ bin/airport share/airport/AUTHORS share/airport/COPYING -share/airport/swingall.jar share/airport/AirportBaseStationConfig.jar share/airport/helpdocs/ReadMe.txt share/airport/helpdocs/mainscreen.jpg diff --git a/net/airport/Makefile b/net/airport/Makefile index 7c0173003bb0..cae4c39b1513 100644 --- a/net/airport/Makefile +++ b/net/airport/Makefile @@ -6,20 +6,22 @@ # PORTNAME= airport -PORTVERSION= 1.0 +PORTVERSION= 1.2 CATEGORIES= net java MASTER_SITES= http://edge.mcs.drexel.edu/GICL/people/sevy/airport/ -DISTFILES= configurator${EXTRACT_SUFX} swing${EXTRACT_SUFX} +DISTFILES= configurator${EXTRACT_SUFX} MAINTAINER= nsayer@freebsd.org -RUN_DEPENDS= ${LOCALBASE}/jre${JDK_VERSION}/bin/jre:${PORTSDIR}/java/jre +RUN_DEPENDS= ${LOCALBASE}/jdk${JDK_VERSION}/bin/java:${PORTSDIR}/java/jdk \ + ${LOCALBASE}/share/java/classes/jfc-${JFC_VERSION}/swingall.jar:${PORTSDIR}/java/jfc USE_ZIP= YES NO_WRKSUBDIR= YES JDK_VERSION= 1.1.8 +JFC_VERSION= 1.1.1 NO_BUILD= yes @@ -29,7 +31,10 @@ do-install: @cd ${WRKSRC}; \ ${MKDIR} ${PREFIX}/share/airport; \ ${CP} -r ${WRKSRC}/* ${PREFIX}/share/airport; \ - ${SED} -e s,%%PREFIX%%,${PREFIX}, -e s/%%JDK_VERSION%%/${JDK_VERSION}/ < ${FILESDIR}/airport > ${PREFIX}/bin/airport; \ + ${SED} -e s,%%PREFIX%%,${PREFIX},g \ + -e s/%%JDK_VERSION%%/${JDK_VERSION}/ \ + -e s/%%JFC_VERSION%%/${JFC_VERSION}/ \ + < ${FILESDIR}/airport > ${PREFIX}/bin/airport; \ ${CHMOD} a+x ${PREFIX}/bin/airport .include <bsd.port.post.mk> diff --git a/net/airport/files/airport b/net/airport/files/airport index 42a555f74305..e95361cfca46 100644 --- a/net/airport/files/airport +++ b/net/airport/files/airport @@ -2,6 +2,6 @@ cd %%PREFIX%%/share/airport -exec %%PREFIX%%/jre%%JDK_VERSION%%/bin/jre -cp "AirportBaseStationConfig.jar:swingall.jar" AirportBaseStationConfigurator +exec %%PREFIX%%/jdk%%JDK_VERSION%%/bin/jre -cp "%%PREFIX%%/share/java/classes/jfc-%%JFC_VERSION%%/swingall.jar:AirportBaseStationConfig.jar" AirportBaseStationConfigurator exit 1 diff --git a/net/airport/pkg-plist b/net/airport/pkg-plist index fc2bbcb4a20e..68fe8b4f540f 100644 --- a/net/airport/pkg-plist +++ b/net/airport/pkg-plist @@ -1,7 +1,6 @@ bin/airport share/airport/AUTHORS share/airport/COPYING -share/airport/swingall.jar share/airport/AirportBaseStationConfig.jar share/airport/helpdocs/ReadMe.txt share/airport/helpdocs/mainscreen.jpg |