pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/plist Allow packages to have no PLIST files whatsoe...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3aa12b2d361f
branches:  trunk
changeset: 534522:3aa12b2d361f
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Oct 25 16:46:14 2007 +0000

description:
Allow packages to have no PLIST files whatsoever.  If such a package also
does not set GENERATE_PLIST, then automatically generate a PLIST that
says:
        @comment ${PKGNAME} has no files.

diffstat:

 mk/plist/plist.mk |  15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diffs (42 lines):

diff -r e583ef43262e -r 3aa12b2d361f mk/plist/plist.mk
--- a/mk/plist/plist.mk Thu Oct 25 16:12:04 2007 +0000
+++ b/mk/plist/plist.mk Thu Oct 25 16:46:14 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: plist.mk,v 1.32 2007/10/10 02:37:13 rillig Exp $
+# $NetBSD: plist.mk,v 1.33 2007/10/25 16:46:14 jlam Exp $
 #
 # This Makefile fragment handles the creation of PLISTs for use by
 # pkg_create(8).
@@ -171,7 +171,11 @@
 #      that outputs contents for a PLIST to stdout and is appended to
 #      the contents of ${PLIST_SRC}.
 #
+.if !empty(PLIST_SRC)
 GENERATE_PLIST?=       ${TRUE};
+.else
+GENERATE_PLIST?=       ${ECHO} "@comment "${PKGNAME:Q}" has no files";
+.endif
 
 .if ${PKG_INSTALLATION_TYPE} == "pkgviews"
 #
@@ -212,14 +216,17 @@
                ${SED} -e "s|^${DESTDIR}${PREFIX}/|@unexec ${RMDIR} -p %D/|"    \
                       -e "s,$$, 2>/dev/null || ${TRUE},";
 .else
-_GENERATE_PLIST=       ${CAT} ${PLIST_SRC};                            \
-                       ${GENERATE_PLIST}
+.  if !empty(PLIST_SRC)
+_GENERATE_PLIST=       ${CAT} ${PLIST_SRC}; ${GENERATE_PLIST}
+.  else
+_GENERATE_PLIST=       ${GENERATE_PLIST}
+.  endif
 .endif
 
 .PHONY: plist
 plist: ${PLIST} ${_PLIST_NOKEYWORDS}
 
-.if ${PLIST_TYPE} == "static"
+.if (${PLIST_TYPE} == "static") && !empty(PLIST_SRC)
 ${PLIST}: ${PLIST_SRC}
 .endif
 ${PLIST}:



Home | Main Index | Thread Index | Old Index