diff options
| author | dholland <dholland> | 2011-12-13 06:14:47 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2011-12-13 06:14:47 +0000 |
| commit | d133f0b95ccff683adadef318257c2a73650efdc (patch) | |
| tree | 3a7197d1eae1c5522b4dd75282b89383cacdde00 /time | |
| parent | d6b6255eb13f943320fc686f281c18de4cdf3cab (diff) | |
| download | pkgsrc-d133f0b95ccff683adadef318257c2a73650efdc.tar.gz | |
Fix build:
1. "unzip -x file.zip" does not work with any unzip I can find; drop
the -x.
2. Because there's a self-extracting archive, NetBSD's builtin unzip
doesn't work. When ${OPSYS} is NetBSD, explicitly depend on
archivers/unzip instead of adding unzip to USE_TOOLS. (I'm not sure
this is the right way to go about this. It at least works though.)
Diffstat (limited to 'time')
| -rw-r--r-- | time/cardboard-schedule/Makefile | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/time/cardboard-schedule/Makefile b/time/cardboard-schedule/Makefile index dad050ccab6..fd2e0323748 100644 --- a/time/cardboard-schedule/Makefile +++ b/time/cardboard-schedule/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2009/05/19 08:59:36 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2011/12/13 06:14:47 dholland Exp $ # DISTNAME= cs113ins @@ -22,11 +22,20 @@ PKG_DESTDIR_SUPPORT= user-destdir USE_X11BASE= yes -USE_TOOLS+= pax gtar unzip +USE_TOOLS+= pax gtar + +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "NetBSD" +BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip +UNZIP_CMD?= unzip +.else +USE_TOOLS+= unzip +.endif WRKSRC= ${WRKDIR} EXTRACT_CMD= cd ${WRKDIR:Q} && { \ - ${UNZIP_CMD} -x ${DOWNLOADED_DISTFILE} \ + ${UNZIP_CMD} ${DOWNLOADED_DISTFILE} \ || ${TEST} -f InstallerData/Installer.zip; \ } NO_BUILD= yes @@ -49,7 +58,7 @@ SUBST_SED.cs+= -e 's,@LOCALBASE@,${LOCALBASE},g' SUBST_SED.cs+= -e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g' post-extract: - cd ${WRKDIR} && ${UNZIP_CMD} -x InstallerData/Installer.zip + cd ${WRKDIR} && ${UNZIP_CMD} InstallerData/Installer.zip ${CP} ${FILESDIR:Q}/csched.sh ${WRKDIR:Q} do-install: |