From owner-svn-ports-all@FreeBSD.ORG  Sat Sep  1 22:21:58 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 18ADD106566C;
	Sat,  1 Sep 2012 22:21:58 +0000 (UTC)
	(envelope-from beat@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 04A748FC15;
	Sat,  1 Sep 2012 22:21:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q81MLvnK088568;
	Sat, 1 Sep 2012 22:21:57 GMT (envelope-from beat@svn.freebsd.org)
Received: (from beat@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q81MLve0088566;
	Sat, 1 Sep 2012 22:21:57 GMT (envelope-from beat@svn.freebsd.org)
Message-Id: <201209012221.q81MLve0088566@svn.freebsd.org>
From: Beat Gaetzi <beat@FreeBSD.org>
Date: Sat, 1 Sep 2012 22:21:57 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r303524 - head/Mk
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Sep 2012 22:21:58 -0000

Author: beat
Date: Sat Sep  1 22:21:57 2012
New Revision: 303524
URL: http://svn.freebsd.org/changeset/ports/303524

Log:
  - Partially back out r303381: readlink -f is not available on all
    supported FreeBSD versions.
  
  Reported by:	gahr@, tota@

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Sat Sep  1 21:25:50 2012	(r303523)
+++ head/Mk/bsd.port.mk	Sat Sep  1 22:21:57 2012	(r303524)
@@ -4499,7 +4499,7 @@ deinstall:
 			check_name=`${ECHO_CMD} $${p} | ${SED} -e 's/-[^-]*$$//'`; \
 			if [ "$${check_name}" = "${PKGBASE}" ]; then \
 					prfx=`${PKG_INFO} -q -p $${p} 2> /dev/null | ${SED} -ne '1s|^@cwd ||p'`; \
-					if [ "x`${READLINK_CMD} -f ${PREFIX}`" = "x$${prfx}" ]; then \
+					if [ "x${PREFIX}" = "x$${prfx}" ]; then \
 							${ECHO_MSG} "===>   Deinstalling $${p}"; \
 							${PKG_DELETE} -f $${p}; \
 					else \