[pkgsrc/trunk]: pkgsrc/mk/plist Now that all info file entries have been push...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f1f8ad66827d
branches:  trunk
changeset: 511514:f1f8ad66827d
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Apr 16 04:27:17 2006 +0000

description:
Now that all info file entries have been pushed from INFO_FILES into
the PLISTs, drop support for listing info files in INFO_FILES.  The
INFO_FILES variable is now strictly defined/undefined.

diffstat:

 doc/guide/files/fixes.xml    |  24 ++++--------------------
 mk/install/bsd.pkginstall.mk |  15 +++------------
 mk/plist/plist.mk            |  21 ++-------------------
 3 files changed, 9 insertions(+), 51 deletions(-)

diffs (118 lines):

diff -r 5503aba733fd -r f1f8ad66827d doc/guide/files/fixes.xml
--- a/doc/guide/files/fixes.xml Sun Apr 16 02:09:48 2006 +0000
+++ b/doc/guide/files/fixes.xml Sun Apr 16 04:27:17 2006 +0000
@@ -1,4 +1,4 @@
-<!-- $NetBSD: fixes.xml,v 1.50 2006/04/08 07:43:41 reed Exp $ -->
+<!-- $NetBSD: fixes.xml,v 1.51 2006/04/16 04:27:18 jlam Exp $ -->
 
 <chapter id="fixes"> <?dbhtml filename="fixes.html"?>
   <title>Making your package work</title>
@@ -1148,25 +1148,9 @@
        located. <varname>PKGINFODIR</varname> defaults to
        <quote>info</quote> and can be overridden by the user.</para>
 
-      <para>There are two mutually exclusive ways to specify the info
-       files for the package:</para>
-
-      <itemizedlist>
-       <listitem>
-         <para>list each of info files in the package
-           <filename>PLIST</filename>; however any split info files
-           need not be listed, or</para>
-       </listitem>
-
-       <listitem>
-         <para>list the filename of each info file in the
-           <varname>INFO_FILES</varname> variable; however any split
-           info file filenames need not be listed. In this case
-           each of the info files should be installed into the
-           directory <filename>${PREFIX}/${PKGINFODIR}</filename>.</para>
-       </listitem>
-       
-      </itemizedlist>
+      <para>The info files for the package should be listed in the
+       package <filename>PLIST</filename>; however any split info files
+       need not be listed.</para>
 
       <para>A package which needs the <quote>makeinfo</quote> command
         at build time must add <quote>makeinfo</quote> to
diff -r 5503aba733fd -r f1f8ad66827d mk/install/bsd.pkginstall.mk
--- a/mk/install/bsd.pkginstall.mk      Sun Apr 16 02:09:48 2006 +0000
+++ b/mk/install/bsd.pkginstall.mk      Sun Apr 16 04:27:17 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkginstall.mk,v 1.45 2006/04/06 17:57:34 jlam Exp $
+# $NetBSD: bsd.pkginstall.mk,v 1.46 2006/04/16 04:27:17 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and implements the
 # common INSTALL/DEINSTALL scripts framework.  To use the pkginstall
@@ -488,17 +488,8 @@
 
 ${_INSTALL_INFO_FILES_DATAFILE}:
        ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-       ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${.TARGET} ${.TARGET}.tmp
-       ${_PKG_SILENT}${_PKG_DEBUG}${TOUCH} ${TOUCH_ARGS} ${.TARGET}.tmp
-       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
-       set -- dummy ${INFO_FILES}; shift;                              \
-       exec 1>>${.TARGET}.tmp;                                         \
-       while ${TEST} $$# -gt 0; do                                     \
-               file="$$1"; shift;                                      \
-               file=${PKGINFODIR:Q}"/$$file";                          \
-               ${ECHO} "# INFO: $$file";                               \
-       done
-       ${_PKG_SILENT}${_PKG_DEBUG}${MV} -f ${.TARGET}.tmp ${.TARGET}
+       ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${.TARGET}
+       ${_PKG_SILENT}${_PKG_DEBUG}${TOUCH} ${TOUCH_ARGS} ${.TARGET}
 
 ${_INSTALL_INFO_FILES_FILE}: ${_INSTALL_INFO_FILES_DATAFILE}
 ${_INSTALL_INFO_FILES_FILE}: ../../mk/install/info-files
diff -r 5503aba733fd -r f1f8ad66827d mk/plist/plist.mk
--- a/mk/plist/plist.mk Sun Apr 16 02:09:48 2006 +0000
+++ b/mk/plist/plist.mk Sun Apr 16 04:27:17 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: plist.mk,v 1.8 2006/04/05 05:54:01 jlam Exp $
+# $NetBSD: plist.mk,v 1.9 2006/04/16 04:27:18 jlam Exp $
 #
 # This Makefile fragment handles the creation of PLISTs for use by
 # pkg_create(8).
@@ -173,18 +173,6 @@
 #
 GENERATE_PLIST?=       ${TRUE};
 
-# XXX Generate info page entries for each of the listed INFO_FILES.
-# XXX This section should go away after info file listings have been
-# XXX pushed into the PLISTs.
-# XXX
-.if defined(INFO_FILES) && !empty(INFO_FILES)
-.  for _file_ in ${INFO_FILES}
-_INFO_GENERATE_PLIST+= ${ECHO} "info/"${_file_:Q};
-.  endfor
-.else
-_INFO_GENERATE_PLIST=  ${TRUE};
-.endif
-
 .if ${PKG_INSTALLATION_TYPE} == "pkgviews"
 #
 # _PLIST_IGNORE_FILES basically mirrors the list of ignored files found
@@ -224,8 +212,7 @@
                ${SED} -e "s|^${PREFIX}/|@unexec ${RMDIR} -p %D/|"      \
                       -e "s,$$, 2>/dev/null || ${TRUE},";
 .else
-_GENERATE_PLIST=       { ${_INFO_GENERATE_PLIST} };                    \
-                       ${CAT} ${PLIST_SRC};                            \
+_GENERATE_PLIST=       ${CAT} ${PLIST_SRC};                            \
                        ${GENERATE_PLIST}
 .endif
 
@@ -243,12 +230,8 @@
                > ${.TARGET}
 
 .if defined(INFO_FILES)
-.  if empty(INFO_FILES)
 INFO_FILES_cmd=                                                                \
        ${CAT} ${PLIST} |                                               \
        ${SETENV} ${_PLIST_AWK_ENV} ${AWK} ${_PLIST_INFO_AWK} |         \
        ${AWK} '($$0 !~ "-[0-9]*(\.gz)?$$") { print }'
-.  else
-INFO_FILES_cmd=        ${TRUE}
-.  endif
 .endif