From af76df2ac12b4f4370de84a80d4e26266ce78d61 Mon Sep 17 00:00:00 2001 From: Charlie Li Date: Sun, 8 Oct 2023 11:33:03 -0400 Subject: [PATCH] devel/pkgconf: process PKG_CONFIG_PATH/PKG_CONFIG_LIBDIR correctly 2.0.0 introduced a commit that had elements within these variables processed backwards instead of the correct order. This caused, amongst other problems, USES=ssl unconditionally using the base system OpenSSL despite user selection via ${DEFAULT_OPTIONS}. https://gitea.treehouse.systems/ariadne/pkgconf/commit/652aff97906d7eadca6fe727b16f6511d8dbfe05 PR: 273961 Approved by: ? --- devel/pkgconf/Makefile | 7 ++++++- devel/pkgconf/distinfo | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/devel/pkgconf/Makefile b/devel/pkgconf/Makefile index 136f58d6aa82..21599c6847c3 100644 --- a/devel/pkgconf/Makefile +++ b/devel/pkgconf/Makefile @@ -1,15 +1,20 @@ PORTNAME= pkgconf PORTVERSION= 2.0.3 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= https://distfiles.ariadne.space/${PORTNAME}/ +PATCH_SITES= ${WWW}/commit/ \ + https://github.com/${PORTNAME}/${PORTNAME}/commit/ +PATCHFILES= 652aff97906d7eadca6fe727b16f6511d8dbfe05.patch:-p1 + # 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 +WWW= https://gitea.treehouse.systems/ariadne/${PORTNAME} LICENSE= ISCL diff --git a/devel/pkgconf/distinfo b/devel/pkgconf/distinfo index a44b43d45207..5f89aed1060e 100644 --- a/devel/pkgconf/distinfo +++ b/devel/pkgconf/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1693811541 +TIMESTAMP = 1696808889 SHA256 (pkgconf-2.0.3.tar.xz) = cabdf3c474529854f7ccce8573c5ac68ad34a7e621037535cbc3981f6b23836c SIZE (pkgconf-2.0.3.tar.xz) = 310796 +SHA256 (652aff97906d7eadca6fe727b16f6511d8dbfe05.patch) = 4a7d5dd2eff7b4c96833c0ba8f47f0bffb1ab77763989a68922e3a53bfa6ecf7 +SIZE (652aff97906d7eadca6fe727b16f6511d8dbfe05.patch) = 4958 -- 2.42.0