From owner-svn-ports-all@FreeBSD.ORG  Sun Feb  8 14:49:24 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 5E73581E;
 Sun,  8 Feb 2015 14:49:24 +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 29B11147;
 Sun,  8 Feb 2015 14:49:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t18EnNrL022265;
 Sun, 8 Feb 2015 14:49:23 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t18EnNdK022263;
 Sun, 8 Feb 2015 14:49:23 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201502081449.t18EnNdK022263@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 14:49:23 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-projects@freebsd.org
Subject: svn commit: r378659 -
 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 14:49:24 -0000

Author: bapt
Date: Sun Feb  8 14:49:23 2015
New Revision: 378659
URL: https://svnweb.freebsd.org/changeset/ports/378659
QAT: https://qat.redports.org/buildarchive/r378659/

Log:
  Replace realpath(1) by a code that only resolve the final symlink and leaves all
  others as is while transforming the path into an absolute path
  
  This solve the pgp dependency

Modified:
  projects/rework-dependency-registration/Mk/Scripts/actual-package-depends.sh

Modified: projects/rework-dependency-registration/Mk/Scripts/actual-package-depends.sh
==============================================================================
--- projects/rework-dependency-registration/Mk/Scripts/actual-package-depends.sh	Sun Feb  8 14:31:24 2015	(r378658)
+++ projects/rework-dependency-registration/Mk/Scripts/actual-package-depends.sh	Sun Feb  8 14:49:23 2015	(r378659)
@@ -7,6 +7,45 @@ if [ -z "${PKG_BIN}" ]; then
 	exit 1
 fi
 
+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}
+}
+
 find_dep() {
 	pattern=$1
 	case ${pattern} in
@@ -22,7 +61,8 @@ find_dep() {
 		;;
 	esac
 	if [ -n "${searchfile}" ]; then
-		${PKG_BIN} which -q ${searchfile} || ${PKG_BIN} which -q "$(/bin/realpath ${searchfile} 2>/dev/null)" ||
+		echo $(resolv_symlink ${searchfile}) >&2
+		${PKG_BIN} which -q ${searchfile} || ${PKG_BIN} which -q "$(resolv_symlink ${searchfile} 2>/dev/null)" ||
 			echo "actual-package-depends: dependency on ${searchfile} not registered (normal if it belongs to base)" >&2
 	fi
 }