diff --git a/srcpkgs/pcre/libpcre.template b/srcpkgs/pcre/libpcre.template deleted file mode 100644 index d40bc2d974..0000000000 --- a/srcpkgs/pcre/libpcre.template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'libpcre'. -# -short_desc="${short_desc} - shared libraries" -replaces="pcre<8.11" - -do_install() { - vmove "usr/lib/libpcre.so*" usr/lib - vmove "usr/lib/libpcreposix.so*" usr/lib -} diff --git a/srcpkgs/pcre/libpcrecpp.template b/srcpkgs/pcre/libpcrecpp.template deleted file mode 100644 index 68b5113ea4..0000000000 --- a/srcpkgs/pcre/libpcrecpp.template +++ /dev/null @@ -1,7 +0,0 @@ -# Template file for 'libpcrecpp'. -# -short_desc="${short_desc} - C++ shared libraries" - -do_install() { - vmove "usr/lib/libpcrecpp.so*" usr/lib -} diff --git a/srcpkgs/pcre/pcre-devel.template b/srcpkgs/pcre/pcre-devel.template deleted file mode 100644 index c91011f7df..0000000000 --- a/srcpkgs/pcre/pcre-devel.template +++ /dev/null @@ -1,14 +0,0 @@ -# Template file for 'pcre-devel'. -# -noarch=yes -depends="zlib-devel bzip2-devel libpcre>=${version} libpcrecpp>=${version}" -short_desc="${short_desc} (development files)" - -do_install() { - vmove usr/bin/pcre-config usr/bin - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib - vmove usr/share/man/man1/pcre-config.1.gz 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 1b0d569db8..be43f27ae0 100644 --- a/srcpkgs/pcre/template +++ b/srcpkgs/pcre/template @@ -2,7 +2,6 @@ pkgname=pcre version=8.32 revision=2 -subpackages="libpcre libpcrecpp pcre-devel" build_style=gnu-configure configure_args="--enable-utf8 --enable-unicode-properties --with-pic --enable-pcregrep-libz --enable-pcregrep-libbz2 --enable-newline-is-anycrlf @@ -22,3 +21,42 @@ if [ "$CROSS_BUILD" ]; then autoreconf -fi } fi + + +libpcrecpp_package() { + short_desc+=" - C++ shared libraries" + + pkg_install() { + vmove "usr/lib/libpcrecpp.so*" + } +} + +libpcre_package() { + short_desc="${short_desc} - shared libraries" + replaces="pcre<8.11" + + pkg_install() { + vmove "usr/lib/libpcre.so*" + vmove "usr/lib/libpcreposix.so*" + } +} + +pcre-devel_package() { + depends="zlib-devel bzip2-devel libpcre>=${version} libpcrecpp>=${version}" + short_desc="${short_desc} (development files)" + + pkg_install() { + vmove usr/bin/pcre-config + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/man/man1/pcre-config.1 + vmove usr/share/man/man3 + vmove usr/share/doc + } +} + +pcre_package() { + pkg_install() { + vmove usr + } +}