diff --git a/devel/pkgconf/Makefile b/devel/pkgconf/Makefile index 08e260c626e1..136f58d6aa82 100644 --- a/devel/pkgconf/Makefile +++ b/devel/pkgconf/Makefile @@ -1,34 +1,33 @@ PORTNAME= pkgconf -PORTVERSION= 2.0.2 -PORTREVISION= 1 +PORTVERSION= 2.0.3 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 diff --git a/devel/pkgconf/distinfo b/devel/pkgconf/distinfo index 1d7ced659d45..a44b43d45207 100644 --- a/devel/pkgconf/distinfo +++ b/devel/pkgconf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1692601113 -SHA256 (pkgconf-2.0.2.tar.xz) = ea5a25ef8f251eb5377ec0e21c75fb61894433cfbdbf0b2559ba33e4c2664401 -SIZE (pkgconf-2.0.2.tar.xz) = 310604 +TIMESTAMP = 1693811541 +SHA256 (pkgconf-2.0.3.tar.xz) = cabdf3c474529854f7ccce8573c5ac68ad34a7e621037535cbc3981f6b23836c +SIZE (pkgconf-2.0.3.tar.xz) = 310796 diff --git a/devel/pkgconf/files/patch-modversion-comparison b/devel/pkgconf/files/patch-modversion-comparison deleted file mode 100644 index dcab7c93146b..000000000000 --- a/devel/pkgconf/files/patch-modversion-comparison +++ /dev/null @@ -1,19 +0,0 @@ -diff --git cli/main.c cli/main.c -index 25ff5ca..055b05a 100644 ---- cli/main.c -+++ cli/main.c -@@ -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 (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);