From 225e4595b871cf63e1c3567f87298d20a6e35f1e Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sun, 24 Apr 2022 14:23:13 +0200
Subject: [PATCH] proj, bump version (#6844)

---
 .../{proj-6.2.0.recipe => proj-9.0.0.recipe}  | 41 +++++++++++--------
 1 file changed, 23 insertions(+), 18 deletions(-)
 rename sci-libs/proj/{proj-6.2.0.recipe => proj-9.0.0.recipe} (75%)

diff --git a/sci-libs/proj/proj-6.2.0.recipe b/sci-libs/proj/proj-9.0.0.recipe
similarity index 75%
rename from sci-libs/proj/proj-6.2.0.recipe
rename to sci-libs/proj/proj-9.0.0.recipe
index fa7ba2e1d..894695402 100644
--- a/sci-libs/proj/proj-6.2.0.recipe
+++ b/sci-libs/proj/proj-9.0.0.recipe
@@ -6,7 +6,7 @@ COPYRIGHT="2000-2018 Frank Warmerdam"
 LICENSE="MIT"
 REVISION="1"
 SOURCE_URI="http://download.osgeo.org/proj/proj-$portVersion.tar.gz"
-CHECKSUM_SHA256="b300c0f872f632ad7f8eb60725edbf14f0f8f52db740a3ab23e7b94f1cd22a50"
+CHECKSUM_SHA256="0620aa01b812de00b54d6c23e7c5cc843ae2cd129b24fabe411800302172b989"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -19,12 +19,11 @@ else
 	commandBinDir=$prefix/bin
 fi
 
-libVersion="15.2.0"
+libVersion="25.9.0.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
 	proj$secondaryArchSuffix = $portVersion
-	lib:libproj$secondaryArchSuffix = $libVersionCompat
 	cmd:cct$commandSuffix = $portVersion
 	cmd:cs2cs$commandSuffix = $portVersion
 	cmd:geod$commandSuffix = $portVersion
@@ -33,10 +32,14 @@ PROVIDES="
 	cmd:invproj$commandSuffix = $portVersion
 	cmd:proj$commandSuffix = $portVersion
 	cmd:projinfo$commandSuffix = $portVersion
+	cmd:projsync$commandSuffix = $portVersion
+	lib:libproj$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libcurl$secondaryArchSuffix
 	lib:libsqlite3$secondaryArchSuffix
+	lib:libtiff$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
@@ -49,16 +52,13 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	devel:libcurl$secondaryArchSuffix
 	devel:libsqlite3$secondaryArchSuffix
+	devel:libtiff$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
-	cmd:awk
+	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:sqlite3
@@ -71,33 +71,38 @@ defineDebugInfoPackage proj$secondaryArchSuffix \
 	"$commandBinDir"/gie \
 	"$commandBinDir"/proj \
 	"$commandBinDir"/projinfo \
+	"$commandBinDir"/projsync \
 	"$libDir"/libproj.so.$libVersion
 
 BUILD()
 {
-	autoreconf -fi
-	runConfigure --omit-dirs binDir ./configure \
-		--bindir="$commandBinDir"
-
-	make $jobArgs
+	cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
+		$cmakeDirArgs \
+		-DBINDIR=$commandBinDir \
+		-DDOCDIR=$docDir \
+		-DMANDIR=$manDir -L
+	make -C build $jobArgs
 }
 
 INSTALL()
 {
-	make install
+	make -C build install
 
 	rm -f "$libDir"/*.la "$libDir"/libproj.a
 
+	mkdir -p $manDir
+	mv $prefix/share/man/* $manDir
+	rmdir $prefix/share/man $prefix/share
+
 	prepareInstalledDevelLibs libproj
 	fixPkgconfig
 
 	# devel package
 	packageEntries devel \
-		"$developDir" \
-		"$manDir"/man3
+		"$developDir"
 }
 
 TEST()
 {
-	make check
+	make -C build check
 }