libpcre: bump to 8.39, drop documentation on 2nd arch. (#638)

2026-04-21 19:20:08 +02:00 · 2016-06-17 21:56:50 +00:00
parent 91dd56995f
commit 4a11de7bba
2 changed files with 109 additions and 101 deletions
--- a/dev-libs/libpcre/libpcre-8.38.recipe
+++ b/dev-libs/libpcre/libpcre-8.38.recipe
@@ -1,101 +0,0 @@
-SUMMARY="Perl5 Compatible Regular Expressions"
-DESCRIPTION="
-The PCRE library is a set of functions that implement regular expression \
-pattern matching using the same syntax and semantics as Perl 5. PCRE has its \
-own native API, as well as a set of wrapper functions that correspond to the \
-POSIX regular expression API. The PCRE library is free, even for building \
-proprietary software.
-This package contains the native API.
-"
-HOMEPAGE="http://www.pcre.org/"
-LICENSE="PCRE"
-COPYRIGHT="
-	1997-2011 University of Cambridge
-	2007-2011, Google Inc. All rights reserved.
-	"
-SOURCE_URI="https://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$portVersion.tar.bz2"
-CHECKSUM_SHA256="b9e02d36e23024d6c02a2e5b25204b3a4fa6ade43e0a5f869f254f49535079df"
-REVISION="1"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86 x86_gcc2"
-
-PROVIDES="
-	libpcre${secondaryArchSuffix} = $portVersion
-	lib:libpcre${secondaryArchSuffix} = 1.2.6 compat >= 1
-	lib:libpcrecpp${secondaryArchSuffix} = 0.0.1 compat >= 0
-	lib:libpcreposix${secondaryArchSuffix} = 0.0.3 compat >= 0
-	"
-
-if [ -z "$secondaryArchSuffix" ];then
-PROVIDES="$PROVIDES
-	cmd:pcregrep = $portVersion compat >= 8
-	cmd:pcretest = $portVersion compat >= 8
-	"
-fi
-
-REQUIRES="
-	haiku$secondaryArchSuffix
-	"
-BUILD_REQUIRES="
-	"
-BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
-	cmd:gcc$secondaryArchSuffix
-	cmd:make
-	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize
-	"
-
-SOURCE_DIR="pcre-$portVersion"
-
-BUILD()
-{
-	libtoolize --force --copy --install
-	aclocal
-	autoconf
-	automake --add-missing
-	runConfigure ./configure \
-		--enable-utf8 \
-		--enable-unicode-properties \
-		--with-pic
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-
-	# prepare develop/lib
-	prepareInstalledDevelLibs libpcre libpcrecpp libpcreposix
-	fixPkgconfig
-
-	# fix pcre-config
-	fixDevelopLibDirReferences $binDir/pcre-config
-
-	# devel package
-	packageEntries devel \
-		$binDir/pcre-config \
-		$developDir \
-		$manDir/man3
-}
-
-TEST()
-{
-	make check
-}
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libpcre${secondaryArchSuffix}_devel = $portVersion
-	cmd:pcre_config = $portVersion compat >= 8
-	devel:libpcre$secondaryArchSuffix = 1.2.6 compat >= 1
-	devel:libpcrecpp$secondaryArchSuffix = 0.0.1 compat >= 0
-	devel:libpcreposix$secondaryArchSuffix = 0.0.3 compat >= 0
-	"
-REQUIRES_devel="
-	libpcre$secondaryArchSuffix == $portVersion base
-	"
--- a/dev-libs/libpcre/libpcre-8.39.recipe
+++ b/dev-libs/libpcre/libpcre-8.39.recipe
@@ -0,0 +1,109 @@
+SUMMARY="Perl5 Compatible Regular Expressions"
+DESCRIPTION="The PCRE library is a set of functions that implement regular \
+expression pattern matching using the same syntax and semantics as Perl 5. \
+PCRE has its own native API, as well as a set of wrapper functions that \
+correspond to the POSIX regular expression API. The PCRE library is free, even \
+for building proprietary software.
+This package contains the native API."
+COPYRIGHT="1997-2016 University of Cambridge
+	2007-2012, Google Inc. All rights reserved."
+HOMEPAGE="http://www.pcre.org/"
+LICENSE="PCRE"
+REVISION="1"
+SOURCE_URI="https://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$portVersion.tar.bz2"
+CHECKSUM_SHA256="b858099f82483031ee02092711689e7245586ada49e534a06e678b8ea9549e8b"
+SOURCE_DIR="pcre-$portVersion"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	libpcre$secondaryArchSuffix = $portVersion
+	lib:libpcre$secondaryArchSuffix = 1.2.7 compat >= 1
+	lib:libpcrecpp$secondaryArchSuffix = 0.0.1 compat >= 0
+	lib:libpcreposix$secondaryArchSuffix = 0.0.4 compat >= 0
+	"
+if [ -z "$secondaryArchSuffix" ];then
+	PROVIDES="$PROVIDES
+		cmd:pcregrep = $portVersion compat >= 8
+		cmd:pcretest = $portVersion compat >= 8
+		"
+fi
+
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	libpcre${secondaryArchSuffix}_devel = $portVersion
+	cmd:pcre_config$secondaryArchSuffix = $portVersion compat >= 8
+	devel:libpcre$secondaryArchSuffix = 1.2.7 compat >= 1
+	devel:libpcrecpp$secondaryArchSuffix = 0.0.1 compat >= 0
+	devel:libpcreposix$secondaryArchSuffix = 0.0.4 compat >= 0
+	"
+REQUIRES_devel="
+	libpcre$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
+	"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	automake --add-missing
+	runConfigure ./configure \
+		--enable-utf8 \
+		--enable-unicode-properties \
+		--with-pic
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	# prepare develop/lib
+	prepareInstalledDevelLibs libpcre libpcrecpp libpcreposix
+	fixPkgconfig
+
+	# fix pcre-config
+	fixDevelopLibDirReferences $binDir/pcre-config
+
+	if [ -n "$secondaryArchSuffix" ]; then
+		maybe_manDir_man1_pcre_config=
+		maybe_manDir_man3=
+	 	rm -rf $documentationDir
+	else
+		maybe_manDir_man1_pcre_config=$manDir/man1/pcre-config.1
+		maybe_manDir_man3=$manDir/man3
+	fi
+
+	# devel package
+	packageEntries devel \
+		$binDir/pcre-config \
+		$developDir \
+		$maybe_manDir_man1_pcre_config \
+		$maybe_manDir_man3
+
+	if [ -n "$secondaryArchSuffix" ]; then
+	 	rm -rf $binDir
+	fi
+}
+
+TEST()
+{
+	make check
+}