discount: bump version

app-text/discount/discount-3.0.0d.recipe

@@ -5,29 +5,21 @@ program that you can use to mark down documents interactively or from a \
 script, and a tiny (3 programs so far) suite of example programs that show \
 how to fully utilize the markdown library."
 HOMEPAGE="http://www.pell.portland.or.us/~orc/Code/discount/"
-COPYRIGHT="2007-2016 David Loren Parsons"
+COPYRIGHT="2007-2024 David Loren Parsons"
 LICENSE="BSD (4-clause)"
 REVISION="1"
 SOURCE_URI="https://github.com/Orc/discount/archive/v$portVersion.tar.gz"
 SOURCE_FILENAME="discount-$portVersion.tar.gz"
-CHECKSUM_SHA256="0beb98a66a6e38ed125e2d0a161ff6b461f6a38538bb72498766f376c94a0ad3"
-PATCHES="discount-$portVersion.patchset"
+CHECKSUM_SHA256="0ed8cc27ac5d46dc6a8beedd5e5673ac8b466a6474bdb7d35f37c815f670385f"
 
-ARCHITECTURES="all"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	discount$secondaryArchSuffix = $portVersion
-	lib:libmarkdown$secondaryArchSuffix  = $portVersion compat >= 2
+	lib:libmarkdown$secondaryArchSuffix  = $portVersion compat >= 3
+	cmd:markdown$secondaryArchSuffix = $portVersion compat >= 3
 	"
-if [ -z "$secondaryArchSuffix" ]; then
-	PROVIDES="$PROVIDES
-		cmd:markdown$secondaryArchSuffix = $portVersion compat >= 2
-		cmd:makepage$secondaryArchSuffix = $portVersion compat >= 2
-		cmd:mkd2html$secondaryArchSuffix = $portVersion compat >= 2
-		cmd:theme$secondaryArchSuffix = $portVersion compat >= 2
-		"
-fi
 
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -35,7 +27,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	discount${secondaryArchSuffix}_devel = $portVersion
-	devel:libmarkdown$secondaryArchSuffix = $portVersion compat >= 2
+	devel:libmarkdown$secondaryArchSuffix = $portVersion compat >= 3
 	"
 REQUIRES_devel="
 	discount$secondaryArchSuffix == $portVersion base
@@ -45,51 +37,35 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:ar$secondaryArchSuffix
-	cmd:awk
-	cmd:diff
-	cmd:find
+	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
-	cmd:ranlib$secondaryArchSuffix
-	cmd:sed
 	"
 
 BUILD()
 {
-	./configure.sh --prefix=$prefix \
-		--execdir=$binDir \
-		--sbindir=$sbinDir \
-		--confdir=$settingsDir \
-		--libdir=$libDir \
-		--libexecdir=$libExecDir \
-		--mandir=$manDir \
-		--shared
-	make INCDIR=$includeDir
+	cmake -B build -S./cmake $cmakeDirArgs \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DBUILD_SHARED_LIBS=ON
+
+	make -C build $jobArgs
 }
 
 INSTALL()
 {
-	make install.everything INCDIR=$includeDir
+	make -C build install
 
 	prepareInstalledDevelLib libmarkdown
-	fixPkgconfig
 
-	if [ -z "$secondaryArchSuffix" ]; then
-		maybe_manDir_man3=$manDir/man3
-	else
-		maybe_manDir_man3=
-		rm -rf $binDir
-		rm -rf $documentationDir
-	fi
+	fixPkgconfig
 
 	packageEntries devel \
 		$developDir \
-		$maybe_manDir_man3
+		$libDir/cmake
 }
 
 TEST()
 {
-	make test
+	make -C build test
 }

app-text/discount/patches/discount-2.2.6.patchset

@@ -1,27 +0,0 @@
-From 5ad253c02c94d67b112245e9ca013ed353e6f8e5 Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Sat, 30 Nov 2019 20:36:27 +0100
-Subject: cpp check would block on input.
-
-
-diff --git a/configure.inc b/configure.inc
-index fd0c9ba..0b246af 100755
---- a/configure.inc
-+++ b/configure.inc
-@@ -1674,11 +1674,11 @@ EOF
- 	    echo "CPP=[$1], CPP_PIPE=[$2${use_cflags:+ $AC_CFLAGS}]"
- 	    AC_SUB 'CPP' "$1"
- 	    AC_CPP_FILTER="$1 $2${use_cflags:+ $AC_CFLAGS}"
--	    rm ngc$$.c ngc$$.o
-+	    rm -f ngc$$.c ngc$$.o
- 	    return 0
- 	fi
-     fi
--    rm ngc$$.c ngc$$.o
-+    rm -f ngc$$.c ngc$$.o
-     return 1
- }
- 
--- 
-2.24.0
-