diff options
| author | antoine <antoine@FreeBSD.org> | 2014-08-09 05:01:38 +0800 |
|---|---|---|
| committer | antoine <antoine@FreeBSD.org> | 2014-08-09 05:01:38 +0800 |
| commit | a13a9bf950b9f64f28fde28837a72ce79eea2d9b (patch) | |
| tree | 361b20908b996e6c991decdabc5f4b4c4d85cf78 /Mk | |
| parent | 11263d487dc78a3958ef4c105d56b7c50f8c4ec6 (diff) | |
| download | freebsd-ports-gnome-a13a9bf950b9f64f28fde28837a72ce79eea2d9b.tar.gz freebsd-ports-gnome-a13a9bf950b9f64f28fde28837a72ce79eea2d9b.tar.zst freebsd-ports-gnome-a13a9bf950b9f64f28fde28837a72ce79eea2d9b.zip | |
Allow installing ports with the same origin but a different pkgname
Phabric: D565
Reviewed by: bapt
With hat: portmgr
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.pkgng.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Mk/bsd.pkgng.mk b/Mk/bsd.pkgng.mk index 8cb52f075955..373c0e14637b 100644 --- a/Mk/bsd.pkgng.mk +++ b/Mk/bsd.pkgng.mk @@ -254,18 +254,18 @@ do-package: ${TMPPLIST} .if !target(check-already-installed) .if !defined(NO_PKG_REGISTER) && !defined(FORCE_PKG_REGISTER) check-already-installed: - @${ECHO_MSG} "===> Checking if ${PKGORIGIN} already installed"; \ - pkgname=`${PKG_INFO} -q -O ${PKGORIGIN}`; \ + @${ECHO_MSG} "===> Checking if ${PKGBASE} already installed"; \ + pkgname=`${PKG_INFO} -q -O ${PKGBASE}`; \ if [ -n "$${pkgname}" ]; then \ v=`${PKG_VERSION} -t $${pkgname} ${PKGNAME}`; \ if [ "$${v}" = "<" ]; then \ - ${ECHO_CMD} "===> An older version of ${PKGORIGIN} is already installed ($${pkgname})"; \ + ${ECHO_CMD} "===> An older version of ${PKGBASE} is already installed ($${pkgname})"; \ else \ ${ECHO_CMD} "===> ${PKGNAME} is already installed"; \ fi; \ ${ECHO_MSG} " You may wish to \`\`make deinstall'' and install this port again"; \ ${ECHO_MSG} " by \`\`make reinstall'' to upgrade it properly."; \ - ${ECHO_MSG} " If you really wish to overwrite the old port of ${PKGORIGIN}"; \ + ${ECHO_MSG} " If you really wish to overwrite the old port of ${PKGBASE}"; \ ${ECHO_MSG} " without deleting it first, set the variable \"FORCE_PKG_REGISTER\""; \ ${ECHO_MSG} " in your environment or the \"make install\" command line."; \ exit 1; \ @@ -282,11 +282,11 @@ deinstall: ${SU_CMD} "${MAKE} ${.TARGET}" @${ECHO_MSG} "===> Returning to user credentials" .else - @${ECHO_MSG} "===> Deinstalling for ${PKGORIGIN}" - @if ${PKG_INFO} -e ${PKGORIGIN}; then \ - p=`${PKG_INFO} -q ${PKGORIGIN}`; \ + @${ECHO_MSG} "===> Deinstalling for ${PKGBASE}" + @if ${PKG_INFO} -e ${PKGBASE}; then \ + p=`${PKG_INFO} -q -O ${PKGBASE}`; \ ${ECHO_MSG} "===> Deinstalling $${p}"; \ - ${PKG_DELETE} -f ${PKGORIGIN} ; \ + ${PKG_DELETE} -f ${PKGBASE} ; \ else \ ${ECHO_MSG} "===> ${PKGBASE} not installed, skipping"; \ fi |