[pkgsrc/trunk]: pkgsrc/mk Fix PLIST_SRC error introduced in rev 1.1593.

[veego <veego%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4e7fa9b7824d
branches:  trunk
changeset: 489878:4e7fa9b7824d
user:      veego <veego%pkgsrc.org@localhost>
date:      Sun Feb 27 22:10:25 2005 +0000

description:
Fix PLIST_SRC error introduced in rev 1.1593.
Before this fix it would include
  PLIST.common
then _only_ one of the following
  PLIST.${OPSYS}
  PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g}
  PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g}
  PLIST
and then PLIST.common_end.

Now, uses all of the following PLIST files, in that order:

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

diffstat:

 mk/bsd.pkg.mk |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (27 lines):

diff -r 670ae3112900 -r 4e7fa9b7824d mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Sun Feb 27 22:06:10 2005 +0000
+++ b/mk/bsd.pkg.mk     Sun Feb 27 22:10:25 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1595 2005/02/25 13:05:52 agc Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1596 2005/02/27 22:10:25 veego Exp $
 #
 # This file is in the public domain.
 #
@@ -107,11 +107,14 @@
 .  endif
 .  if exists(${PKGDIR}/PLIST.${OPSYS})
 PLIST_SRC+=            ${PKGDIR}/PLIST.${OPSYS}
-.  elif exists(${PKGDIR}/PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g})
+.  endif
+.  if 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})
+.  endif
+.  if 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)
+.  endif
+.  if exists(${PKGDIR}/PLIST)
 PLIST_SRC+=            ${PKGDIR}/PLIST
 .  endif
 .  if exists(${PKGDIR}/PLIST.common_end)