From fbdbcad15fd5afd6bf012cc232aa655fd7b63b45 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 11 Dec 2010 02:27:33 +0100 Subject: [PATCH] db: move shared libs into libdb subpkg, move /usr/share/doc into -docs subpkg. --- srcpkgs/db-docs | 1 + srcpkgs/db/db-devel.template | 5 ++++- srcpkgs/db/db-docs.template | 14 ++++++++++++++ srcpkgs/db/libdb.template | 18 ++++++++++++++++++ srcpkgs/db/template | 6 +++--- srcpkgs/libdb | 1 + xbps-src/common/mapping_shlib_binpkg.txt | 4 ++-- 7 files changed, 43 insertions(+), 6 deletions(-) create mode 120000 srcpkgs/db-docs create mode 100644 srcpkgs/db/db-docs.template create mode 100644 srcpkgs/db/libdb.template create mode 120000 srcpkgs/libdb diff --git a/srcpkgs/db-docs b/srcpkgs/db-docs new file mode 120000 index 0000000000..5baa59d646 --- /dev/null +++ b/srcpkgs/db-docs @@ -0,0 +1 @@ +db \ No newline at end of file diff --git a/srcpkgs/db/db-devel.template b/srcpkgs/db/db-devel.template index 1464e280c5..03dedf69c6 100644 --- a/srcpkgs/db/db-devel.template +++ b/srcpkgs/db/db-devel.template @@ -5,7 +5,10 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -Add_dependency run db +revision=1 + +Add_dependency run libstdc++-devel +Add_dependency run libdb do_install() { diff --git a/srcpkgs/db/db-docs.template b/srcpkgs/db/db-docs.template new file mode 100644 index 0000000000..fd62f4ccb3 --- /dev/null +++ b/srcpkgs/db/db-docs.template @@ -0,0 +1,14 @@ +# Template file for 'db-docs'. +# +short_desc="${short_desc} (documentation files)" +long_desc="${long_desc} + + This package contains the documentation files for the API and utilities." + +noarch=yes + +do_install() +{ + install -d ${DESTDIR}/usr/share + mv ${SRCPKGDESTDIR}/usr/share/doc ${DESTDIR}/usr/share +} diff --git a/srcpkgs/db/libdb.template b/srcpkgs/db/libdb.template new file mode 100644 index 0000000000..07125b64c6 --- /dev/null +++ b/srcpkgs/db/libdb.template @@ -0,0 +1,18 @@ +# Template file for 'libdb'. +# +short_desc="${short_desc} - shared libraries" +long_desc="${long_desc} + + This package contains the shared libraries for use in client programs." + +replaces="db<4.8.26" + +Add_dependency run libgcc +Add_dependency run glibc +Add_dependency run libstdc++ + +do_install() +{ + install -d ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/*.so* ${DESTDIR}/usr/lib +} diff --git a/srcpkgs/db/template b/srcpkgs/db/template index 054175ca13..e27489f306 100644 --- a/srcpkgs/db/template +++ b/srcpkgs/db/template @@ -1,6 +1,7 @@ # Template file for 'db' pkgname=db version=4.8.26 +revision=1 wrksrc="db-${version}" distfiles="http://download-uk.oracle.com/berkeley-db/db-${version}.tar.gz" build_style=gnu_configure @@ -37,10 +38,9 @@ long_desc=" records or requiring that new records be added only at the end of the database." -subpackages="db-devel" +subpackages="libdb db-docs db-devel" Add_dependency run glibc -Add_dependency run libgcc -Add_dependency run libstdc++ +Add_dependency run libdb post_install() { diff --git a/srcpkgs/libdb b/srcpkgs/libdb new file mode 120000 index 0000000000..5baa59d646 --- /dev/null +++ b/srcpkgs/libdb @@ -0,0 +1 @@ +db \ No newline at end of file diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt index e0014fe01b..55154042b3 100644 --- a/xbps-src/common/mapping_shlib_binpkg.txt +++ b/xbps-src/common/mapping_shlib_binpkg.txt @@ -154,8 +154,8 @@ libgstpbutils-0.10.so gst-plugins-base gst-plugins-base-devel libgstrtp-0.10.so gst-plugins-base gst-plugins-base-devel libbfd-2.21.so binutils binutils-devel libopcodes-2.21.so binutils binutils-devel -libdb-4.8.so db db-devel -libdb_cxx-4.8.so db db-devel +libdb-4.8.so libdb db-devel +libdb_cxx-4.8.so libdb db-devel libperl.so perl libgdbm.so gdbm gdbm-devel libgettextsrc-0.18.so gettext-libs gettext-devel