diff options
| author | hubertf <hubertf@pkgsrc.org> | 1999-08-21 01:17:59 +0000 |
|---|---|---|
| committer | hubertf <hubertf@pkgsrc.org> | 1999-08-21 01:17:59 +0000 |
| commit | eb25c27bf0302b991dd379fdfa7b1ebd281a43f5 (patch) | |
| tree | d6d093e2d37337cd0ccd4baf567a2bdd0ee246ce /mk | |
| parent | 8ce5d8beec70a11b01eaa0a1d59d6caad4336b01 (diff) | |
| download | pkgsrc-eb25c27bf0302b991dd379fdfa7b1ebd281a43f5.tar.gz | |
Let "make deinstall" remove any version installed, not only the one
currently in pkgsrc.
Enabled unconditionally by request of several people.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 8d4c2bd2111..69854137258 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.316 1999/08/19 07:32:57 tron Exp $ +# $NetBSD: bsd.pkg.mk,v 1.317 1999/08/21 01:17:59 hubertf Exp $ # # This file is in the public domain. # @@ -57,7 +57,7 @@ NOMANCOMPRESS?= yes DEF_UMASK?= 0022 CLEANDEPENDS?= NO -DEINSTALLDEPENDS?= NO +DEINSTALLDEPENDS?= NO # add -R to pkg_delete LOCALBASE?= ${DESTDIR}/usr/local X11BASE?= ${DESTDIR}/usr/X11R6 @@ -1534,23 +1534,24 @@ pkg-su-deinstall: uptodate-pkgtools else \ make=`${TYPE} ${MAKE} | ${AWK} '{ print $$NF }'`; \ ${ECHO_MSG} "===> Becoming root@`/bin/hostname` to deinstall ${PKGNAME}."; \ - ${SU_CMD} "cd ${.CURDIR}; $$make ${.MAKEFLAGS} root-deinstall"; \ + ${SU_CMD} "cd ${.CURDIR}; $$make ${.MAKEFLAGS} PKG_DEBUG_LEVEL=${PKG_DEBUG_LEVEL} root-deinstall"; \ fi -root-deinstall: -.ifdef PKG_VERBOSE -.if (${DEINSTALLDEPENDS} != "NO") - ${_PKG_SILENT}${_PKG_DEBUG}${PKG_DELETE} -v -R ${PKGNAME} || ${TRUE} -.else # DEINSTALLDEPENDS = NO - ${_PKG_SILENT}${_PKG_DEBUG}${PKG_DELETE} -v ${PKGNAME} || ${TRUE} -.endif # DEINSTALLDEPENDS != NO -.else # !PKG_VERBOSE + .if (${DEINSTALLDEPENDS} != "NO") - ${_PKG_SILENT}${_PKG_DEBUG}${PKG_DELETE} -R ${PKGNAME} || ${TRUE} -.else # DEINSTALLDEPENDS = NO - ${_PKG_SILENT}${_PKG_DEBUG}${PKG_DELETE} ${PKGNAME} || ${TRUE} -.endif # DEINSTALLDEPENDS != NO -.endif # PKG_VERBOSE +root-install-flags+= -R +.endif +.ifdef PKG_VERBOSE +root-install-flags+= -v +.endif + +root-deinstall: + ${_PKG_SILENT}${_PKG_DEBUG} \ + found=`${PKG_INFO} -e "${PKGNAME:C/-[^-]*$/-[0-9]*/}" || ${TRUE}` ; \ + if [ "$$found" != "" ]; then \ + ${ECHO_CMD} ${PKG_DELETE} ${root-install-flags} $$found || ${TRUE} ; \ + ${PKG_DELETE} ${root-install-flags} $$found || ${TRUE} ; \ + fi @${RM} -f ${INSTALL_COOKIE} ${PACKAGE_COOKIE} .endif # target(deinstall) |