diff options
| author | veego <veego> | 2005-02-21 20:12:01 +0000 |
|---|---|---|
| committer | veego <veego> | 2005-02-21 20:12:01 +0000 |
| commit | 487bcaa3d29ce32a32fdaffc63392249bd3686b4 (patch) | |
| tree | 9f610d266a2d0402c7e9e50100a28685d32b6393 | |
| parent | bfb601b84f8b2a105c830ccc14cd230193c30e6d (diff) | |
| download | pkgsrc-487bcaa3d29ce32a32fdaffc63392249bd3686b4.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.
| -rw-r--r-- | mk/bsd.pkg.mk | 6 |
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 |