From owner-svn-ports-all@freebsd.org Sun Jan 22 10:30:32 2017 Return-Path: Delivered-To: svn-ports-all@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 EDEA3CBC2F7; Sun, 22 Jan 2017 10:30:32 +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 7A186811; Sun, 22 Jan 2017 10:30:32 +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 v0MAUVZc059764; Sun, 22 Jan 2017 10:30:31 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0MAUVDp059762; Sun, 22 Jan 2017 10:30:31 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201701221030.v0MAUVDp059762@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 10:30:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432109 - 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-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Jan 2017 10:30:33 -0000 Author: bapt Date: Sun Jan 22 10:30:31 2017 New Revision: 432109 URL: https://svnweb.freebsd.org/changeset/ports/432109 Log: Actually apply the proper patch Modified: head/devel/pkgconf/Makefile head/devel/pkgconf/files/patch-libpkgconf_pkg.c Modified: head/devel/pkgconf/Makefile ============================================================================== --- head/devel/pkgconf/Makefile Sun Jan 22 10:10:01 2017 (r432108) +++ head/devel/pkgconf/Makefile Sun Jan 22 10:30:31 2017 (r432109) @@ -2,7 +2,7 @@ PORTNAME= pkgconf PORTVERSION= 1.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= https://distfiles.dereferenced.org/pkgconf/ \ http://files.etoilebsd.net/pkgconf/ Modified: head/devel/pkgconf/files/patch-libpkgconf_pkg.c ============================================================================== --- head/devel/pkgconf/files/patch-libpkgconf_pkg.c Sun Jan 22 10:10:01 2017 (r432108) +++ head/devel/pkgconf/files/patch-libpkgconf_pkg.c Sun Jan 22 10:30:31 2017 (r432109) @@ -1,11 +1,26 @@ --- 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; +@@ -1336,6 +1336,7 @@ pkgconf_pkg_traverse(pkgconf_client_t *c + void *data, + int maxdepth) + { ++ unsigned int saved_flags = client->flags; + unsigned int eflags = PKGCONF_PKG_ERRF_OK; -- 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 (maxdepth == 0) +@@ -1346,6 +1347,7 @@ pkgconf_pkg_traverse(pkgconf_client_t *c if (func != NULL) func(client, root, data); + } ++ client->flags &= ~PKGCONF_PKG_PKGF_SKIP_ROOT_VIRTUAL; + + if (!(client->flags & PKGCONF_PKG_PKGF_SKIP_CONFLICTS)) + { +@@ -1368,6 +1370,7 @@ pkgconf_pkg_traverse(pkgconf_client_t *c + if (eflags != PKGCONF_PKG_ERRF_OK) + return eflags; + } ++ client->flags = saved_flags; + + return eflags; + }