From owner-svn-ports-projects@FreeBSD.ORG  Sat Jan 24 22:52:52 2015
Return-Path: <owner-svn-ports-projects@FreeBSD.ORG>
Delivered-To: svn-ports-projects@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 1C51DB3D;
 Sat, 24 Jan 2015 22:52:52 +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 07B7FCDB;
 Sat, 24 Jan 2015 22:52:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0OMqpQT049587;
 Sat, 24 Jan 2015 22:52:51 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0OMqpxB049586;
 Sat, 24 Jan 2015 22:52:51 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201501242252.t0OMqpxB049586@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: Sat, 24 Jan 2015 22:52:51 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-projects@freebsd.org
Subject: svn commit: r377836 -
 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-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the ports &quot; projects&quot;
 tree" <svn-ports-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-projects>, 
 <mailto:svn-ports-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-projects/>
List-Post: <mailto:svn-ports-projects@freebsd.org>
List-Help: <mailto:svn-ports-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-projects>, 
 <mailto:svn-ports-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Jan 2015 22:52:52 -0000

Author: bapt
Date: Sat Jan 24 22:52:51 2015
New Revision: 377836
URL: https://svnweb.freebsd.org/changeset/ports/377836
QAT: https://qat.redports.org/buildarchive/r377836/

Log:
  First try to directly find the file and only try to resolve the symlinks if they
  do not belong to any package

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	Sat Jan 24 22:22:26 2015	(r377835)
+++ projects/rework-dependency-registration/Mk/Scripts/actual-package-depends.sh	Sat Jan 24 22:52:51 2015	(r377836)
@@ -21,7 +21,9 @@ find_dep() {
 		searchfile=$(/usr/bin/which ${pattern} 2>/dev/null)
 		;;
 	esac
-	[ -n "${searchfile}" ] && ${PKG_BIN} which -q `realpath ${searchfile}`
+	if [ -n "${searchfile}" ]; then
+		${PKG_BIN} which -q ${searchfile} || ${PKG_BIN} which -q `realpath ${searchfile}`
+	fi
 }
 
 for lookup; do