From af99924e03ee121f1f1ebe65afd10894f44232e3 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 10 Apr 2013 23:28:39 +0200 Subject: [PATCH] db: convert to the new template format. --- srcpkgs/db/db-devel.template | 9 -------- srcpkgs/db/db-docs.template | 9 -------- srcpkgs/db/libdb-cxx.template | 7 ------ srcpkgs/db/libdb.template | 9 -------- srcpkgs/db/template | 42 +++++++++++++++++++++++++++++++++-- 5 files changed, 40 insertions(+), 36 deletions(-) delete mode 100644 srcpkgs/db/db-devel.template delete mode 100644 srcpkgs/db/db-docs.template delete mode 100644 srcpkgs/db/libdb-cxx.template delete mode 100644 srcpkgs/db/libdb.template diff --git a/srcpkgs/db/db-devel.template b/srcpkgs/db/db-devel.template deleted file mode 100644 index e8938c33c8b..00000000000 --- a/srcpkgs/db/db-devel.template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'db-devel'. -# -depends="libdb>=${version} libdb-cxx>=${version}" -short_desc="${short_desc} -- development files" - -do_install() { - vmove usr/include usr - vmove usr/share usr -} diff --git a/srcpkgs/db/db-docs.template b/srcpkgs/db/db-docs.template deleted file mode 100644 index 49b85ad8f3e..00000000000 --- a/srcpkgs/db/db-docs.template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'db-docs'. -# -short_desc="${short_desc} -- documentation files" -noarch=yes - -do_install() { - install -d ${DESTDIR}/usr/share - mv ${SRCPKGDESTDIR}/usr/share/doc ${DESTDIR}/usr/share -} diff --git a/srcpkgs/db/libdb-cxx.template b/srcpkgs/db/libdb-cxx.template deleted file mode 100644 index ffc5ed9a612..00000000000 --- a/srcpkgs/db/libdb-cxx.template +++ /dev/null @@ -1,7 +0,0 @@ -# Template file for 'libdb-cxx'. -# -short_desc="${short_desc} - C++ shared libraries" - -do_install() { - vmove "usr/lib/libdb_cxx*.so*" usr/lib -} diff --git a/srcpkgs/db/libdb.template b/srcpkgs/db/libdb.template deleted file mode 100644 index 383676a0dca..00000000000 --- a/srcpkgs/db/libdb.template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'libdb'. -# -short_desc="${short_desc} -- C shared libraries" -replaces="db<4.8.26" - -do_install() { - vmove "usr/lib/libdb.so*" usr/lib - vmove "usr/lib/libdb-*.so*" usr/lib -} diff --git a/srcpkgs/db/template b/srcpkgs/db/template index 971435d5631..852fdffab16 100644 --- a/srcpkgs/db/template +++ b/srcpkgs/db/template @@ -3,7 +3,6 @@ pkgname=db version=4.8.30 revision=4 wrksrc="db-${version}" -subpackages="libdb libdb-cxx db-docs db-devel" build_style=gnu-configure build_wrksrc="build_unix" configure_script="../dist/configure" @@ -19,6 +18,45 @@ checksum=e0491a07cdb21fb9aa82773bbbedaeb7639cbd0e7f96147ab46141e0045db72a post_install() { chmod 755 ${DESTDIR}/usr/bin/* - vmove "usr/docs/*" usr/share/doc/${pkgname}-${version} + vmkdir usr/share/doc/${pkgname}-${version} + mv ${DESTDIR}/usr/docs/* ${DESTDIR}/usr/share/doc/${pkgname}-${version} rmdir ${DESTDIR}/usr/docs } + +db-devel_package() { + depends="libdb>=${version} libdb-cxx>=${version}" + short_desc+=" -- development files" + pkg_install() { + vmove usr/include + } +} + +db-docs_package() { + short_desc+=" -- documentation files" + noarch=yes + pkg_install() { + vmove usr/share/doc + } +} + +db_package() { + pkg_install() { + vmove usr/bin + } +} + +libdb-cxx_package() { + short_desc+=" -- C++ shared libraries" + pkg_install() { + vmove "usr/lib/libdb_cxx*.so*" + } +} + +libdb_package() { + short_desc+=" -- C shared libraries" + replaces="db<4.8.26" + pkg_install() { + vmove "usr/lib/libdb.so*" + vmove "usr/lib/libdb-*.so*" + } +}