diff options
| author | rh <rh> | 2003-05-04 01:20:13 +0000 |
|---|---|---|
| committer | rh <rh> | 2003-05-04 01:20:13 +0000 |
| commit | 3faba18d6babbe399b6a245f28c3d7a8ddb5c850 (patch) | |
| tree | 4a7ec842af14db716f4ab8824f2d14e5f2cd6b2a /mk | |
| parent | 854d369b661ee63f76c931f375c35bac1d269f8b (diff) | |
| download | pkgsrc-3faba18d6babbe399b6a245f28c3d7a8ddb5c850.tar.gz | |
Make UPDATE_TARGET=replace somewhat useful: don't remove the original
package in this case.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index ffd7b73ce0a..fb7985448f1 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1177 2003/04/30 04:05:48 atatat Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1178 2003/05/04 01:20:13 rh Exp $ # # This file is in the public domain. # @@ -2901,7 +2901,7 @@ CLEAR_DIRLIST?= NO update: ${_PKG_SILENT}${_PKG_DEBUG}${ECHO_MSG} \ "${_PKGSRC_IN}> Resuming update for ${PKGNAME}" -. if ${REINSTALL} != "NO" +. if ${REINSTALL} != "NO" && ${UPDATE_TARGET} != "replace" ${_PKG_SILENT}${_PKG_DEBUG} \ ${MAKE} ${MAKEFLAGS} deinstall DEINSTALLDEPENDS=ALL . endif @@ -2911,10 +2911,12 @@ CLEAR_DIRLIST?= YES update: ${_PKG_SILENT}${_PKG_DEBUG}${MAKE} ${MAKEFLAGS} ${DDIR} +. if ${UPDATE_TARGET} != "replace" ${_PKG_SILENT}${_PKG_DEBUG}if ${PKG_INFO} -qe ${PKGBASE}; then \ ${MAKE} ${MAKEFLAGS} deinstall DEINSTALLDEPENDS=ALL \ || (${RM} ${DDIR} && ${FALSE}); \ fi +. endif .endif ${_PKG_SILENT}${_PKG_DEBUG} \ ${MAKE} ${MAKEFLAGS} ${UPDATE_TARGET} KEEP_WRKDIR=YES \ @@ -2923,8 +2925,9 @@ update: [ ! -s ${DDIR} ] || for dep in `${CAT} ${DDIR}` ; do \ (if cd ../.. && cd "$${dep}" ; then \ ${ECHO_MSG} "${_PKGSRC_IN}> Installing in $${dep}" && \ - if [ "${RESUMEUPDATE}" = "NO" -o \ - "${REINSTALL}" != "NO" ] ; then \ + if [ "(" "${RESUMEUPDATE}" = "NO" -o \ + "${REINSTALL}" != "NO" ")" -a \ + "${UPDATE_TARGET}" != "replace" ] ; then \ ${MAKE} ${MAKEFLAGS} deinstall; \ fi && \ ${MAKE} ${MAKEFLAGS} ${UPDATE_TARGET} \ |