From owner-freebsd-ports@FreeBSD.ORG  Tue Jul 15 08:09:48 2003
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: freebsd-ports@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 472D937B401; Tue, 15 Jul 2003 08:09:48 -0700 (PDT)
Received: from mx2.fillmore-labs.com (lima.fillmore-labs.com [62.138.193.83])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 4B3DB43F75; Tue, 15 Jul 2003 08:09:47 -0700 (PDT)
	(envelope-from eikemeier@fillmore-labs.com)
Received: from atlantis.wireless.fillmore-labs.com ([192.168.161.245]
	helo=fillmore-labs.com)
	by mx2.fillmore-labs.com with asmtp (TLSv1:AES256-SHA:256)
	(Exim 4.20)	id 19cRQy-000Nnp-Jc; Tue, 15 Jul 2003 17:09:40 +0200
Message-ID: <3F141935.7020706@fillmore-labs.com>
Date: Tue, 15 Jul 2003 17:09:41 +0200
From: Oliver Eikemeier <eikemeier@fillmore-labs.com>
MIME-Version: 1.0
To: Joe Marcus Clarke <marcus@marcuscom.com>
References: <20030714165358.GC2875@vega.vega.com>
	<1058208499.299.80.camel@gyros> <1058210907.299.82.camel@gyros>
In-Reply-To: <1058210907.299.82.camel@gyros>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
X-Authenticated-Sender: eikemeier@fillmore-labs.com
User-Agent: KMail/1.5.9
Organization: Fillmore Labs GmbH  <http://www.fillmore-labs.com/>
X-Complaints-To: abuse@fillmore-labs.com
cc: ports@freebsd.org
cc: Maxim Sobolev <sobomax@portaone.com>
cc: portmgr@freebsd.org
Subject: Re: Major flaws of the new make deinstall code
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Jul 2003 15:09:48 -0000

Joe Marcus Clarke wrote:

> --- /usr/ports/Mk/bsd.port.mk	Sat Jul 12 15:01:17 2003
> +++ bsd.port.mk	Mon Jul 14 15:00:02 2003
> @@ -3012,7 +3012,7 @@
>  		@already_installed=`${PKG_INFO} -q -O ${PKGORIGIN} 2> /dev/null`; \
>  		if [ -n "$${already_installed}" ]; then \
>  				for p in $${already_installed}; do \
> -						prfx=`${PKG_INFO} -q -p $${p} 2> /dev/null | ${SED} -e 's|^@cwd ||'`; \
> +						prfx=`${PKG_INFO} -q -p $${p} 2> /dev/null | ${HEAD} -n 1 | ${SED} -e 's|^@cwd ||'`; \
>  						if [ "x${PREFIX}" = "x$${prfx}" ]; then \
>  								df=`${PKG_INFO} -q -f $${p} 2> /dev/null | ${GREP} -v "^@" | ${COMM} -12 - ${TMPPLIST}`; \
>  								if [ -n "$${df}" ]; then \
> @@ -3403,7 +3403,7 @@
>  	for p in $${found_names}; do \
>  			check_name=`${ECHO} $${p} | ${SED} -e 's/-[^-]*$$//'`; \
>  			if [ "$${check_name}" = "${PKGBASE}" ]; then \
> -					prfx=`${PKG_INFO} -q -p $${p} 2> /dev/null | ${SED} -e 's|^@cwd ||'`; \
> +					prfx=`${PKG_INFO} -q -p $${p} 2> /dev/null | ${HEAD} -n 1 | ${SED} -e 's|^@cwd ||'`; \
>  					if [ "x${PREFIX}" = "x$${prfx}" ]; then \
>  							${ECHO_MSG} "===>   Deinstalling $${p}"; \
>  							${PKG_DELETE} -f $${p}; \

You could use
  ${SED} -ne '1 s|^@cwd ||p'
instead of
  ${HEAD} -n 1 | ${SED} -e 's|^@cwd ||'

Regards
    Oliver