From owner-svn-ports-head@freebsd.org Fri Jul 24 10:11:19 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CB0459A8BD0; Fri, 24 Jul 2015 10:11:19 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.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 BB1F71D6B; Fri, 24 Jul 2015 10:11:19 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6OABJL0023356; Fri, 24 Jul 2015 10:11:19 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6OABJuD023355; Fri, 24 Jul 2015 10:11:19 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201507241011.t6OABJuD023355@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Fri, 24 Jul 2015 10:11:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r392816 - head/Mk/Scripts X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Jul 2015 10:11:19 -0000 Author: mat Date: Fri Jul 24 10:11:18 2015 New Revision: 392816 URL: https://svnweb.freebsd.org/changeset/ports/392816 Log: Split LIB_DEPENDS and the other _DEPENDS types. Reviewed by: bapt, pgolluci Exp-run by: mat Approved by: bapt With hat: portmgr Sponsored by: Absolight Differential Revision: https://reviews.freebsd.org/D3150 Modified: head/Mk/Scripts/do-depends.sh Modified: head/Mk/Scripts/do-depends.sh ============================================================================== --- head/Mk/Scripts/do-depends.sh Fri Jul 24 09:50:03 2015 (r392815) +++ head/Mk/Scripts/do-depends.sh Fri Jul 24 10:11:18 2015 (r392816) @@ -140,12 +140,21 @@ for _line in ${dp_RAWDEPENDS} ; do fi fi - case ${pattern} in - *\>*|*\<*|*=*) fct=find_package ;; - lib*.so*) fct=find_lib ;; - /nonexistent) fct=false ;; - /*) fct=find_file ;; - *) fct=find_file_path ;; + case ${dp_DEPTYPE} in + LIB_DEPENDS) + case ${pattern} in + lib*.so*) fct=find_lib ;; + *) + echo "Error: pattern ${pattern} in LIB_DEPENDS is not valid" + exit 1 ;; + esac ;; + *) + case ${pattern} in + *\>*|*\<*|*=*) fct=find_package ;; + /nonexistent) fct=false ;; + /*) fct=find_file ;; + *) fct=find_file_path ;; + esac ;; esac if ${fct} "${pattern}" ; then continue