Index: head/net/airport/Makefile =================================================================== --- head/net/airport/Makefile (revision 32733) +++ head/net/airport/Makefile (revision 32734) @@ -1,35 +1,40 @@ # New ports collection makefile for: airport # Date created: 2000/09/16 # Whom: Nick Sayer # # $FreeBSD$ # 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 .include 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 Property changes on: head/net/airport/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/net/airport/files/airport =================================================================== --- head/net/airport/files/airport (revision 32733) +++ head/net/airport/files/airport (revision 32734) @@ -1,7 +1,7 @@ #! /bin/sh 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 Property changes on: head/net/airport/files/airport ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/net/airport/pkg-plist =================================================================== --- head/net/airport/pkg-plist (revision 32733) +++ head/net/airport/pkg-plist (revision 32734) @@ -1,10 +1,9 @@ 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 share/airport/helpdocs/manual.html @dirrm share/airport/helpdocs @dirrm share/airport Property changes on: head/net/airport/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/net-mgmt/airport/Makefile =================================================================== --- head/net-mgmt/airport/Makefile (revision 32733) +++ head/net-mgmt/airport/Makefile (revision 32734) @@ -1,35 +1,40 @@ # New ports collection makefile for: airport # Date created: 2000/09/16 # Whom: Nick Sayer # # $FreeBSD$ # 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 .include 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 Property changes on: head/net-mgmt/airport/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/net-mgmt/airport/files/airport =================================================================== --- head/net-mgmt/airport/files/airport (revision 32733) +++ head/net-mgmt/airport/files/airport (revision 32734) @@ -1,7 +1,7 @@ #! /bin/sh 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 Property changes on: head/net-mgmt/airport/files/airport ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/net-mgmt/airport/pkg-plist =================================================================== --- head/net-mgmt/airport/pkg-plist (revision 32733) +++ head/net-mgmt/airport/pkg-plist (revision 32734) @@ -1,10 +1,9 @@ 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 share/airport/helpdocs/manual.html @dirrm share/airport/helpdocs @dirrm share/airport Property changes on: head/net-mgmt/airport/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property