diff --git a/devel/pkgconf/Makefile b/devel/pkgconf/Makefile
index e0b94fef0171..08e260c626e1 100644
--- a/devel/pkgconf/Makefile
+++ b/devel/pkgconf/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	pkgconf
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://distfiles.ariadne.space/${PORTNAME}/
 
 # NOTE: before committing to this port, contact portmgr to arrange for an
 # experimental ports run.  Untested commits may be backed out at portmgr's
 # discretion.
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	Utility to help to configure compiler and linker flags
 WWW=		https://git.sr.ht/~kaniini/pkgconf
 
 LICENSE=	ISCL
 
 TEST_DEPENDS=	kyua:devel/kyua
 
 USES=		cpe tar:xz libtool pathfix
 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:${PREFIX}/share/pkgconfig \
 		--with-system-libdir=/usr/lib \
 		--with-system-includedir=/usr/include
 MAKE_ARGS=	MANDIR="${MAN1PREFIX}/man/man1"
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 	${LN} -sf pkgconf ${STAGEDIR}${PREFIX}/bin/pkg-config
 
 .include <bsd.port.mk>
diff --git a/devel/pkgconf/files/patch-modversion-comparison b/devel/pkgconf/files/patch-modversion-comparison
index a8d4c26e6c0a..dcab7c93146b 100644
--- a/devel/pkgconf/files/patch-modversion-comparison
+++ b/devel/pkgconf/files/patch-modversion-comparison
@@ -1,13 +1,19 @@
 diff --git cli/main.c cli/main.c
-index 25ff5ca..d75bbb7 100644
+index 25ff5ca..055b05a 100644
 --- cli/main.c
 +++ cli/main.c
-@@ -306,7 +306,7 @@ apply_modversion(pkgconf_client_t *client, pkgconf_pkg_t *world, void *data, int
+@@ -305,10 +305,13 @@ apply_modversion(pkgconf_client_t *client, pkgconf_pkg_t *world, void *data, int
+ 		{
  			pkgconf_dependency_t *dep = world_iter->data;
  			pkgconf_pkg_t *pkg = dep->match;
++			size_t len = strlen(pkg->id);
  
 -			if (strncmp(pkg->id, queue_node->package, strlen(pkg->id)))
-+			if (strcmp(pkg->id, queue_node->package))
++			if (strncmp(pkg->id, queue_node->package, len))
  				continue;
  
++			if (!isspace(queue_node->package[len]) && queue_node->package[len] != '\0')
++				continue;
  			if (pkg->version != NULL) {
+ 				if (verbosity)
+ 					printf("%s: ", pkg->id);