diff options
| author | dmcmahill <dmcmahill> | 2009-02-20 05:16:51 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill> | 2009-02-20 05:16:51 +0000 |
| commit | 3154407b86795686f86ade3dcb6ba9a408a874ce (patch) | |
| tree | 5b5e21daeb1fc2c32e0bf1d078a89c5d59565c6c /pkgtools/cdpack/Makefile | |
| parent | 5b48572fb1078138f4bd4518089098ebd6d96428 (diff) | |
| download | pkgsrc-3154407b86795686f86ade3dcb6ba9a408a874ce.tar.gz | |
Update to cdpack-1.9. This version teaches cdpack how to add packages
ending in .tbz as well as .tgz. Should address the problem reported
in PR pkg/40515. I am explicitly not using the mk.conf settings
for PKG_SUFX though because at run time we may or may not have a valid
mk.conf on hand that corresponds to how the packages were built.
Diffstat (limited to 'pkgtools/cdpack/Makefile')
| -rw-r--r-- | pkgtools/cdpack/Makefile | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/pkgtools/cdpack/Makefile b/pkgtools/cdpack/Makefile index 8b6976877c9..5b2cd0b8980 100644 --- a/pkgtools/cdpack/Makefile +++ b/pkgtools/cdpack/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.28 2008/06/16 15:29:35 joerg Exp $ +# $NetBSD: Makefile,v 1.29 2009/02/20 05:16:51 dmcmahill Exp $ # -DISTNAME= cdpack-1.8 +DISTNAME= cdpack-1.9 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty @@ -20,9 +20,12 @@ NO_CHECKSUM= yes NO_CONFIGURE= yes USE_TOOLS+= awk:run +USE_TOOLS+= bzcat:run USE_TOOLS+= expr:run +USE_TOOLS+= gzcat:run USE_TOOLS+= printf:run USE_TOOLS+= sort:run +USE_TOOLS+= tar:run USE_TOOLS+= tsort:run INSTALLATION_DIRS= bin libexec ${PKGMANDIR}/man1 @@ -32,14 +35,21 @@ do-build: ${SED} -e 's;@prefix@;${PREFIX};g' \ -e 's;@progver@;${PKGVERSION};g' \ -e 's;@AWK@;${AWK};g' \ + -e 's;@BZCAT@;${BZCAT};g' \ -e 's;@EXPR@;${EXPR};g' \ + -e 's;@GZCAT@;${GZCAT};g' \ -e 's;@PRINTF@;${PRINTF};g' \ -e 's;@SORT@;${SORT};g' \ + -e 's;@TAR@;${TAR};g' \ -e 's;@TSORT@;${TSORT};g' \ ${FILESDIR}/${f}.sh > \ ${WRKSRC}/${f} ${CHMOD} 755 ${WRKDIR}/${f} - ${SED} -e 's;@AWK@;${AWK};g' ${FILESDIR}/${f}.1 > \ + ${SED} -e 's;@AWK@;${AWK};g' \ + -e 's;@BZCAT@;${BZCAT};g' \ + -e 's;@GZCAT@;${GZCAT};g' \ + -e 's;@TAR@;${TAR};g' \ + ${FILESDIR}/${f}.1 > \ ${WRKSRC}/${f}.1 .endfor ${SED} -e 's;@AWK@;${AWK};g' ${FILESDIR}/cdgen.awk > \ |