From owner-freebsd-ports-bugs Fri Mar 7 13:40:19 2003 Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 272A137B405 for ; Fri, 7 Mar 2003 13:40:14 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 47CE943FBD for ; Fri, 7 Mar 2003 13:40:12 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id h27LeCNS066425 for ; Fri, 7 Mar 2003 13:40:12 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id h27LeCWB066424; Fri, 7 Mar 2003 13:40:12 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3767137B401 for ; Fri, 7 Mar 2003 13:32:53 -0800 (PST) Received: from hueymiccailhuitl.mtu.ru (hueytecuilhuitl.mtu.ru [195.34.32.123]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8C07D43F3F for ; Fri, 7 Mar 2003 13:32:49 -0800 (PST) (envelope-from sem@ciam.ru) Received: from sem-home.ciam.ru (ppp135-220.dialup.mtu-net.ru [62.118.135.220]) by hueymiccailhuitl.mtu.ru (Postfix) with ESMTP id B622EF8678 for ; Sat, 8 Mar 2003 00:31:18 +0300 (MSK) (envelope-from sem@ciam.ru) Received: from sem by sem-home.ciam.ru with local (Exim 4.12) id 18rPSP-0000LV-00 for FreeBSD-gnats-submit@freebsd.org; Sat, 08 Mar 2003 00:32:45 +0300 Message-Id: Date: Sat, 08 Mar 2003 00:32:45 +0300 From: Sergey Matveychuk Reply-To: Sergey Matveychuk To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/49017: 'make deinstall' doesn't deinstall old version of ports Sender: owner-freebsd-ports-bugs@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 49017 >Category: ports >Synopsis: 'make deinstall' doesn't deinstall old version of ports >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Mar 07 13:40:11 PST 2003 >Closed-Date: >Last-Modified: >Originator: Sergey Matveychuk >Release: FreeBSD 5.0-RELEASE-p2 i386 >Organization: >Environment: System: FreeBSD sem-home.ciam.ru 5.0-RELEASE-p2 FreeBSD 5.0-RELEASE-p2 #1: Tue Mar 4 00:57:30 MSK 2003 root@sem-home.ciam.ru:/usr/src/sys/i386/compile/SEM-HOME i386 >Description: When user do 'make deinstall' he supposes port deinstalls. But if he's cvsuped before and has downloaded a new version of port he'll get messages that port don't installed. It's discourage him. We can fix it if port will be deinstalled by ORIGIN. Followed patch make it on 5.0 but absolutely harmless for 4.x. (See also PR/48646 when I used ORIGIN in check-already-installed target) >How-To-Repeat: >Fix: --- bsd.port.mk.orig Sun Mar 2 05:06:56 2003 +++ bsd.port.mk Fri Mar 7 00:37:39 2003 @@ -3187,12 +3187,16 @@ # Special target to remove installation .if !target(deinstall) +deinstall_name!=${PKG_INFO} -q -O ${PKGORIGIN} 2> /dev/null || ${TRUE} +.if ${deinstall_name} == "" +deinstall_name=${PKGNAME} +.endif deinstall: - @${ECHO_MSG} "===> Deinstalling for ${PKGNAME}" - @if ${PKG_INFO} -e ${PKGNAME}; then \ - ${PKG_DELETE} -f ${PKGNAME}; \ + @${ECHO_MSG} "===> Deinstalling for ${PKGORIGIN} (${deinstall_name})" + @if ${PKG_INFO} -e ${deinstall_name}; then \ + ${PKG_DELETE} -f ${deinstall_name}; \ else \ - ${ECHO_MSG} "===> ${PKGNAME} not installed, skipping"; \ + ${ECHO_MSG} "===> ${PKGORIGIN} not installed, skipping"; \ fi @${RM} -f ${INSTALL_COOKIE} ${PACKAGE_COOKIE} .endif >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports-bugs" in the body of the message