From ea1abe1b90e9faa7e98a999fffcdb1dc02e1a8c8 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Sat, 15 Sep 2018 06:27:19 +0000
Subject: [PATCH] libpcre2: switch HOMEPAGE to https, define
 libpcre2{,posix}Version.

---
 dev-libs/libpcre2/libpcre2-10.30.recipe | 50 ++++++++++++++-----------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/dev-libs/libpcre2/libpcre2-10.30.recipe b/dev-libs/libpcre2/libpcre2-10.30.recipe
index 5fa54212f..b0ea62029 100644
--- a/dev-libs/libpcre2/libpcre2-10.30.recipe
+++ b/dev-libs/libpcre2/libpcre2-10.30.recipe
@@ -6,25 +6,31 @@ correspond to the POSIX regular expression API. The PCRE2 library is free, \
 even for building proprietary software.
 PCRE2 is a re-working of the original PCRE library to provide an entirely new \
 API."
-HOMEPAGE="http://www.pcre.org/"
+HOMEPAGE="https://www.pcre.org/"
 COPYRIGHT="1997-2017 University of Cambridge"
 LICENSE="PCRE"
-REVISION="1"
-SOURCE_URI="https://downloads.sf.net/pcre/pcre2-$portVersion.tar.bz2"
+REVISION="2"
+SOURCE_URI="https://downloads.sourceforge.net/pcre/pcre2-$portVersion.tar.bz2"
 CHECKSUM_SHA256="90bd41c605d30e3745771eb81928d779f158081a51b2f314bbcc1f73de5773db"
 SOURCE_DIR="pcre2-$portVersion"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86 x86_gcc2"
 
+libpcre2Version="0.6.0"
+libpcre2posixVersion="2.0.0"
+libpcre2VersionCompat="$libpcre2Version compat >= ${libpcre2Version%%.*}"
+libpcre2posixVersionCompat="$libpcre2posixVersion compat >= ${libpcre2posixVersion%%.*}"
+portVersionCompat="$portVersion compat >= 10"
+
 PROVIDES="
-	libpcre2$secondaryArchSuffix = $portVersion compat >= 10
+	libpcre2$secondaryArchSuffix = $portVersionCompat
 	cmd:pcre2grep$secondaryArchSuffix
 	cmd:pcre2test$secondaryArchSuffix
-	lib:libpcre2_16$secondaryArchSuffix = 0.6.0 compat >= 0
-	lib:libpcre2_32$secondaryArchSuffix = 0.6.0 compat >= 0
-	lib:libpcre2_8$secondaryArchSuffix = 0.6.0 compat >= 0
-	lib:libpcre2_posix$secondaryArchSuffix = 2.0.0 compat >= 2
+	lib:libpcre2_16$secondaryArchSuffix = $libpcre2VersionCompat
+	lib:libpcre2_32$secondaryArchSuffix = $libpcre2VersionCompat
+	lib:libpcre2_8$secondaryArchSuffix = $libpcre2VersionCompat
+	lib:libpcre2_posix$secondaryArchSuffix = $libpcre2posixVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -34,12 +40,12 @@ REQUIRES="
 	"
 
 PROVIDES_devel="
-	libpcre2${secondaryArchSuffix}_devel = $portVersion compat >= 10
-	cmd:pcre2_config$secondaryArchSuffix = $portVersion compat >= 10
-	devel:libpcre2_16$secondaryArchSuffix = 0.6.0 compat >= 0
-	devel:libpcre2_32$secondaryArchSuffix = 0.6.0 compat >= 0
-	devel:libpcre2_8$secondaryArchSuffix = 0.6.0 compat >= 0
-	devel:libpcre2_posix$secondaryArchSuffix = 2.0.0 compat >= 2
+	libpcre2${secondaryArchSuffix}_devel = $portVersionCompat
+	cmd:pcre2_config$secondaryArchSuffix = $portVersionCompat
+	devel:libpcre2_16$secondaryArchSuffix = $libpcre2VersionCompat
+	devel:libpcre2_32$secondaryArchSuffix = $libpcre2VersionCompat
+	devel:libpcre2_8$secondaryArchSuffix = $libpcre2VersionCompat
+	devel:libpcre2_posix$secondaryArchSuffix = $libpcre2posixVersionCompat
 	"
 REQUIRES_devel="
 	libpcre2$secondaryArchSuffix == $portVersion base
@@ -85,7 +91,7 @@ INSTALL()
 	make install
 
 	# remove libtool files
-	rm $libDir/libpcre2-*.la
+	rm -f "$libDir"/libpcre2-*.la
 
 	# prepare develop/lib
 	prepareInstalledDevelLibs \
@@ -99,20 +105,20 @@ INSTALL()
 	fixDevelopLibDirReferences $binDir/pcre2-config
 
 	if [ -z "$secondaryArchSuffix" ]; then
-		maybe_manDir_man1_pcre2_config=$manDir/man1/pcre2-config.1
-		maybe_manDir_man3=$manDir/man3
+		maybe_manDir_man1_pcre2_config="$manDir"/man1/pcre2-config.1
+		maybe_manDir_man3="$manDir"/man3
 	else
 		maybe_manDir_man1_pcre2_config=
 		maybe_manDir_man3=
-		rm -rf $documentationDir
+		rm -rf "$documentationDir"
 	fi
 
 	# devel package
 	packageEntries devel \
-		$binDir/pcre2-config \
-		$developDir \
-		$maybe_manDir_man1_pcre2_config \
-		$maybe_manDir_man3
+		"$binDir"/pcre2-config \
+		"$developDir" \
+		${maybe_manDir_man1_pcre2_config:+"$maybe_manDir_man1_pcre2_config"} \
+		${maybe_manDir_man3:+"$maybe_manDir_man3"}
 }
 
 TEST()