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 | b938c87fee7557bd0c97a20994ddbc49c229647f (patch) | |
| tree | 60d6ee41d3aed4bf19f35004c1b81fe5bca3b199 /mk/install | |
| parent | c8650bb729f0205d5f80e7b149185b8a2567d848 (diff) | |
| download | pkgsrc-b938c87fee7557bd0c97a20994ddbc49c229647f.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')
| -rw-r--r-- | mk/install/deinstall | 6 | ||||
| -rw-r--r-- | mk/install/header | 4 | ||||
| -rw-r--r-- | mk/install/install | 9 |
3 files changed, 13 insertions, 6 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} diff --git a/mk/install/header b/mk/install/header index a534eb75039..a86d04e4b09 100644 --- a/mk/install/header +++ b/mk/install/header @@ -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_MAKE_DIRS= 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 --git a/mk/install/install b/mk/install/install index 28838adf772..fe296488be1 100644 --- a/mk/install/install +++ b/mk/install/install @@ -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 @@ VIEW-INSTALL) 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 ;; |