pcre: move libpcrecpp into its own subpkg: libpcrecpp.

common/shlibs

@@ -191,7 +191,7 @@ libusb-0.1.so.4			libusb-compat		libusb-compat-devel
 libpci.so.3			pciutils		pciutils-devel
 libpcre.so.0			libpcre			pcre-devel
 libpcreposix.so.0		libpcre			pcre-devel
-libpcrecpp.so.0			libpcre			pcre-devel
+libpcrecpp.so.0			libpcrecpp		pcre-devel
 libgirepository-gimarshallingtests-1.0.so	libgirepository		libgirepository-devel
 libgirepository-everything-1.0.so		libgirepository		libgirepository-devel
 libgirepository-1.0.so.1			libgirepository		libgirepository-devel

srcpkgs/libpcrecpp

@@ -0,0 +1 @@
+pcre

srcpkgs/pcre/depends

@@ -1,2 +1,2 @@
 abi_depends=">=7.8"
-api_depends="${abi_depends}"
+api_depends=">=8.21_1" # pcre-devel depends on libpcrecpp.

srcpkgs/pcre/libpcre.rshlibs

@@ -1,4 +1 @@
-libstdc++.so.6
-libm.so.6
 libc.so.6
-libgcc_s.so.1

srcpkgs/pcre/libpcre.template

@@ -5,9 +5,10 @@ long_desc="${long_desc}
 
  This package contains the shared libraries for use in client programs."
 
+revision=2
 replaces="pcre<8.11"
 
-do_install()
+do_install() {
-{
+	vmove "usr/lib/libpcre.so*" usr/lib
-	vmove "usr/lib/*.so*" usr/lib
+	vmove "usr/lib/libpcreposix.so*" usr/lib
 }

srcpkgs/pcre/libpcrecpp.rshlibs

@@ -0,0 +1,5 @@
+libpcre.so.0
+libstdc++.so.6
+libm.so.6
+libc.so.6
+libgcc_s.so.1

srcpkgs/pcre/libpcrecpp.template

@@ -0,0 +1,12 @@
+# Template file for 'libpcrecpp'.
+#
+revision=1
+short_desc="${short_desc} - C++ shared libraries"
+long_desc="${long_desc}
+
+ This package contains the C++ shared library for use in
+ client programs."
+
+do_install() {
+	vmove "usr/lib/libpcrecpp.so*" usr/lib
+}

srcpkgs/pcre/pcre-devel.template

@@ -5,22 +5,19 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
 Add_dependency run zlib-devel
 Add_dependency run bzip2-devel
 Add_dependency run libpcre
+Add_dependency run libpcrecpp
 
-do_install()
+do_install() {
-{
+	vmove usr/bin/pcre-config usr/bin
-	mkdir -p ${DESTDIR}/usr/bin
+	vmove usr/include usr
-	mkdir -p ${DESTDIR}/usr/lib
+	vmove "usr/lib/*.a" usr/lib
-	mkdir -p ${DESTDIR}/usr/share/man/man1
+	vmove usr/lib/pkgconfig usr/lib
-
+	vmove usr/share/man/man1/pcre-config.1 usr/share/man/man1
-	mv ${SRCPKGDESTDIR}/usr/bin/pcre-config ${DESTDIR}/usr/bin
+	vmove usr/share/man/man3 usr/share/man
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	vmove usr/share/doc usr/share
-	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/man/man1/pcre-config.1 \
-		${DESTDIR}/usr/share/man/man1
-	mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
-	mv ${SRCPKGDESTDIR}/usr/share/doc ${DESTDIR}/usr/share
 }

srcpkgs/pcre/template

@@ -17,7 +17,7 @@ long_desc="
  correspond to the POSIX regular expression API. The PCRE library is free,
  even for building commercial software."
 
-subpackages="libpcre pcre-devel"
+subpackages="libpcre libpcrecpp pcre-devel"
 
 Add_dependency build zlib-devel
 Add_dependency build bzip2-devel