Date: Fri, 1 Sep 2023 13:38:51 GMT From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 8e3a5d951eb8 - main - devel/pkgconf: update to 2.0.2 Message-ID: <202309011338.381DcplN040273@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=8e3a5d951eb8fb9d9ba3759507cebadcaea8d892 commit 8e3a5d951eb8fb9d9ba3759507cebadcaea8d892 Author: Baptiste Daroussin <bapt@FreeBSD.org> AuthorDate: 2023-08-21 07:00:06 +0000 Commit: Baptiste Daroussin <bapt@FreeBSD.org> CommitDate: 2023-09-01 13:38:18 +0000 devel/pkgconf: update to 2.0.2 PR: 272934 exp-run: antoine --- Mk/Uses/cabal.mk | 2 +- devel/pkgconf/Makefile | 2 +- devel/pkgconf/distinfo | 6 +++--- devel/pkgconf/files/patch-modversion-comparison | 13 +++++++++++++ devel/pkgconf/pkg-plist | 5 +++-- 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk index 92dbec7a9553..2b4aa48c1abd 100644 --- a/Mk/Uses/cabal.mk +++ b/Mk/Uses/cabal.mk @@ -324,7 +324,7 @@ cabal-pre-configure: . if !target(do-build) do-build: cd ${WRKSRC} && \ - ${SETENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} build --offline --disable-benchmarks --disable-tests ${CABAL_WITH_ARGS} ${CABAL_LTO_ARGS} --flags "${CABAL_FLAGS}" ${BUILD_ARGS} ${BUILD_TARGET} + ${SETENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} build --verbose --offline --disable-benchmarks --disable-tests ${CABAL_WITH_ARGS} ${CABAL_LTO_ARGS} --flags "${CABAL_FLAGS}" ${BUILD_ARGS} ${BUILD_TARGET} . endif . if !target(do-install) diff --git a/devel/pkgconf/Makefile b/devel/pkgconf/Makefile index e3e3eab45dd9..e0b94fef0171 100644 --- a/devel/pkgconf/Makefile +++ b/devel/pkgconf/Makefile @@ -1,5 +1,5 @@ PORTNAME= pkgconf -PORTVERSION= 1.8.1 +PORTVERSION= 2.0.2 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= https://distfiles.ariadne.space/${PORTNAME}/ diff --git a/devel/pkgconf/distinfo b/devel/pkgconf/distinfo index 6ee8387043a4..1d7ced659d45 100644 --- a/devel/pkgconf/distinfo +++ b/devel/pkgconf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1674555959 -SHA256 (pkgconf-1.8.1.tar.xz) = 644361ada2942be05655d4452eb018791647c31bba429b287f1f68deb2dc6840 -SIZE (pkgconf-1.8.1.tar.xz) = 302372 +TIMESTAMP = 1692601113 +SHA256 (pkgconf-2.0.2.tar.xz) = ea5a25ef8f251eb5377ec0e21c75fb61894433cfbdbf0b2559ba33e4c2664401 +SIZE (pkgconf-2.0.2.tar.xz) = 310604 diff --git a/devel/pkgconf/files/patch-modversion-comparison b/devel/pkgconf/files/patch-modversion-comparison new file mode 100644 index 000000000000..a8d4c26e6c0a --- /dev/null +++ b/devel/pkgconf/files/patch-modversion-comparison @@ -0,0 +1,13 @@ +diff --git cli/main.c cli/main.c +index 25ff5ca..d75bbb7 100644 +--- cli/main.c ++++ cli/main.c +@@ -306,7 +306,7 @@ 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; + +- if (strncmp(pkg->id, queue_node->package, strlen(pkg->id))) ++ if (strcmp(pkg->id, queue_node->package)) + continue; + + if (pkg->version != NULL) { diff --git a/devel/pkgconf/pkg-plist b/devel/pkgconf/pkg-plist index 64379bf0c660..82dc738abea1 100644 --- a/devel/pkgconf/pkg-plist +++ b/devel/pkgconf/pkg-plist @@ -1,3 +1,4 @@ +bin/bomtool bin/pkg-config bin/pkgconf include/pkgconf/libpkgconf/bsdstubs.h @@ -7,8 +8,8 @@ include/pkgconf/libpkgconf/libpkgconf.h include/pkgconf/libpkgconf/stdinc.h lib/libpkgconf.a lib/libpkgconf.so -lib/libpkgconf.so.3 -lib/libpkgconf.so.3.0.0 +lib/libpkgconf.so.4 +lib/libpkgconf.so.4.0.0 libdata/pkgconfig/libpkgconf.pc man/man1/pkgconf.1.gz man/man5/pc.5.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202309011338.381DcplN040273>