From 8f3397bf3a10fd14f27018bf5a87c51c6cde6f6c Mon Sep 17 00:00:00 2001 From: fbrosson Date: Sat, 10 Sep 2016 21:49:07 +0000 Subject: [PATCH] libpcre2: bump to 10.22, drop doc on secondary arch. --- dev-libs/libpcre2/libpcre2-10.21.recipe | 112 --------------------- dev-libs/libpcre2/libpcre2-10.22.recipe | 123 ++++++++++++++++++++++++ 2 files changed, 123 insertions(+), 112 deletions(-) delete mode 100644 dev-libs/libpcre2/libpcre2-10.21.recipe create mode 100644 dev-libs/libpcre2/libpcre2-10.22.recipe diff --git a/dev-libs/libpcre2/libpcre2-10.21.recipe b/dev-libs/libpcre2/libpcre2-10.21.recipe deleted file mode 100644 index 02e6d8722..000000000 --- a/dev-libs/libpcre2/libpcre2-10.21.recipe +++ /dev/null @@ -1,112 +0,0 @@ -SUMMARY="Perl5 Compatible Regular Expressions" -DESCRIPTION="The PCRE2 library is a set of functions that implement regular expression \ -pattern matching using the same syntax and semantics as Perl 5. PCRE2 has its \ -own native API, as well as a set of wrapper functions that 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/" -COPYRIGHT="1997-2016 University of Cambridge" -LICENSE="PCRE" -REVISION="1" -SOURCE_URI="https://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre2-$portVersion.tar.bz2" -CHECKSUM_SHA256="c66a17509328a7251782691093e75ede7484a203ebc6bed3c08122b092ccd4e0" -SOURCE_DIR="pcre2-$portVersion" - -ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86 x86_gcc2" - -PROVIDES=" - libpcre2${secondaryArchSuffix} = $portVersion compat >= 10 - lib:libpcre2_8${secondaryArchSuffix} = $portVersion compat >= 10 - lib:libpcre2_16${secondaryArchSuffix} = $portVersion compat >= 10 - lib:libpcre2_32${secondaryArchSuffix} = $portVersion compat >= 10 - lib:libpcre2_posix${secondaryArchSuffix} = $portVersion compat >= 10 - cmd:pcre2grep${secondaryArchSuffix} - cmd:pcre2test${secondaryArchSuffix} - " - -REQUIRES=" - haiku${secondaryArchSuffix} - lib:libz${secondaryArchSuffix} - lib:libbz2${secondaryArchSuffix} - lib:libedit${secondaryArchSuffix} - " - -PROVIDES_devel=" - libpcre2${secondaryArchSuffix}_devel = $portVersion compat >= 10 - cmd:pcre2_config${secondaryArchSuffix} = $portVersion compat >= 10 - devel:libpcre2${secondaryArchSuffix} - devel:libpcre2posix${secondaryArchSuffix} - devel:libpcre2_8${secondaryArchSuffix} - devel:libpcre2_16${secondaryArchSuffix} - devel:libpcre2_32${secondaryArchSuffix} - devel:libpcre2_posix${secondaryArchSuffix} - " - -REQUIRES_devel=" - libpcre2${secondaryArchSuffix} == $portVersion base - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libz${secondaryArchSuffix} - devel:libbz2${secondaryArchSuffix} - devel:libedit${secondaryArchSuffix} - " - -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 \ - --with-pic \ - --enable-pcre2-16 \ - --enable-pcre2-32 \ - --enable-jit \ - --enable-pcre2grep-libz \ - --enable-pcre2grep-libbz2 \ - --enable-pcre2test-libedit \ - #--enable-pcre2test-libreadline \ - #--enable-debug - make $jobArgs -} - -INSTALL() -{ - make install - - # prepare develop/lib - echo prepare develop/lib - prepareInstalledDevelLibs libpcre2-8 libpcre2-16 libpcre2-32 libpcre2-posix - fixPkgconfig - - # fix pcre-config - echo fix pcre-config - fixDevelopLibDirReferences $binDir/pcre2-config - - # devel package - echo creating devel package - packageEntries devel \ - $binDir/pcre2-config \ - $developDir \ - $manDir/man3 -} - -TEST() -{ - make check -} diff --git a/dev-libs/libpcre2/libpcre2-10.22.recipe b/dev-libs/libpcre2/libpcre2-10.22.recipe new file mode 100644 index 000000000..a8af81499 --- /dev/null +++ b/dev-libs/libpcre2/libpcre2-10.22.recipe @@ -0,0 +1,123 @@ +SUMMARY="Perl5 Compatible Regular Expressions" +DESCRIPTION="The PCRE2 library is a set of functions that implement regular \ +expression pattern matching using the same syntax and semantics as Perl 5. \ +PCRE2 has its own native API, as well as a set of wrapper functions that \ +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/" +COPYRIGHT="1997-2016 University of Cambridge" +LICENSE="PCRE" +REVISION="1" +SOURCE_URI="https://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre2-$portVersion.tar.bz2" +CHECKSUM_SHA256="b2b44619f4ac6c50ad74c2865fd56807571392496fae1c9ad7a70993d018f416" +SOURCE_DIR="pcre2-$portVersion" + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + libpcre2$secondaryArchSuffix = $portVersion compat >= 10 + lib:libpcre2_8$secondaryArchSuffix = 0.4.0 compat >= 0 + lib:libpcre2_16$secondaryArchSuffix = 0.4.0 compat >= 0 + lib:libpcre2_32$secondaryArchSuffix = 0.4.0 compat >= 0 + lib:libpcre2_posix$secondaryArchSuffix = 0.4.0 compat >= 0 + cmd:pcre2grep$secondaryArchSuffix + cmd:pcre2test$secondaryArchSuffix + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libz$secondaryArchSuffix + lib:libbz2$secondaryArchSuffix + lib:libedit$secondaryArchSuffix + " + +PROVIDES_devel=" + libpcre2${secondaryArchSuffix}_devel = $portVersion compat >= 10 + cmd:pcre2_config$secondaryArchSuffix = $portVersion compat >= 10 + devel:libpcre2$secondaryArchSuffix + devel:libpcre2posix$secondaryArchSuffix + devel:libpcre2_8$secondaryArchSuffix + devel:libpcre2_16$secondaryArchSuffix + devel:libpcre2_32$secondaryArchSuffix + devel:libpcre2_posix$secondaryArchSuffix + " +REQUIRES_devel=" + libpcre2$secondaryArchSuffix == $portVersion base + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libz$secondaryArchSuffix + devel:libbz2$secondaryArchSuffix + devel:libedit$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix + cmd:make + " + +BUILD() +{ + libtoolize --force --copy --install + aclocal + autoconf + automake --add-missing + runConfigure ./configure \ + --with-pic \ + --enable-pcre2-16 \ + --enable-pcre2-32 \ + --enable-jit \ + --enable-pcre2grep-libz \ + --enable-pcre2grep-libbz2 \ + --enable-pcre2test-libedit \ + #--enable-pcre2test-libreadline \ + #--enable-debug + make $jobArgs +} + +INSTALL() +{ + make install + + # remove libtool files + rm $libDir/libpcre2-*.la + + # prepare develop/lib + prepareInstalledDevelLibs \ + libpcre2-8 \ + libpcre2-16 \ + libpcre2-32 \ + libpcre2-posix + fixPkgconfig + + # fix pcre-config + fixDevelopLibDirReferences $binDir/pcre2-config + + if [ -z "$secondaryArchSuffix" ]; then + 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 + fi + + # devel package + packageEntries devel \ + $binDir/pcre2-config \ + $developDir \ + $maybe_manDir_man1_pcre2_config \ + $maybe_manDir_man3 +} + +TEST() +{ + make check +}