diff options
| author | rillig <rillig> | 2006-02-04 23:47:56 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2006-02-04 23:47:56 +0000 |
| commit | 45c88dd8e01c3b644c8717ce8b3f884d024813f4 (patch) | |
| tree | 4bebaa3d1228a0c4d41ea35109c5e17e0c48e7f1 /time | |
| parent | a88aeaaf7ab579e8aa477dfdf054555fceeec965 (diff) | |
| download | pkgsrc-45c88dd8e01c3b644c8717ce8b3f884d024813f4.tar.gz | |
Made extraction possible even if unzip(1) is not in the PATH. Instead of
hiding bugs by using unzip || true, test if the needed file has been
extracted.
Diffstat (limited to 'time')
| -rw-r--r-- | time/cardboard-schedule/Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/time/cardboard-schedule/Makefile b/time/cardboard-schedule/Makefile index 26875b56af5..f91ac9bbdec 100644 --- a/time/cardboard-schedule/Makefile +++ b/time/cardboard-schedule/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/02/04 23:39:50 rillig Exp $ +# $NetBSD: Makefile,v 1.17 2006/02/04 23:47:56 rillig Exp $ # DISTNAME= cs113ins @@ -12,15 +12,17 @@ HOMEPAGE= http://cardboard.nu/downloads/ COMMENT= Project and resource management software implemented in Java/Swing USE_X11BASE= yes -DEPENDS+= unzip-[0-9]*:../../archivers/unzip RESTRICTED= "License prohibits redistribution on CDROM" NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} -USE_TOOLS+= gtar +USE_TOOLS+= gtar unzip -EXTRACT_CMD= cd ${WRKDIR} && unzip -x ${DOWNLOADED_DISTFILE} +EXTRACT_CMD= cd ${WRKDIR} && { \ + ${UNZIP_CMD} -x ${DOWNLOADED_DISTFILE} \ + || ${TEST} -f InstallerData/Installer.zip; \ + } WRKSRC= ${WRKDIR} CSFILES= cs/images/Logo2.gif \ @@ -34,7 +36,7 @@ CSFILES= cs/images/Logo2.gif \ INSTALLATION_DIRS= bin post-extract: - cd ${WRKDIR} && unzip -x InstallerData/Installer.zip + cd ${WRKDIR} && ${UNZIP_CMD} -x InstallerData/Installer.zip do-build: ${SED} -e s,@PREFIX@,${PREFIX},g < ${FILESDIR}/csched.sh > ${WRKDIR}/csched.tmp |