diff options
| author | jwise <jwise@pkgsrc.org> | 2000-05-26 18:21:10 +0000 |
|---|---|---|
| committer | jwise <jwise@pkgsrc.org> | 2000-05-26 18:21:10 +0000 |
| commit | 8a757f4df21d6261d8a0de0512e4cfb7d8887f70 (patch) | |
| tree | 835019e6caf409decafd5d12871060a56cb55a88 /misc | |
| parent | c5bb169decce18ed913c180f118a25390a98ddb9 (diff) | |
| download | pkgsrc-8a757f4df21d6261d8a0de0512e4cfb7d8887f70.tar.gz | |
Now that we have a package for swing, use it here instead of installing a
private copy of part of swing.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/cardboard-schedule/Makefile | 7 | ||||
| -rwxr-xr-x | misc/cardboard-schedule/files/csched.sh | 2 | ||||
| -rw-r--r-- | misc/cardboard-schedule/pkg/PLIST | 3 |
3 files changed, 6 insertions, 6 deletions
diff --git a/misc/cardboard-schedule/Makefile b/misc/cardboard-schedule/Makefile index b3d15d76a4d..fc22c6ab4f5 100644 --- a/misc/cardboard-schedule/Makefile +++ b/misc/cardboard-schedule/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2000/02/28 22:11:56 jwise Exp $ +# $NetBSD: Makefile,v 1.2 2000/05/26 18:21:10 jwise Exp $ # DISTNAME= cs113ins @@ -13,6 +13,7 @@ HOMEPAGE= http://cardboard.nu/download.shtml USE_JAVA= yes USE_X11BASE= yes DEPENDS+= unzip-*:../../archivers/unzip +DEPENDS+= swing-*:../../x11/swing NO_CDROM= "License prohibits redistribution on CDROM" @@ -23,7 +24,6 @@ CSFILES= cs/images/Logo2.gif \ cs/images/Logo.gif \ stage/cs.jar \ stage/readme.txt \ - stage/swing.jar \ stage/jhbasic.jar \ stage/license.txt \ stage/CsHelp.jar @@ -33,7 +33,8 @@ post-extract: post-build: ${SED} -e s,@PREFIX@,${PREFIX},g < ${FILESDIR}/csched.sh > ${WRKDIR}/csched.tmp - ${SED} -e s,@JAVA_HOME@,${JAVA_HOME},g < ${WRKDIR}/csched.tmp > ${WRKDIR}/csched + ${SED} -e s,@LOCALBASE@,${LOCALBASE},g < ${WRKDIR}/csched.tmp > ${WRKDIR}/csched.tmp2 + ${SED} -e s,@JAVA_HOME@,${JAVA_HOME},g < ${WRKDIR}/csched.tmp2 > ${WRKDIR}/csched ${SED} -e s,@PREFIX@,${PREFIX},g < ${PKGDIR}/MESSAGE > ${WRKDIR}/MESSAGE do-install: diff --git a/misc/cardboard-schedule/files/csched.sh b/misc/cardboard-schedule/files/csched.sh index 8df31e782aa..2ee3d3575e5 100755 --- a/misc/cardboard-schedule/files/csched.sh +++ b/misc/cardboard-schedule/files/csched.sh @@ -1,2 +1,2 @@ #!/bin/sh -@JAVA_HOME@/bin/java -classpath @PREFIX@/lib/cardboard-schedule/stage/cs.jar:@PREFIX@/lib/cardboard-schedule/stage/CsHelp.jar:@PREFIX@/lib/cardboard-schedule/stage/jhbasic.jar:@PREFIX@/lib/cardboard-schedule/stage/swing.jar:${CLASSPATH} avg.cs.gui.CsMainApp +@JAVA_HOME@/bin/jre -cp @PREFIX@/lib/cardboard-schedule/stage/cs.jar:@PREFIX@/lib/cardboard-schedule/stage/CsHelp.jar:@PREFIX@/lib/cardboard-schedule/stage/jhbasic.jar:@LOCALBASE@/lib/java/swingall.jar:${CLASSPATH} avg.cs.gui.CsMainApp diff --git a/misc/cardboard-schedule/pkg/PLIST b/misc/cardboard-schedule/pkg/PLIST index f65613e37b9..332d0c9f465 100644 --- a/misc/cardboard-schedule/pkg/PLIST +++ b/misc/cardboard-schedule/pkg/PLIST @@ -1,10 +1,9 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2000/02/28 22:11:57 jwise Exp $ +@comment $NetBSD: PLIST,v 1.2 2000/05/26 18:21:11 jwise Exp $ bin/csched lib/cardboard-schedule/cs/images/Logo2.gif lib/cardboard-schedule/cs/images/Logo.gif lib/cardboard-schedule/stage/cs.jar lib/cardboard-schedule/stage/readme.txt -lib/cardboard-schedule/stage/swing.jar lib/cardboard-schedule/stage/jhbasic.jar lib/cardboard-schedule/stage/license.txt lib/cardboard-schedule/stage/CsHelp.jar |