libpcre: update to 8.32, keep c++/posix library in /usr/lib, remove useless man-pages

3 files changed, 15 insertions, 44 deletions

diff --git a/libpcre/.footprint b/libpcre/.footprint
index f0ddcfcd..26dfae6a 100644
--- a/libpcre/.footprint
+++ b/libpcre/.footprint
@@ -1,10 +1,6 @@
 drwxr-xr-x	root/root	lib/
-lrwxrwxrwx	root/root	lib/libpcre.so.1 -> libpcre.so.1.0.1
--rwxr-xr-x	root/root	lib/libpcre.so.1.0.1
-lrwxrwxrwx	root/root	lib/libpcrecpp.so.0 -> libpcrecpp.so.0.0.0
--rwxr-xr-x	root/root	lib/libpcrecpp.so.0.0.0
-lrwxrwxrwx	root/root	lib/libpcreposix.so.0 -> libpcreposix.so.0.0.1
--rwxr-xr-x	root/root	lib/libpcreposix.so.0.0.1
+lrwxrwxrwx	root/root	lib/libpcre.so.1 -> libpcre.so.1.2.0
+-rwxr-xr-x	root/root	lib/libpcre.so.1.2.0
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/pcre-config
@@ -20,13 +16,17 @@ drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libpcre.a
 -rwxr-xr-x	root/root	usr/lib/libpcre.la
-lrwxrwxrwx	root/root	usr/lib/libpcre.so -> ../../lib/libpcre.so.1.0.1
+lrwxrwxrwx	root/root	usr/lib/libpcre.so -> ../../lib/libpcre.so.1.2.0
 -rw-r--r--	root/root	usr/lib/libpcrecpp.a
 -rwxr-xr-x	root/root	usr/lib/libpcrecpp.la
-lrwxrwxrwx	root/root	usr/lib/libpcrecpp.so -> ../../lib/libpcrecpp.so.0.0.0
+lrwxrwxrwx	root/root	usr/lib/libpcrecpp.so -> libpcrecpp.so.0.0.0
+lrwxrwxrwx	root/root	usr/lib/libpcrecpp.so.0 -> libpcrecpp.so.0.0.0
+-rwxr-xr-x	root/root	usr/lib/libpcrecpp.so.0.0.0
 -rw-r--r--	root/root	usr/lib/libpcreposix.a
 -rwxr-xr-x	root/root	usr/lib/libpcreposix.la
-lrwxrwxrwx	root/root	usr/lib/libpcreposix.so -> ../../lib/libpcreposix.so.0.0.1
+lrwxrwxrwx	root/root	usr/lib/libpcreposix.so -> libpcreposix.so.0.0.1
+lrwxrwxrwx	root/root	usr/lib/libpcreposix.so.0 -> libpcreposix.so.0.0.1
+-rwxr-xr-x	root/root	usr/lib/libpcreposix.so.0.0.1
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libpcre.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libpcrecpp.pc
@@ -38,32 +38,6 @@ drwxr-xr-x	root/root	usr/man/man1/
 -rw-r--r--	root/root	usr/man/man1/pcretest.1.gz
 drwxr-xr-x	root/root	usr/man/man3/
 -rw-r--r--	root/root	usr/man/man3/pcre.3.gz
