From owner-svn-ports-projects@FreeBSD.ORG  Thu Jan 22 00:05:59 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 54C282C6;
 Thu, 22 Jan 2015 00:05:59 +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 2555F394;
 Thu, 22 Jan 2015 00:05:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0M05xjG017222;
 Thu, 22 Jan 2015 00:05:59 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0M05wvr017220;
 Thu, 22 Jan 2015 00:05:58 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201501220005.t0M05wvr017220@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: Thu, 22 Jan 2015 00:05:58 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-projects@freebsd.org
Subject: svn commit: r377637 - in 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: Thu, 22 Jan 2015 00:05:59 -0000

Author: bapt
Date: Thu Jan 22 00:05:58 2015
New Revision: 377637
URL: https://svnweb.freebsd.org/changeset/ports/377637
QAT: https://qat.redports.org/buildarchive/r377637/

Log:
  Register dependencies base on the pattern provided on depends rather than on origin

Added:
  projects/rework-dependency-registration/Mk/Scripts/actual-package-depends.sh   (contents, props changed)
Modified:
  projects/rework-dependency-registration/Mk/bsd.port.mk

Added: projects/rework-dependency-registration/Mk/Scripts/actual-package-depends.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/rework-dependency-registration/Mk/Scripts/actual-package-depends.sh	Thu Jan 22 00:05:58 2015	(r377637)
@@ -0,0 +1,29 @@
+#!/bin/sh
+# MAINTAINER: portmgr@FeeeBSD.org
+# $FreeBSD$
+
+if [ -z "${PKG_BIN}" -o -z "${SCRIPTSDIR}" ]; then
+	echo "PKG_BIN, SCRIPTSDIR required in environment." >&2
+	exit 1
+fi
+
+find_dep() {
+	pattern=$1
+	case ${pattern} in
+	*\>*|*\<*|*=*)
+		${PKG_BIN} info -Eg "${pattern}" 2>/dev/null
+		return
+		;;
+	/*)
+		searchfile=$pattern
+		;;
+	*)
+		searchfile=$(/usr/bin/which ${pattern} 2>/dev/null)
+		;;
+	esac
+	[ -n "${searchfile}" ] && ${PKG_BIN} which -q ${searchfile}
+}
+
+for lookup; do
+	${PKG_BIN} query "\"%n\": {origin: \"%o\", version: \"%v\"}" $(find_dep ${lookup}) || :
+done

Modified: projects/rework-dependency-registration/Mk/bsd.port.mk
==============================================================================
--- projects/rework-dependency-registration/Mk/bsd.port.mk	Wed Jan 21 23:47:28 2015	(r377636)
+++ projects/rework-dependency-registration/Mk/bsd.port.mk	Thu Jan 22 00:05:58 2015	(r377637)
@@ -4791,9 +4791,11 @@ PACKAGE-DEPENDS-LIST?= \
 	done
 
 ACTUAL-PACKAGE-DEPENDS?= \
-	if [ "${_LIB_RUN_DEPENDS}" != "  " ]; then \
-		${PKG_QUERY} "\"%n\": {origin: %o, version: \"%v\"}" " " ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,:C,${PORTSDIR}/,,} 2>/dev/null || : ; \
-	fi
+	depfiles="" ; \
+	for lib in ${LIB_DEPENDS:C/\:.*//}; do \
+		depfiles="$$depfiles `LIB_DIRS="${LIB_DIRS}" LOCALBASE="${LOCALBASE}" ${SH} ${SCRIPTSDIR}/find-lib.sh $${lib}`" ; \
+	done ; \
+	${SETENV} SCRIPTSDIR="${SCRIPTSDIR}" PKG_BIN="${PKG_BIN}" ${SH} ${SCRIPTSDIR}/actual-package-depends.sh $${depfiles} ${RUN_DEPENDS:C/(.*)\:.*/"\1"/}
 
 create-manifest:
 	@${MKDIR} ${METADIR}; \