From 9d49cf95e201222c7354fdc46b6726c3bd680f93 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Thu, 30 Jan 2025 08:30:03 +0100
Subject: [PATCH] confuse, bump version, fix pkgconfig (#11695)

---
 ...onfuse-3.2.2.recipe => confuse-3.3.recipe} | 24 +++++++++++--------
 .../confuse/patches/confuse-3.2.2.patchset    | 22 -----------------
 2 files changed, 14 insertions(+), 32 deletions(-)
 rename dev-libs/confuse/{confuse-3.2.2.recipe => confuse-3.3.recipe} (85%)
 delete mode 100644 dev-libs/confuse/patches/confuse-3.2.2.patchset

diff --git a/dev-libs/confuse/confuse-3.2.2.recipe b/dev-libs/confuse/confuse-3.3.recipe
similarity index 85%
rename from dev-libs/confuse/confuse-3.2.2.recipe
rename to dev-libs/confuse/confuse-3.3.recipe
index e5dcee15f..bcd05effa 100644
--- a/dev-libs/confuse/confuse-3.2.2.recipe
+++ b/dev-libs/confuse/confuse-3.3.recipe
@@ -14,17 +14,16 @@ HOMEPAGE="http://www.nongnu.org/confuse/"
 COPYRIGHT="2002-2017 Martin Hedenfalk
 	2015 Peter Rosin"
 LICENSE="ISC"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://github.com/martinh/libconfuse/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="2cf7e032980aff8f488efba61510dc3fb95e9a4b9183f985dea457a5651b0e2c"
+CHECKSUM_SHA256="cb90c06f2dbec971792af576d5b9a382fb3c4ca2b1deea55ea262b403f4e641e"
 SOURCE_FILENAME="confuse-$portVersion.tar.gz"
 SOURCE_DIR="libconfuse-$portVersion"
-PATCHES="confuse-$portVersion.patchset"
 
 ARCHITECTURES="all"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
-libVersion="2.0.0"
+libVersion="2.1.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
@@ -34,7 +33,6 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
-	lib:libintl$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
@@ -48,13 +46,13 @@ REQUIRES_devel="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libiconv$secondaryArchSuffix
-	devel:libintl$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
 	cmd:autom4te
 	cmd:automake
+	cmd:autopoint
 	cmd:flex
 	cmd:gcc$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
@@ -69,18 +67,24 @@ BUILD()
 	export CFLAGS="-D_BSD_SOURCE"
 	export LDFLAGS="-lbsd"
 	./autogen.sh
-	runConfigure ./configure --disable-static
+	runConfigure ./configure --disable-static \
+		--disable-nls
 	make
 }
 
 INSTALL()
 {
 	make install
-	prepareInstalledDevelLib libconfuse
-	packageEntries devel $developDir
+	prepareInstalledDevelLib \
+		libconfuse
+	fixPkgconfig
+
+	packageEntries devel \
+		$developDir
 }
 
 TEST()
 {
-	make check
+	# 1 out of 24 tests failed
+	make VERBOSE=1 check
 }
diff --git a/dev-libs/confuse/patches/confuse-3.2.2.patchset b/dev-libs/confuse/patches/confuse-3.2.2.patchset
deleted file mode 100644
index 814083294..000000000
--- a/dev-libs/confuse/patches/confuse-3.2.2.patchset
+++ /dev/null
@@ -1,22 +0,0 @@
-From 04010ed74a00018ef65b2b3cdbbadc90ca659f2e Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Mon, 18 Jun 2018 21:43:32 +0200
-Subject: import previous patch
-
-
-diff --git a/configure.ac b/configure.ac
-index 5178d36..1735c5a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -8,7 +8,7 @@ AM_MAINTAINER_MODE
- AM_INIT_AUTOMAKE([foreign dist-xz])
- AM_SILENT_RULES([no])
- 
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADER(config.h)
- AC_CONFIG_SRCDIR(src/confuse.c)
- 
- # Checks for programs.
--- 
-2.16.4
-