diff options
| author | agc <agc> | 1997-10-09 10:38:13 +0000 |
|---|---|---|
| committer | agc <agc> | 1997-10-09 10:38:13 +0000 |
| commit | e10d0bdb9762d33023c514909f02e3b009bddc44 (patch) | |
| tree | 158c14c77d3a6c4bca0657326a26e483c1bad2bc /mk | |
| parent | 1b033166495e542a5656a3b2cb28b7089a7720ef (diff) | |
| download | pkgsrc-e10d0bdb9762d33023c514909f02e3b009bddc44.tar.gz | |
s/sed/${SED}/g
Change <$ARCH> into bsd.port.mk's ${ARCH} value (uname -m) when
constructing the derived PLIST, so that we can use packages on
non-i386 NetBSD architectures and have the correct file names in the
installed inventory.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 9 | ||||
| -rw-r--r-- | mk/bsd.port.mk | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index f8079e4a3fd..e060167f33c 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -2,7 +2,7 @@ # ex:ts=4 # # Id: bsd.port.mk,v 1.263 1997/07/17 17:47:36 markm Exp -# $NetBSD: bsd.pkg.mk,v 1.10 1997/10/07 00:30:31 hubertf Exp $ +# $NetBSD: bsd.pkg.mk,v 1.11 1997/10/09 10:38:13 agc Exp $ # # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. @@ -1808,16 +1808,19 @@ tags: # - fixing list of man-pages according to MANCOMPRESSED/MANZ # (we don't regard MANCOMPRESSED as many ports seem to have .gz pages in # PLIST even when they install manpages without compressing them) +# - substituting machine architecture (uname -m) for <$ARCH> ${PLIST}: ${PKGDIR}/PLIST .if defined(MANZ) - @sed \ + @${SED} \ -e '/man\/man.*[^g][^z]$$/s/$$/.gz/g' \ -e '/man\/cat.*[^g][^z]$$/s/$$/.gz/g' \ + -e 's/\<\$$ARCH\>/'${ARCH}'/g' \ <${PKGDIR}/PLIST >${PLIST} .else # !MANZ - @sed \ + @${SED} \ -e '/man\/man/s/\.gz$$//g' \ -e '/man\/cat/s/\.gz$$//g' \ + -e 's/\<\$$ARCH\>/'${ARCH}'/g' \ <${PKGDIR}/PLIST >${PLIST} .endif # MANZ diff --git a/mk/bsd.port.mk b/mk/bsd.port.mk index d50e5e5ce63..33defb4a15e 100644 --- a/mk/bsd.port.mk +++ b/mk/bsd.port.mk @@ -2,7 +2,7 @@ # ex:ts=4 # # Id: bsd.port.mk,v 1.263 1997/07/17 17:47:36 markm Exp -# $NetBSD: bsd.port.mk,v 1.10 1997/10/07 00:30:31 hubertf Exp $ +# $NetBSD: bsd.port.mk,v 1.11 1997/10/09 10:38:13 agc Exp $ # # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. @@ -1808,16 +1808,19 @@ tags: # - fixing list of man-pages according to MANCOMPRESSED/MANZ # (we don't regard MANCOMPRESSED as many ports seem to have .gz pages in # PLIST even when they install manpages without compressing them) +# - substituting machine architecture (uname -m) for <$ARCH> ${PLIST}: ${PKGDIR}/PLIST .if defined(MANZ) - @sed \ + @${SED} \ -e '/man\/man.*[^g][^z]$$/s/$$/.gz/g' \ -e '/man\/cat.*[^g][^z]$$/s/$$/.gz/g' \ + -e 's/\<\$$ARCH\>/'${ARCH}'/g' \ <${PKGDIR}/PLIST >${PLIST} .else # !MANZ - @sed \ + @${SED} \ -e '/man\/man/s/\.gz$$//g' \ -e '/man\/cat/s/\.gz$$//g' \ + -e 's/\<\$$ARCH\>/'${ARCH}'/g' \ <${PKGDIR}/PLIST >${PLIST} .endif # MANZ |