diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2003-05-23 04:14:18 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2003-05-23 04:14:18 +0000 |
| commit | a5a5b115b84e1da6dd553f54aa50952d7d1959a7 (patch) | |
| tree | 8ec1798066d8a1041be1f1dcca2ff4af18a5deeb | |
| parent | b4f4de4e343bf4e98f4514178e1fe7b12ea97c2f (diff) | |
| download | ports-a5a5b115b84e1da6dd553f54aa50952d7d1959a7.tar.gz ports-a5a5b115b84e1da6dd553f54aa50952d7d1959a7.zip | |
Back out parts [3] and [5] of r1.446, which dealt with improved
'make deinstall' behaviour and stricter checking for an installed package.
There were some edge-case problems with these patches that we were not
able to solve in time for 5.1-RELEASE. They'll probably reappear in
a modified form soon after release.
Discussed with: marcus, Sergey Matveychuk <sem@ciam.ru>
Notes
Notes:
svn path=/head/; revision=81775
| -rw-r--r-- | Mk/bsd.port.mk | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 7eb24354a69a..3b7b2d5aba62 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -2910,8 +2910,7 @@ delete-package-list: delete-package-links-list .if !target(check-already-installed) check-already-installed: .if !defined(NO_PKG_REGISTER) && !defined(FORCE_PKG_REGISTER) - @if [ -d ${PKG_DBDIR}/${PKGNAME} -o \ - "x`${PKG_INFO} -q -O ${PKGORIGIN} 2> /dev/null`" != "x" ]; then \ + @if [ -d ${PKG_DBDIR}/${PKGNAME} ]; then \ ${ECHO_CMD} "===> ${PKGNAME} is already installed - perhaps an older version?"; \ ${ECHO_CMD} " If so, you may wish to \`\`make deinstall'' and install"; \ ${ECHO_CMD} " this port again by \`\`make reinstall'' to upgrade it properly."; \ @@ -3263,13 +3262,11 @@ reinstall: .if !target(deinstall) deinstall: - @deinstall_name=`${PKG_INFO} -q -O ${PKGORIGIN} 2> /dev/null`; \ - ${TEST} -z $${deinstall_name} && deinstall_name=${PKGNAME}; \ - ${ECHO_MSG} "===> Deinstalling for ${PKGORIGIN} ($${deinstall_name})"; \ - if ${PKG_INFO} -e $${deinstall_name}; then \ - ${PKG_DELETE} -f $${deinstall_name}; \ + @${ECHO_MSG} "===> Deinstalling for ${PKGNAME}" + @if ${PKG_INFO} -e ${PKGNAME}; then \ + ${PKG_DELETE} -f ${PKGNAME}; \ else \ - ${ECHO_MSG} "===> ${PKGORIGIN} not installed, skipping"; \ + ${ECHO_MSG} "===> ${PKGNAME} not installed, skipping"; \ fi @${RM} -f ${INSTALL_COOKIE} ${PACKAGE_COOKIE} .endif |