Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 22 Jan 2017 10:30:31 +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: r432109 - in head/devel/pkgconf: . files
Message-ID:  <201701221030.v0MAUVDp059762@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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;
+ }

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701221030.v0MAUVDp059762>