diff options
| author | agc <agc> | 1998-02-13 15:16:43 +0000 |
|---|---|---|
| committer | agc <agc> | 1998-02-13 15:16:43 +0000 |
| commit | ff8e00c3dd0f6da3324a996cfee5d42f3def19ae (patch) | |
| tree | b79231fafc12862f62b1f54dc6fc7f2d3296274c /mk | |
| parent | fb95b7eae014a576f02b888d558a63e7a6317f60 (diff) | |
| download | pkgsrc-ff8e00c3dd0f6da3324a996cfee5d42f3def19ae.tar.gz | |
When generating the PLIST, if a manual page name has to have .gz added
or removed using sed, don't add the g at the end of the substitution
expression - there will only be one substitution per line.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 10 | ||||
| -rw-r--r-- | mk/bsd.port.mk | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 361ab0e6b7d..01777c67a90 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,7 +1,7 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $NetBSD: bsd.pkg.mk,v 1.44 1998/02/09 00:47:23 hubertf Exp $ +# $NetBSD: bsd.pkg.mk,v 1.45 1998/02/13 15:16:43 agc Exp $ # # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. @@ -1929,8 +1929,8 @@ ${PLIST}: ${PLIST_SRC} .if defined(MANZ) @if [ ! -z "${PLIST_SRC}" ] ; then \ ${CAT} ${PLIST_SRC} | ${SED} \ - -e '/man\/man.*[^g][^z]$$/s/$$/.gz/g' \ - -e '/man\/cat.*[^g][^z]$$/s/$$/.gz/g' \ + -e '/man\/man.*[^g][^z]$$/s/$$/.gz/' \ + -e '/man\/cat.*[^g][^z]$$/s/$$/.gz/' \ -e 's/<\$$ARCH>/'${ARCH}'/g' \ -e 's/\$${MACHINE_ARCH}/'${MACHINE_ARCH}'/g' \ >${PLIST} ; \ @@ -1938,8 +1938,8 @@ ${PLIST}: ${PLIST_SRC} .else # !MANZ @if [ ! -z "${PLIST_SRC}" ] ; then \ ${CAT} ${PLIST_SRC} | ${SED} \ - -e '/man\/man/s/\.gz$$//g' \ - -e '/man\/cat/s/\.gz$$//g' \ + -e '/man\/man/s/\.gz$$//' \ + -e '/man\/cat/s/\.gz$$//' \ -e 's/<\$$ARCH>/'${ARCH}'/g' \ -e 's/\$${MACHINE_ARCH}/'${MACHINE_ARCH}'/g' \ >${PLIST} ; \ diff --git a/mk/bsd.port.mk b/mk/bsd.port.mk index 08b60a628b0..39c9404ff58 100644 --- a/mk/bsd.port.mk +++ b/mk/bsd.port.mk @@ -1,7 +1,7 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $NetBSD: bsd.port.mk,v 1.44 1998/02/09 00:47:23 hubertf Exp $ +# $NetBSD: bsd.port.mk,v 1.45 1998/02/13 15:16:43 agc Exp $ # # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. @@ -1929,8 +1929,8 @@ ${PLIST}: ${PLIST_SRC} .if defined(MANZ) @if [ ! -z "${PLIST_SRC}" ] ; then \ ${CAT} ${PLIST_SRC} | ${SED} \ - -e '/man\/man.*[^g][^z]$$/s/$$/.gz/g' \ - -e '/man\/cat.*[^g][^z]$$/s/$$/.gz/g' \ + -e '/man\/man.*[^g][^z]$$/s/$$/.gz/' \ + -e '/man\/cat.*[^g][^z]$$/s/$$/.gz/' \ -e 's/<\$$ARCH>/'${ARCH}'/g' \ -e 's/\$${MACHINE_ARCH}/'${MACHINE_ARCH}'/g' \ >${PLIST} ; \ @@ -1938,8 +1938,8 @@ ${PLIST}: ${PLIST_SRC} .else # !MANZ @if [ ! -z "${PLIST_SRC}" ] ; then \ ${CAT} ${PLIST_SRC} | ${SED} \ - -e '/man\/man/s/\.gz$$//g' \ - -e '/man\/cat/s/\.gz$$//g' \ + -e '/man\/man/s/\.gz$$//' \ + -e '/man\/cat/s/\.gz$$//' \ -e 's/<\$$ARCH>/'${ARCH}'/g' \ -e 's/\$${MACHINE_ARCH}/'${MACHINE_ARCH}'/g' \ >${PLIST} ; \ |