diff options
| author | hubertf <hubertf> | 1999-04-20 20:28:11 +0000 |
|---|---|---|
| committer | hubertf <hubertf> | 1999-04-20 20:28:11 +0000 |
| commit | 163de363efc9cfaca0098ab7c80a9766d794f8ac (patch) | |
| tree | c31777658f276c33a483b3fbe3cebd47ed6e86f3 /mk | |
| parent | 6eb4416435fa24f5c086e94a68263f323cd6d9aa (diff) | |
| download | pkgsrc-163de363efc9cfaca0098ab7c80a9766d794f8ac.tar.gz | |
Replace deinstall-depends target with call to "pkg_delete -R" (now that
we have it for sure).
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 42 |
1 files changed, 13 insertions, 29 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index b134c29e4df..92b83e1b18e 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.257 1999/04/20 11:07:34 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.258 1999/04/20 20:28:11 hubertf Exp $ # # This file is in the public domain. # @@ -1569,36 +1569,20 @@ pkg-su-deinstall: uptodate-pkgtools 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} -.else - ${_PKG_SILENT}${_PKG_DEBUG}${PKG_DELETE} ${PKGNAME} || ${TRUE} -.endif - ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${INSTALL_COOKIE} ${PACKAGE_COOKIE} +.endif # DEINSTALLDEPENDS != NO +.else # !PKG_VERBOSE .if (${DEINSTALLDEPENDS} != "NO") - ${_PKG_SILENT}${_PKG_DEBUG} \ - ${PKG_INFO} -qe ${PKGNAME}; \ - if [ $$? -ne 0 ]; then \ - ${MAKE} deinstall-depends; \ - fi -.endif # DEINSTALLDEPENDS != "NO" -.endif # target(deinstall) - -# Deinstall-depends -# XXX Should be done with "pkg_delete -R" -# -# Like clean-depends, only to deinstall things -.if !target(deinstall-depends) -deinstall-depends: uptodate-pkgtools -.if defined(FETCH_DEPENDS) || defined(BUILD_DEPENDS) \ - || defined(DEPENDS) || defined(RUN_DEPENDS) - ${_PKG_SILENT}${_PKG_DEBUG} \ - for dir in `${ECHO} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${DEPENDS} ${RUN_DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//' | sort -u`; do \ - if [ -d $$dir ] ; then \ - (cd $$dir && ${MAKE} DEINSTALLDEPENDS=${DEINSTALLDEPENDS} deinstall); \ - fi \ - done -.endif # *_DEPENDS -.endif # deinstall-depends + ${_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 + @${RM} -f ${INSTALL_COOKIE} ${PACKAGE_COOKIE} +.endif # target(deinstall) .endif # __ARCH_OK |