Index: head/devel/pkgconf/Makefile
===================================================================
--- head/devel/pkgconf/Makefile	(revision 432108)
+++ head/devel/pkgconf/Makefile	(revision 432109)
@@ -1,28 +1,28 @@
 # $FreeBSD$
 
 PORTNAME=	pkgconf
 PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	https://distfiles.dereferenced.org/pkgconf/ \
 		http://files.etoilebsd.net/pkgconf/
 
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	Utility to help to configure compiler and linker flags
 
 LICENSE=	ISCL
 
 USES=		tar:xz libtool
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 TEST_TARGET=	check
 CONFIGURE_ARGS=	--with-pkg-config-dir=${PREFIX}/libdata/pkgconfig:/usr/libdata/pkgconfig \
 		--with-system-libdir=/usr/lib \
 		--with-system-includedir=/usr/include
 MAKE_ARGS=	MANDIR="${MAN1PREFIX}/man/man1"
 
 post-install:
 	${LN} -sf pkgconf ${STAGEDIR}${PREFIX}/bin/pkg-config
 
 .include <bsd.port.mk>
Index: head/devel/pkgconf/files/patch-libpkgconf_pkg.c
===================================================================
--- head/devel/pkgconf/files/patch-libpkgconf_pkg.c	(revision 432108)
+++ head/devel/pkgconf/files/patch-libpkgconf_pkg.c	(revision 432109)
@@ -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;
+ }