From c8ae5340d450bcc4dd8cda6363fbbe2a511ae36e Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sat, 3 Aug 2024 12:15:59 +0200
Subject: [PATCH] dialog, bump version (#10776)

---
 ...0509.recipe => dialog-1.3_20240619.recipe} | 21 ++++++++++++-------
 ....patchset => dialog-1.3_20240619.patchset} | 10 ++++-----
 2 files changed, 18 insertions(+), 13 deletions(-)
 rename dev-util/dialog/{dialog-1.3_20170509.recipe => dialog-1.3_20240619.recipe} (75%)
 rename dev-util/dialog/patches/{dialog-1.3_20170509.patchset => dialog-1.3_20240619.patchset} (71%)

diff --git a/dev-util/dialog/dialog-1.3_20170509.recipe b/dev-util/dialog/dialog-1.3_20240619.recipe
similarity index 75%
rename from dev-util/dialog/dialog-1.3_20170509.recipe
rename to dev-util/dialog/dialog-1.3_20240619.recipe
index 323719f85..6009337a8 100644
--- a/dev-util/dialog/dialog-1.3_20170509.recipe
+++ b/dev-util/dialog/dialog-1.3_20240619.recipe
@@ -4,18 +4,21 @@ text user interface widgets. It uses the curses or ncurses library."
 HOMEPAGE="https://invisible-island.net/dialog/"
 COPYRIGHT="1999-2014 Thomas E. Dickey"
 LICENSE="GNU LGPL v2"
-SOURCE_URI="ftp://ftp.invisible-island.net/dialog/dialog-${portVersion/_/-}.tgz"
-CHECKSUM_SHA256="2ff1ba74c632b9d13a0d0d2c942295dd4e8909694eeeded7908a467d0bcd4756"
+SOURCE_URI="https://invisible-island.net/archives/dialog/dialog-${portVersion/_/-}.tgz"
+CHECKSUM_SHA256="5d8c4318963db3fd383525340276e0e05ee3dea9a6686c20779f5433b199547d"
 SOURCE_DIR="dialog-${portVersion/_/-}"
-REVISION="3"
+REVISION="1"
 PATCHES="dialog-$portVersion.patchset"
 
 ARCHITECTURES="all"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
+libVersion="15.0.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	dialog$secondaryArchSuffix = $portVersion
-	lib:libdialog$secondaryArchSuffix = 14.0.0 compat >= 14
+	lib:libdialog$secondaryArchSuffix = $libVersionCompat
 	"
 if [ -z "$secondaryArchSuffix" ]; then
 	PROVIDES="$PROVIDES
@@ -30,7 +33,7 @@ REQUIRES="
 PROVIDES_devel="
 	dialog${secondaryArchSuffix}_devel = $portVersion
 	cmd:dialog_config$secondaryArchSuffix = $portVersion
-	devel:libdialog$secondaryArchSuffix = 14.0.0 compat >= 14
+	devel:libdialog$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	dialog$secondaryArchSuffix == $portVersion base
@@ -50,8 +53,10 @@ BUILD_PREREQUIRES="
 	"
 BUILD()
 {
-	runConfigure --omit-dirs "docDir" ./configure --with-shared \
-		--with-ncursesw --with-libtool
+	runConfigure --omit-dirs "docDir" ./configure \
+		--with-shared \
+		--with-ncursesw \
+		--with-libtool
 	make
 }
 INSTALL()
@@ -59,7 +64,7 @@ INSTALL()
 	make install-full
 
 	# remove static library and libtool file
-	rm $libDir/libdialog.{a,la}
+	rm $libDir/libdialog.la
 
 	prepareInstalledDevelLib libdialog
 
diff --git a/dev-util/dialog/patches/dialog-1.3_20170509.patchset b/dev-util/dialog/patches/dialog-1.3_20240619.patchset
similarity index 71%
rename from dev-util/dialog/patches/dialog-1.3_20170509.patchset
rename to dev-util/dialog/patches/dialog-1.3_20240619.patchset
index 588d15263..5cedbc981 100644
--- a/dev-util/dialog/patches/dialog-1.3_20170509.patchset
+++ b/dev-util/dialog/patches/dialog-1.3_20240619.patchset
@@ -1,16 +1,16 @@
-From 6f41b97ceedbc7a5125cc8fb0ecd29995f47e765 Mon Sep 17 00:00:00 2001
+From 735da12f70a7d3a880c9c5cc182e2345c5bec8f4 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Mon, 5 Dec 2016 16:56:34 +0000
 Subject: add a case for haiku.
 
 
 diff --git a/configure b/configure
-index a82b478..bb8cd58 100755
+index 6d518e5..8d3c338 100755
 --- a/configure
 +++ b/configure
-@@ -10367,6 +10367,16 @@ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+@@ -12785,6 +12785,16 @@ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
  	(beos*)
- 		MK_SHARED_LIB='${CC} ${CFLAGS} -o $@ -Xlinker -soname=`basename $@` -nostart -e 0'
+ 		MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -o $@ -Xlinker -soname=`basename $@` -nostart -e 0'
  		;;
 +	(haiku*)
 +		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
@@ -26,5 +26,5 @@ index a82b478..bb8cd58 100755
  		CC_SHARED_OPTS=
  		MK_SHARED_LIB=$SHELL' '$rel_builddir'/mk_shared_lib.sh $@ ${CC} ${CFLAGS}'
 -- 
-2.10.2
+2.45.2