From 92be5c9e772de4933a76578a4aa78529b60ef880 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Thu, 23 Mar 2023 12:40:32 +0100
Subject: [PATCH] confuse, cleanup, disable static library (#8070)

---
 dev-libs/confuse/confuse-2.7.recipe        | 73 ----------------------
 dev-libs/confuse/confuse-3.2.2.recipe      |  4 +-
 dev-libs/confuse/patches/confuse-2.7.patch | 12 ----
 3 files changed, 2 insertions(+), 87 deletions(-)
 delete mode 100644 dev-libs/confuse/confuse-2.7.recipe
 delete mode 100644 dev-libs/confuse/patches/confuse-2.7.patch

diff --git a/dev-libs/confuse/confuse-2.7.recipe b/dev-libs/confuse/confuse-2.7.recipe
deleted file mode 100644
index 2a49e1635..000000000
--- a/dev-libs/confuse/confuse-2.7.recipe
+++ /dev/null
@@ -1,73 +0,0 @@
-SUMMARY="A configuration file parser library"
-DESCRIPTION="libConfuse is a configuration file parser library, licensed \
-under the terms of the ISC license, and written in C. It supports sections \
-and (lists of) values (strings, integers, floats, booleans or other \
-sections), as well as some other features (such as single/double-quoted \
-strings, environment variable expansion, functions and nested include \
-statements). It makes it very easy to add configuration file capability to \
-a program using a simple API.
-The goal of libConfuse is not to be the configuration file parser library \
-with a gazillion of features. Instead, it aims to be easy to use and quick to \
-integrate with your code. libConfuse was called libcfg before, but its name \
-was changed to not confuse itself with other similar libraries."
-HOMEPAGE="http://www.nongnu.org/confuse/"
-COPYRIGHT="2002,2003,2007 Martin Hedenfalk"
-LICENSE="ISC"
-REVISION="5"
-SOURCE_URI="http://savannah.nongnu.org/download/confuse/confuse-2.7.tar.gz"
-CHECKSUM_SHA256="e32574fd837e950778dac7ade40787dd2259ef8e28acd6ede6847ca895c88778"
-PATCHES="confuse-2.7.patch"
-
-ARCHITECTURES="all"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
-
-PROVIDES="
-	confuse$secondaryArchSuffix = $portVersion
-	lib:libconfuse$secondaryArchSuffix = $portVersion
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libiconv$secondaryArchSuffix
-	lib:libintl$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	confuse${secondaryArchSuffix}_devel = $portVersion
-	devel:libconfuse$secondaryArchSuffix = $portVersion
-	"
-REQUIRES_devel="
-	lib:libconfuse$secondaryArchSuffix == $portVersion base
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libiconv$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	gettext$secondaryArchSuffix
-	cmd:aclocal
-	cmd:autoconf
-	cmd:autom4te
-	cmd:automake
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix
-	cmd:make
-	"
-
-BUILD()
-{
-	aclocal
-	libtoolize -fci
-	autoconf
-	automake --add-missing
-	runConfigure ./configure --enable-shared
-	make
-}
-
-INSTALL()
-{
-	make install
-	prepareInstalledDevelLib libconfuse
-	packageEntries devel $developDir
-}
diff --git a/dev-libs/confuse/confuse-3.2.2.recipe b/dev-libs/confuse/confuse-3.2.2.recipe
index e33a25013..e5dcee15f 100644
--- a/dev-libs/confuse/confuse-3.2.2.recipe
+++ b/dev-libs/confuse/confuse-3.2.2.recipe
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.nongnu.org/confuse/"
 COPYRIGHT="2002-2017 Martin Hedenfalk
 	2015 Peter Rosin"
 LICENSE="ISC"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/martinh/libconfuse/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="2cf7e032980aff8f488efba61510dc3fb95e9a4b9183f985dea457a5651b0e2c"
 SOURCE_FILENAME="confuse-$portVersion.tar.gz"
@@ -69,7 +69,7 @@ BUILD()
 	export CFLAGS="-D_BSD_SOURCE"
 	export LDFLAGS="-lbsd"
 	./autogen.sh
-	runConfigure ./configure
+	runConfigure ./configure --disable-static
 	make
 }
 
diff --git a/dev-libs/confuse/patches/confuse-2.7.patch b/dev-libs/confuse/patches/confuse-2.7.patch
deleted file mode 100644
index 8c8255870..000000000
--- a/dev-libs/confuse/patches/confuse-2.7.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur confuse-2.7/configure.ac confuse-2.7-haiku/configure.ac
---- confuse-2.7/configure.ac	2010-02-22 00:27:44.009961472 +0000
-+++ confuse-2.7-haiku/configure.ac	2014-01-12 12:40:30.637796352 +0000
-@@ -6,7 +6,7 @@
- AC_CONFIG_AUX_DIR(support)
- AM_MAINTAINER_MODE
- AM_INIT_AUTOMAKE
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AC_CONFIG_SRCDIR(src/confuse.c)
- 
- # Checks for programs.