[pkgsrc/trunk]: pkgsrc/mk/install Add the config files to the view also when ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/76589d8d7857
branches:  trunk
changeset: 461265:76589d8d7857
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Sep 13 10:06:36 2003 +0000

description:
Add the config files to the view also when there are rc.d scripts present.
Ignore any .pkgsrc files as those aren't meaningful for views.

diffstat:

 mk/install/deinstall |  6 ++++--
 mk/install/header    |  4 +++-
 mk/install/install   |  9 ++++++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diffs (75 lines):

diff -r 3135eed81d9c -r 76589d8d7857 mk/install/deinstall
--- a/mk/install/deinstall      Sat Sep 13 09:24:07 2003 +0000
+++ b/mk/install/deinstall      Sat Sep 13 10:06:36 2003 +0000
@@ -1,6 +1,6 @@
 # start of deinstall
 #
-# $NetBSD: deinstall,v 1.20 2003/09/12 05:15:06 jlam Exp $
+# $NetBSD: deinstall,v 1.21 2003/09/13 10:06:36 jlam Exp $
 
 eval set -- ${PKG_USERS}
 for userset; do
@@ -35,6 +35,7 @@
                file="${RCD_SCRIPTS_DIR}/${script}"
                shift
                ALL_FILES="${ALL_FILES} \"${samplefile}\" \"${file}\""
+               VIEW_FILES="${VIEW_FILES} \"${file}\""
        done
 fi
 eval set -- ${CONF_FILES_PERMS} ${SUPPORT_FILES_PERMS}
@@ -77,7 +78,8 @@
 VIEW-DEINSTALL)
        if [ "${_PKG_CONFIG}" = "YES" -a -n "${VIEW_FILES}" ]; then
                if [ -n "${PKG_SYSCONFDEPOTBASE}" ]; then
-                       ${LINKFARM} -D -t ${PKG_SYSCONFVIEWBASE} -d ${PKG_SYSCONFDEPOTBASE} ${PKGNAME}
+                       ${SETENV} PLIST_IGNORE_FILES="${CONF_IGNORE_FILES}" \
+                               ${LINKFARM} -D -t ${PKG_SYSCONFVIEWBASE} -d ${PKG_SYSCONFDEPOTBASE} ${PKGNAME}
                        ${RMDIR} -p ${PKG_SYSCONFVIEWBASE} 2>/dev/null || ${TRUE}
                else
                        eval set -- ${VIEW_FILES}
diff -r 3135eed81d9c -r 76589d8d7857 mk/install/header
--- a/mk/install/header Sat Sep 13 09:24:07 2003 +0000
+++ b/mk/install/header Sat Sep 13 10:06:36 2003 +0000
@@ -2,7 +2,7 @@
 #
 # start of header
 #
-# $NetBSD: header,v 1.21 2003/09/12 05:15:07 jlam Exp $
+# $NetBSD: header,v 1.22 2003/09/13 10:06:36 jlam Exp $
 
 PKGNAME=$1
 STAGE=$2
@@ -93,6 +93,8 @@
 ALL_DIRS=
 VIEW_FILES=
 
+CONF_IGNORE_FILES="*[~#] *.OLD *.orig *,v .pkgsrc */.pkgsrc"
+
 PKG_INSTALLATION_TYPE="@PKG_INSTALLATION_TYPE@"
 
 case "${PKG_CREATE_USERGROUP:-@PKG_CREATE_USERGROUP@}" in
diff -r 3135eed81d9c -r 76589d8d7857 mk/install/install
--- a/mk/install/install        Sat Sep 13 09:24:07 2003 +0000
+++ b/mk/install/install        Sat Sep 13 10:06:36 2003 +0000
@@ -1,6 +1,6 @@
 # start of install
 #
-# $NetBSD: install,v 1.23 2003/09/12 05:15:07 jlam Exp $
+# $NetBSD: install,v 1.24 2003/09/13 10:06:36 jlam Exp $
 
 if [ -z "${CONF_FILES}" -a -z "${CONF_FILES_PERMS}" -a                 \
      -z "${SUPPORT_FILES}" -a -z "${SUPPORT_FILES_PERMS}" -o           \
@@ -382,8 +382,11 @@
                if [ -n "${CONF_FILES}" -o                              \
                     -n "${CONF_FILES_PERMS}" -o                        \
                     -n "${SUPPORT_FILES}" -o                           \
-                    -n "${SUPPORT_FILES_PERMS}" ]; then
-                       ${LINKFARM} -t ${PKG_SYSCONFVIEWBASE} -d ${PKG_SYSCONFDEPOTBASE} ${PKGNAME}
+                    -n "${SUPPORT_FILES_PERMS}" ] ||                   \
+                  [ "${_PKG_RCD_SCRIPTS}" = "YES" -a                   \
+                    -n "${RCD_SCRIPTS}" ]; then
+                       ${SETENV} PLIST_IGNORE_FILES="${CONF_IGNORE_FILES}" \
+                               ${LINKFARM} -t ${PKG_SYSCONFVIEWBASE} -d ${PKG_SYSCONFDEPOTBASE} ${PKGNAME}
                fi
        fi
        ;;