From ee99b4e0b7c2444cdcc5b14400aaec41120ee7e8 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 30 Jan 2012 15:46:59 +0100
Subject: [PATCH] pcre: move libpcrecpp into its own subpkg: libpcrecpp.
---
common/shlibs | 2 +-
srcpkgs/libpcrecpp | 1 +
srcpkgs/pcre/depends | 2 +-
srcpkgs/pcre/libpcre.rshlibs | 3 ---
srcpkgs/pcre/libpcre.template | 7 ++++---
srcpkgs/pcre/libpcrecpp.rshlibs | 5 +++++
srcpkgs/pcre/libpcrecpp.template | 12 ++++++++++++
srcpkgs/pcre/pcre-devel.template | 25 +++++++++++--------------
srcpkgs/pcre/template | 2 +-
9 files changed, 36 insertions(+), 23 deletions(-)
create mode 120000 srcpkgs/libpcrecpp
create mode 100644 srcpkgs/pcre/libpcrecpp.rshlibs
create mode 100644 srcpkgs/pcre/libpcrecpp.template
diff --git a/common/shlibs b/common/shlibs
index 6d0cc1dfef9..47974c7c2cb 100644
--- a/common/shlibs
+++ b/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
diff --git a/srcpkgs/libpcrecpp b/srcpkgs/libpcrecpp
new file mode 120000
index 00000000000..e95712375c7
--- /dev/null
+++ b/srcpkgs/libpcrecpp
@@ -0,0 +1 @@
+pcre
\ No newline at end of file
diff --git a/srcpkgs/pcre/depends b/srcpkgs/pcre/depends
index 3bc988da7db..7410a959dd4 100644
--- a/srcpkgs/pcre/depends
+++ b/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.
diff --git a/srcpkgs/pcre/libpcre.rshlibs b/srcpkgs/pcre/libpcre.rshlibs
index d2b712aef4f..631aa1dda40 100644
--- a/srcpkgs/pcre/libpcre.rshlibs
+++ b/srcpkgs/pcre/libpcre.rshlibs
@@ -1,4 +1 @@
-libstdc++.so.6
-libm.so.6
libc.so.6
-libgcc_s.so.1
diff --git a/srcpkgs/pcre/libpcre.template b/srcpkgs/pcre/libpcre.template
index cbc4add7d13..724adb21353 100644
--- a/srcpkgs/pcre/libpcre.template
+++ b/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()
-{
- vmove "usr/lib/*.so*" usr/lib
+do_install() {
+ vmove "usr/lib/libpcre.so*" usr/lib
+ vmove "usr/lib/libpcreposix.so*" usr/lib
}
diff --git a/srcpkgs/pcre/libpcrecpp.rshlibs b/srcpkgs/pcre/libpcrecpp.rshlibs
new file mode 100644
index 00000000000..8574eb18d4b
--- /dev/null
+++ b/srcpkgs/pcre/libpcrecpp.rshlibs
@@ -0,0 +1,5 @@
+libpcre.so.0
+libstdc++.so.6
+libm.so.6
+libc.so.6
+libgcc_s.so.1
diff --git a/srcpkgs/pcre/libpcrecpp.template b/srcpkgs/pcre/libpcrecpp.template
new file mode 100644
index 00000000000..f5708f514cb
--- /dev/null
+++ b/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
+}
diff --git a/srcpkgs/pcre/pcre-devel.template b/srcpkgs/pcre/pcre-devel.template
index 36350e86433..b529d24fc98 100644
--- a/srcpkgs/pcre/pcre-devel.template
+++ b/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()
-{
- mkdir -p ${DESTDIR}/usr/bin
- mkdir -p ${DESTDIR}/usr/lib
- mkdir -p ${DESTDIR}/usr/share/man/man1
-
- mv ${SRCPKGDESTDIR}/usr/bin/pcre-config ${DESTDIR}/usr/bin
- mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
- 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
+do_install() {
+ vmove usr/bin/pcre-config usr/bin
+ vmove usr/include usr
+ vmove "usr/lib/*.a" usr/lib
+ vmove usr/lib/pkgconfig usr/lib
+ vmove usr/share/man/man1/pcre-config.1 usr/share/man/man1
+ vmove usr/share/man/man3 usr/share/man
+ vmove usr/share/doc usr/share
}
diff --git a/srcpkgs/pcre/template b/srcpkgs/pcre/template
index 90647a3a54f..19bc29ae150 100644
--- a/srcpkgs/pcre/template
+++ b/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