diff options
| author | agc <agc> | 2002-04-02 09:41:39 +0000 |
|---|---|---|
| committer | agc <agc> | 2002-04-02 09:41:39 +0000 |
| commit | a1dcc0a7d77530059edd70997d788acd433dd617 (patch) | |
| tree | 00a9f19fc108be1f83d65bed4fb199e3fd21f696 /mk | |
| parent | 1dfee7cc5dd9976249d24fee42f6e69210546e04 (diff) | |
| download | pkgsrc-a1dcc0a7d77530059edd70997d788acd433dd617.tar.gz | |
Make the "replace" and "undo-replace" targets more useful:
+ Check for the existence of pkg_tarup, and fail if it can't be found.
+ Place the binary package of the replaced-package in the ${WRKDIR},
rather than overwriting any instance in ${PKGREPOSITORY}.
+ Don't make a binary package when undoing the replacement.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index baabfd3bca5..a91a79761a4 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.954 2002/03/26 16:31:27 skrll Exp $ +# $NetBSD: bsd.pkg.mk,v 1.955 2002/04/02 09:41:39 agc Exp $ # # This file is in the public domain. # @@ -2691,7 +2691,13 @@ _REPLACE= \ real-su-replace: ${_PKG_SILENT}${_PKG_DEBUG} \ ${ECHO_MSG} "*** WARNING - experimental target - data loss may be experienced ***"; \ - pkg_tarup ${PKGBASE} || (${ECHO} "Can't pkg_tarup ${PKGBASE}"; exit 1); \ + if [ -x ${LOCALBASE}/bin/pkg_tarup ]; then \ + ${SETENV} PKGREPOSITORY=${WRKDIR} ${LOCALBASE}/bin/pkg_tarup ${PKGBASE}; \ + else \ + ${ECHO} "No ${LOCALBASE}/bin/pkg_tarup binary - can't pkg_tarup ${PKGBASE}"; \ + exit 1; \ + fi + ${_PKG_SILENT}${_PKG_DEBUG} \ oldpkgname=`${PKG_INFO} -e ${PKGBASE}`; \ newpkgname=${PKGNAME}; \ ${ECHO} "$$oldpkgname" > ${WRKDIR}/.replace; \ @@ -2704,12 +2710,12 @@ real-su-undo-replace: if [ ! -f ${WRKDIR}/.replace ]; then \ ${ECHO_MSG} "No replacement to undo"; \ exit 1; \ - fi; \ + fi + ${_PKG_SILENT}${_PKG_DEBUG} \ ${ECHO_MSG} "*** WARNING - experimental target - data loss may be experienced ***"; \ - pkg_tarup ${PKGBASE} || (${ECHO} "Can't pkg_tarup ${PKGBASE}"; exit 1); \ oldpkgname=${PKGNAME}; \ newpkgname=`${CAT} ${WRKDIR}/.replace`; \ - replace_action="${SETENV} ${PKG_ADD} ${PKGREPOSITORY}/$$newpkgname${PKG_SUFX}"; \ + replace_action="${SETENV} ${PKG_ADD} ${WRKDIR}/$$newpkgname${PKG_SUFX}"; \ ${_REPLACE}; \ ${RM} ${WRKDIR}/.replace |