[pkgsrc/trunk]: pkgsrc/mk/plist Preserve the default value of PLIST_SRC as PL...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/789d7e36383b
branches:  trunk
changeset: 531046:789d7e36383b
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jul 18 14:12:30 2007 +0000

description:
Preserve the default value of PLIST_SRC as PLIST_SRC_DFLT while still
allowing PLIST_SRC to be overridden in a package Makefile.

It's now possible to do:

        PLIST_SRC=      ${PLIST_SRC_DFLT} ${WRKDIR}/PLIST_DYNAMIC

and still use the default PLIST.* fragment handling.

diffstat:

 mk/plist/plist.mk |  41 ++++++++++++++++++++---------------------
 1 files changed, 20 insertions(+), 21 deletions(-)

diffs (55 lines):

diff -r 4f1f4c213d7c -r 789d7e36383b mk/plist/plist.mk
--- a/mk/plist/plist.mk Wed Jul 18 14:09:55 2007 +0000
+++ b/mk/plist/plist.mk Wed Jul 18 14:12:30 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: plist.mk,v 1.25 2007/06/09 11:02:23 rillig Exp $
+# $NetBSD: plist.mk,v 1.26 2007/07/18 14:12:30 jlam Exp $
 #
 # This Makefile fragment handles the creation of PLISTs for use by
 # pkg_create(8).
@@ -37,26 +37,25 @@
 
 ######################################################################
 
-.if !defined(PLIST_SRC)
-.  if exists(${PKGDIR}/PLIST.common)
-PLIST_SRC+=    ${PKGDIR}/PLIST.common
-.  endif
-.  if exists(${PKGDIR}/PLIST.${OPSYS})
-PLIST_SRC+=    ${PKGDIR}/PLIST.${OPSYS}
-.  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}
-.  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}
-.  endif
-.  if exists(${PKGDIR}/PLIST)
-PLIST_SRC+=    ${PKGDIR}/PLIST
-.  endif
-.  if exists(${PKGDIR}/PLIST.common_end)
-PLIST_SRC+=    ${PKGDIR}/PLIST.common_end
-.  endif
-.endif # !PLIST_SRC
+.if exists(${PKGDIR}/PLIST.common)
+PLIST_SRC_DFLT+=       ${PKGDIR}/PLIST.common
+.endif
+.if exists(${PKGDIR}/PLIST.${OPSYS})
+PLIST_SRC_DFLT+=       ${PKGDIR}/PLIST.${OPSYS}
+.endif
+.if exists(${PKGDIR}/PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g})
+PLIST_SRC_DFLT+=       ${PKGDIR}/PLIST.${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_DFLT+=       ${PKGDIR}/PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g}
+.endif
+.if exists(${PKGDIR}/PLIST)
+PLIST_SRC_DFLT+=       ${PKGDIR}/PLIST
+.endif
+.if exists(${PKGDIR}/PLIST.common_end)
+PLIST_SRC_DFLT+=       ${PKGDIR}/PLIST.common_end
+.endif
+PLIST_SRC?=            ${PLIST_SRC_DFLT}
 
 # This is the path to the generated PLIST file.
 PLIST=         ${WRKDIR}/.PLIST