diff options
| author | jlam <jlam@pkgsrc.org> | 2003-09-13 10:06:36 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2003-09-13 10:06:36 +0000 |
| commit | 435c602b22d3479f2ca3df390cd8dedd7d45d8cd (patch) | |
| tree | 60d6ee41d3aed4bf19f35004c1b81fe5bca3b199 /mk/install/deinstall | |
| parent | e98f26b486d725eb4a22854302564cc55855eb45 (diff) | |
| download | pkgsrc-435c602b22d3479f2ca3df390cd8dedd7d45d8cd.tar.gz | |
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 (limited to 'mk/install/deinstall')
| -rw-r--r-- | mk/install/deinstall | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mk/install/deinstall b/mk/install/deinstall index 267301c60e3..84e70d14a3a 100644 --- a/mk/install/deinstall +++ b/mk/install/deinstall @@ -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 @@ if [ "${_PKG_RCD_SCRIPTS}" = "YES" ]; then 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 @@ case ${STAGE} in 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} |