From nobody Fri Sep 1 13:38:51 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RcfJC63WWz4rHGt; Fri, 1 Sep 2023 13:38:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RcfJC5Y1Wz4RYP; Fri, 1 Sep 2023 13:38:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693575531; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dvoeZpl+Xpo926yA7rtYB3LOZlLKkp+bdr2rfyJbNAg=; b=CbfxY30GrCoVhUflT+bSu0SvywHaFi1itQ/tQbYEo42OGWN5i6RAv898hXheXxOaUijFkB D35dd6NfT1WTcFQTpPcYxWCIScUdPvJVCcOKI/+LfNlez6YoAl6Dd1e8nzmBGn/H31e9EA sBCVR4jZ8sUlJV3agCEyxcIjOW7pZK3WPq5Wle8fslGbBEAjhcluqnZQnTrdYOgDO+7jWK rb8jfvRK0dJ246MFyIYJodHBbgiJ6KiliaawBlrN3KHoSCIbHqqUTD4d0dLCCAPMpY94Yg lZlbdKowtopOkC7A5YryRwKMDO3YXnFeHUh8PIwmICYVB3ep/mGjn7TGKeG7mA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693575531; a=rsa-sha256; cv=none; b=XcpXHzU/kddWVbaLYUluUBK61tcn70yjVFcKz+blZaSpGD3tXgGjQxlCKMqRFgMRG7uRIi 09m1xKbDcpddGiqTjHCA5muE4nOlKF/LOMopc97FG5QAXMZ32zUxk+z3OpRBOw7moz+MtE psLmT3EdfSan8wQSC7kzf/AzCPoZEif3bhZdE9lcCgT1eNQpKk2V7mLteO5pG/jWsPYKNf iB30UHqoCbSo32e9zZi/Xczd5OOqS+sVQ9poKCoRhIZ9SVY4x2x7wk8LRDqk1Nlhs1UNza Lu7zAUgptVLT8edUVkImSxNAQ/xULVCNnoB7dfd0oE42GjfKZL5jt7IGg4u0AA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693575531; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dvoeZpl+Xpo926yA7rtYB3LOZlLKkp+bdr2rfyJbNAg=; b=dpuoYYQasA72m70f9RPdAlQV7mTcAByHRCoI2abg0zhXimyflF4vpnVV1BXQZPwZvtFlPM ocfB5W6/o1XdMwWOZe7zJY5bRZn+E+qo6+8WZmXwfWgxHVhWr0AIYJeVv7hCJ1Eo8d0knF 5CnAXIF36JzpoWGzCKu7f/+rQ+IFFGWmKFUuXC6HR8vbS2YPlRcjCc8IhVBopdXeZAONYs zdz1heiaJMmVXvp0E63zcrb0l/OyHjGpiqA/orq29Y1OAe5qUaysPIQBh6kZzVqPrxON3A ++VHvvPWdXCLAszy72cgyxzXGHvHiF7m8VKxM49QkxZy/EwG6xjBfz5UVeweRg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RcfJC4TmZz13GN; Fri, 1 Sep 2023 13:38:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 381DcpGf040276; Fri, 1 Sep 2023 13:38:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 381DcplN040273; Fri, 1 Sep 2023 13:38:51 GMT (envelope-from git) Date: Fri, 1 Sep 2023 13:38:51 GMT Message-Id: <202309011338.381DcplN040273@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 8e3a5d951eb8 - main - devel/pkgconf: update to 2.0.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e3a5d951eb8fb9d9ba3759507cebadcaea8d892 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=8e3a5d951eb8fb9d9ba3759507cebadcaea8d892 commit 8e3a5d951eb8fb9d9ba3759507cebadcaea8d892 Author: Baptiste Daroussin AuthorDate: 2023-08-21 07:00:06 +0000 Commit: Baptiste Daroussin 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