summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorhubertf <hubertf>1998-01-28 15:33:44 +0000
committerhubertf <hubertf>1998-01-28 15:33:44 +0000
commit444db71c0e95ce1f24612a634f1ad44793fdef3a (patch)
tree83e8ff7ed5c97c543bbfc7e505985f2efd5eb0e0 /mk
parent658b0db488d01729258ef4274d4087fad210a0aa (diff)
downloadpkgsrc-444db71c0e95ce1f24612a634f1ad44793fdef3a.tar.gz
Replace "<$ARCH"> by "${MACHINE_ARCH}", keep "<$ARCH>"
(in bsd.port.mk) for backward compatibility.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk8
-rw-r--r--mk/bsd.port.mk8
2 files changed, 10 insertions, 6 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index cade20fe81e..31f14fccbec 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.40 1998/01/27 13:14:07 agc Exp $
+# $NetBSD: bsd.pkg.mk,v 1.41 1998/01/28 15:36:31 hubertf Exp $
#
# bsd.port.mk - 940820 Jordan K. Hubbard.
# This file is in the public domain.
@@ -1923,7 +1923,8 @@ ${PLIST}: ${PLIST_SRC}
${CAT} ${PLIST_SRC} | ${SED} \
-e '/man\/man.*[^g][^z]$$/s/$$/.gz/g' \
-e '/man\/cat.*[^g][^z]$$/s/$$/.gz/g' \
- -e 's/\<\$$ARCH\>/'${ARCH}'/g' \
+ -e 's/<\$$ARCH>/'${ARCH}'/g' \
+ -e 's/\$${MACHINE_ARCH}/'${MACHINE_ARCH}'/g' \
>${PLIST} ; \
fi
.else # !MANZ
@@ -1931,7 +1932,8 @@ ${PLIST}: ${PLIST_SRC}
${CAT} ${PLIST_SRC} | ${SED} \
-e '/man\/man/s/\.gz$$//g' \
-e '/man\/cat/s/\.gz$$//g' \
- -e 's/\<\$$ARCH\>/'${ARCH}'/g' \
+ -e 's/<\$$ARCH>/'${ARCH}'/g' \
+ -e 's/\$${MACHINE_ARCH}/'${MACHINE_ARCH}'/g' \
>${PLIST} ; \
fi
.endif # MANZ
diff --git a/mk/bsd.port.mk b/mk/bsd.port.mk
index e189a6c6448..3aba09267a8 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.40 1998/01/27 13:14:07 agc Exp $
+# $NetBSD: bsd.port.mk,v 1.41 1998/01/28 15:36:31 hubertf Exp $
#
# bsd.port.mk - 940820 Jordan K. Hubbard.
# This file is in the public domain.
@@ -1923,7 +1923,8 @@ ${PLIST}: ${PLIST_SRC}
${CAT} ${PLIST_SRC} | ${SED} \
-e '/man\/man.*[^g][^z]$$/s/$$/.gz/g' \
-e '/man\/cat.*[^g][^z]$$/s/$$/.gz/g' \
- -e 's/\<\$$ARCH\>/'${ARCH}'/g' \
+ -e 's/<\$$ARCH>/'${ARCH}'/g' \
+ -e 's/\$${MACHINE_ARCH}/'${MACHINE_ARCH}'/g' \
>${PLIST} ; \
fi
.else # !MANZ
@@ -1931,7 +1932,8 @@ ${PLIST}: ${PLIST_SRC}
${CAT} ${PLIST_SRC} | ${SED} \
-e '/man\/man/s/\.gz$$//g' \
-e '/man\/cat/s/\.gz$$//g' \
- -e 's/\<\$$ARCH\>/'${ARCH}'/g' \
+ -e 's/<\$$ARCH>/'${ARCH}'/g' \
+ -e 's/\$${MACHINE_ARCH}/'${MACHINE_ARCH}'/g' \
>${PLIST} ; \
fi
.endif # MANZ