Date: Sun, 22 Jan 2017 09:50:45 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432106 - in head/devel/pkgconf: . files Message-ID: <201701220950.v0M9ojbT044003@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701220950.v0M9ojbT044003>