From owner-svn-ports-head@freebsd.org Sun Jan 22 09:50:47 2017 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 2DA42CBC92C; Sun, 22 Jan 2017 09:50:47 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 E3C32212; Sun, 22 Jan 2017 09:50:46 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0M9okTH044005; Sun, 22 Jan 2017 09:50:46 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0M9ojbT044003; Sun, 22 Jan 2017 09:50:45 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201701220950.v0M9ojbT044003@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 22 Jan 2017 09:50:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432106 - in head/devel/pkgconf: . files 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.23 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: Sun, 22 Jan 2017 09:50:47 -0000 Author: bapt Date: Sun Jan 22 09:50:45 2017 New Revision: 432106 URL: https://svnweb.freebsd.org/changeset/ports/432106 Log: Fix regression introduced in pkg 1.2.0 pkgconf --variable=pc_path pkg-config was not reporting any thing Reported by: antoine Added: head/devel/pkgconf/files/ head/devel/pkgconf/files/patch-libpkgconf_pkg.c (contents, props changed) Modified: head/devel/pkgconf/Makefile Modified: head/devel/pkgconf/Makefile ============================================================================== --- head/devel/pkgconf/Makefile Sun Jan 22 09:29:09 2017 (r432105) +++ head/devel/pkgconf/Makefile Sun Jan 22 09:50:45 2017 (r432106) @@ -2,6 +2,7 @@ PORTNAME= pkgconf PORTVERSION= 1.2.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://distfiles.dereferenced.org/pkgconf/ \ http://files.etoilebsd.net/pkgconf/ Added: head/devel/pkgconf/files/patch-libpkgconf_pkg.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/pkgconf/files/patch-libpkgconf_pkg.c Sun Jan 22 09:50:45 2017 (r432106) @@ -0,0 +1,11 @@ +--- libpkgconf/pkg.c.orig 2017-01-20 02:01:30 UTC ++++ libpkgconf/pkg.c +@@ -1341,7 +1341,7 @@ pkgconf_pkg_traverse(pkgconf_client_t *c + if (maxdepth == 0) + return eflags; + +- if ((root->flags & PKGCONF_PKG_PROPF_VIRTUAL) != PKGCONF_PKG_PROPF_VIRTUAL || (client->flags & PKGCONF_PKG_PKGF_SKIP_ROOT_VIRTUAL) != PKGCONF_PKG_PKGF_SKIP_ROOT_VIRTUAL) ++ if ((root->flags & PKGCONF_PKG_PROPF_VIRTUAL) != PKGCONF_PKG_PROPF_VIRTUAL || (client->flags & ~PKGCONF_PKG_PKGF_SKIP_ROOT_VIRTUAL) != PKGCONF_PKG_PKGF_SKIP_ROOT_VIRTUAL) + { + if (func != NULL) + func(client, root, data);