From owner-svn-ports-all@FreeBSD.ORG  Sun Feb  8 15:00:58 2015
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 18C299E3;
 Sun,  8 Feb 2015 15:00:58 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 048F0227;
 Sun,  8 Feb 2015 15:00:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t18F0v2q027870;
 Sun, 8 Feb 2015 15:00:57 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t18F0vBp027868;
 Sun, 8 Feb 2015 15:00:57 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201502081500.t18F0vBp027868@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
 using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 8 Feb 2015 15:00:57 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-projects@freebsd.org
Subject: svn commit: r378660 -
 projects/rework-dependency-registration/Mk/Scripts
X-SVN-Group: ports-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Sun, 08 Feb 2015 15:00:58 -0000

Author: bapt
Date: Sun Feb  8 15:00:57 2015
New Revision: 378660
URL: https://svnweb.freebsd.org/changeset/ports/378660
QAT: https://qat.redports.org/buildarchive/r378660/

Log:
  Nuke the realpath from find-lib allowing /usr/local to be a symlink
  
  For now this is a copy/paste from actual-package-depends.sh, probably moved into
  a shared function once the exp-run shows everything is ok

Modified:
  projects/rework-dependency-registration/Mk/Scripts/find-lib.sh

Modified: projects/rework-dependency-registration/Mk/Scripts/find-lib.sh
==============================================================================
--- projects/rework-dependency-registration/Mk/Scripts/find-lib.sh	Sun Feb  8 14:49:23 2015	(r378659)
+++ projects/rework-dependency-registration/Mk/Scripts/find-lib.sh	Sun Feb  8 15:00:57 2015	(r378660)
@@ -14,9 +14,48 @@ fi
 lib=$1
 dirs="${LIB_DIRS} `cat ${LOCALBASE}/libdata/ldconfig/* 2>/dev/null || :`"
 
+resolv_symlink() {
+	local file tgt
+	file=${1}
+	if [ ! -L ${file} ] ; then
+		echo ${file}
+		return
+	fi
+
+	tgt=`readlink ${file}`
+	case $tgt in
+	/*)
+		echo $tgt
+		return
+		;;
+	esac
+
+	file=${file%/*}/${tgt}
+	absolute_path ${file}
+}
+
+absolute_path() {
+	local file myifs target
+	file=$1
+
+	myifs=${IFS}
+	IFS='/'
+	set -- ${file}
+	IFS=${myifs}
+	for el; do
+		case $el in
+		.) continue ;;
+		'') continue ;;
+		..) target=${target%/*} ;;
+		*) target="${target}/${el}" ;;
+		esac
+	done
+	echo ${target}
+}
+
 for libdir in ${dirs} ; do
 	test -f ${libdir}/${lib} || continue
-	libfile=`realpath ${libdir}/${lib}`
+	libfile=`absolute_path ${libdir}/${lib}`
 	[ `file -b -L --mime-type ${libfile}` = "application/x-sharedlib" ] || continue
 	echo $libfile
 	break