--rw-r--r--	root/root	usr/man/man3/pcre16.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/pcre16_assign_jit_stack.3.gz -> pcre_assign_jit_stack.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/pcre16_compile.3.gz -> pcre_compile.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/pcre16_compile2.3.gz -> pcre_compile2.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/pcre16_config.3.gz -> pcre_config.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/pcre16_copy_named_substring.3.gz -> pcre_copy_named_substring.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/pcre16_copy_substring.3.gz -> pcre_copy_substring.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/pcre16_dfa_exec.3.gz -> pcre_dfa_exec.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/pcre16_exec.3.gz -> pcre_exec.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/pcre16_free_study.3.gz -> pcre_free_study.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/pcre16_free_substring.3.gz -> pcre_free_substring.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/pcre16_free_substring_list.3.gz -> pcre_free_substring_list.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/pcre16_fullinfo.3.gz -> pcre_fullinfo.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/pcre16_get_named_substring.3.gz -> pcre_get_named_substring.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/pcre16_get_stringnumber.3.gz -> pcre_get_stringnumber.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/pcre16_get_stringtable_entries.3.gz -> pcre_get_stringtable_entries.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/pcre16_get_substring.3.gz -> pcre_get_substring.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/pcre16_get_substring_list.3.gz -> pcre_get_substring_list.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/pcre16_jit_stack_alloc.3.gz -> pcre_jit_stack_alloc.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/pcre16_jit_stack_free.3.gz -> pcre_jit_stack_free.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/pcre16_maketables.3.gz -> pcre_maketables.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/pcre16_pattern_to_host_byte_order.3.gz -> pcre_pattern_to_host_byte_order.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/pcre16_refcount.3.gz -> pcre_refcount.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/pcre16_study.3.gz -> pcre_study.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/pcre16_utf16_to_host_byte_order.3.gz -> pcre_utf16_to_host_byte_order.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/pcre16_version.3.gz -> pcre_version.3.gz
 -rw-r--r--	root/root	usr/man/man3/pcre_assign_jit_stack.3.gz
 -rw-r--r--	root/root	usr/man/man3/pcre_compile.3.gz
 -rw-r--r--	root/root	usr/man/man3/pcre_compile2.3.gz
@@ -81,13 +55,13 @@ lrwxrwxrwx	root/root	usr/man/man3/pcre16_version.3.gz -> pcre_version.3.gz
 -rw-r--r--	root/root	usr/man/man3/pcre_get_stringtable_entries.3.gz
 -rw-r--r--	root/root	usr/man/man3/pcre_get_substring.3.gz
 -rw-r--r--	root/root	usr/man/man3/pcre_get_substring_list.3.gz
+-rw-r--r--	root/root	usr/man/man3/pcre_jit_exec.3.gz
 -rw-r--r--	root/root	usr/man/man3/pcre_jit_stack_alloc.3.gz
 -rw-r--r--	root/root	usr/man/man3/pcre_jit_stack_free.3.gz
 -rw-r--r--	root/root	usr/man/man3/pcre_maketables.3.gz
 -rw-r--r--	root/root	usr/man/man3/pcre_pattern_to_host_byte_order.3.gz
 -rw-r--r--	root/root	usr/man/man3/pcre_refcount.3.gz
 -rw-r--r--	root/root	usr/man/man3/pcre_study.3.gz
--rw-r--r--	root/root	usr/man/man3/pcre_utf16_to_host_byte_order.3.gz
 -rw-r--r--	root/root	usr/man/man3/pcre_version.3.gz
 -rw-r--r--	root/root	usr/man/man3/pcreapi.3.gz
 -rw-r--r--	root/root	usr/man/man3/pcrebuild.3.gz
diff --git a/libpcre/.md5sum b/libpcre/.md5sum
index d68d6838..41e8190b 100644
--- a/libpcre/.md5sum
+++ b/libpcre/.md5sum
@@ -1 +1 @@
-1c9a276af932b5599157f96e945391f0  pcre-8.31.tar.bz2
+62f02a76bb57a40bc66681760ed511d5  pcre-8.32.tar.bz2
diff --git a/libpcre/Pkgfile b/libpcre/Pkgfile
index 0e9d4ec8..897b40e9 100644
--- a/libpcre/Pkgfile
+++ b/libpcre/Pkgfile
@@ -3,7 +3,7 @@
 # Maintainer:  CRUX System Team, core-ports at crux dot nu
 
 name=libpcre
-version=8.31
+version=8.32
 release=1
 source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$version.tar.bz2)
 
@@ -19,12 +19,9 @@ build() {
     make DESTDIR=$PKG install
 
     install -d $PKG/lib
-    local lib
-    for lib in libpcre libpcrecpp libpcreposix ; do
-        mv $PKG/usr/lib/${lib}.so* $PKG/lib
-        ln -sf ../../lib/$(readlink $PKG/lib/${lib}.so) $PKG/usr/lib/${lib}.so
-        rm $PKG/lib/${lib}.so
-    done
+    mv $PKG/usr/lib/libpcre.so.* $PKG/lib
+    ln -sf ../../lib/$(readlink $PKG/usr/lib/libpcre.so) $PKG/usr/lib/libpcre.so
 
     rm -r $PKG/usr/share
+    rm $PKG/usr/man/man3/{pcre{16,32}*,pcre_utf{16,32}*}
 }