summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorveego <veego>2005-02-21 20:12:01 +0000
committerveego <veego>2005-02-21 20:12:01 +0000
commit02f7b6ddb47025a9674f28f96f9dfe50e0dbd8d8 (patch)
tree9f610d266a2d0402c7e9e50100a28685d32b6393 /mk
parent40c1d1efdcd1e0ba4a9cf5211095fe6c23c18f3c (diff)
downloadpkgsrc-02f7b6ddb47025a9674f28f96f9dfe50e0dbd8d8.tar.gz
Change the files to be used for PLIST_SRC from
PLIST.common PLIST.${OPSYS} PLIST PLIST.common_end to PLIST.common PLIST.${OPSYS} PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g} PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g} PLIST PLIST.common_end Which makes it possible to remove duplicated code in some packages. This doesn't change anything, because all affected packages define PLIST_SRC, so this code would never be used for them. And most of them will be fixed with the next commit. ToDO: ${MACHINE_ARCH:C/i[3-6]86/i386/g} looks wrong and should be changed, but thats what we allready use for MESSAGE_SRC.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 6cffbed4f7f..15efbfd13cb 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1592 2005/02/20 06:02:06 grant Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1593 2005/02/21 20:12:01 veego Exp $
#
# This file is in the public domain.
#
@@ -107,6 +107,10 @@ PLIST_SRC+= ${PKGDIR}/PLIST.common
. endif
. if exists(${PKGDIR}/PLIST.${OPSYS})
PLIST_SRC+= ${PKGDIR}/PLIST.${OPSYS}
+. elif exists(${PKGDIR}/PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g})
+PLIST_SRC+= ${PKGDIR}/PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g}
+. elif exists(${PKGDIR}/PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g})
+PLIST_SRC+= ${PKGDIR}/PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g}
. elif exists(${PKGDIR}/PLIST)
PLIST_SRC+= ${PKGDIR}/PLIST
. endif