Convert all xbps-base-chroot pkgs to subpkgs.

Also introduce "libs.depends", that adds a rundep of a package
with a proper version. This is to avoid modifying all dependent
packages if there's an API/ABI change.

--HG--
extra : convert_revision : a46b11b8e9187bdb2bfc954ad5ff40ecd9c0fe31

templates/bash-base

@@ -0,0 +1 @@
+bash

templates/bash-locale

@@ -0,0 +1 @@
+bash

templates/bash/base.template

@@ -0,0 +1,21 @@
+# Template file for 'bash-base'.
+#
+short_desc="${short_desc} (base files)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} base files."
+
+# Run dependencies.
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+. ${XBPS_TEMPLATESDIR}/ncurses/libs.depends
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/bin ${destdir}
+	mv ${origdir}/usr/share/info ${destdir}/usr/share
+	mv ${origdir}/usr/share/man ${destdir}/usr/share
+}

templates/bash/locale.template

@@ -0,0 +1,17 @@
+# Template file for 'bash-locale'.
+#
+short_desc="${short_desc} (locales)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} locale files, for non US users."
+run_depends=
+noarch=yes
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/locale ${destdir}/usr/share
+}

templates/bash/template

@@ -1,5 +1,6 @@
 # Template build file for 'bash'.
 pkgname=bash
+sourcepkg=bash
 version=3.2.48
 distfiles="http://ftp.gnu.org/gnu/bash/bash-$version.tar.gz"
 build_style=gnu_configure
@@ -22,4 +23,5 @@ long_desc="
  modification."
 
 base_chroot=yes
-run_depends="glibc-2.8 ncurses-5.6"
+build_depends="ncurses-5.6"
+subpackages="base locale"

templates/binutils/base.template

@@ -4,7 +4,8 @@ short_desc="${short_desc} (base files)"
 long_desc="${long_desc}
 
  This package contains the ${sourcepkg} base programs and libraries."
-run_depends="glibc-libs-2.8"
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
 
 do_install()
 {

templates/binutils/dev.template

@@ -4,7 +4,7 @@ short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
-run_depends="binutils-2.19"
+run_depends="binutils-base-2.19"
 
 do_install()
 {

templates/binutils/libs.depends

@@ -0,0 +1 @@
+run_depends="${run_depends} binutils-base-2.8"

templates/bzip2-base

@@ -0,0 +1 @@
+bzip2

templates/bzip2-dev

@@ -0,0 +1 @@
+bzip2

templates/bzip2-docs

@@ -0,0 +1 @@
+bzip2

templates/bzip2-libs

@@ -0,0 +1 @@
+bzip2

templates/bzip2/base.template

@@ -0,0 +1,17 @@
+# Template file for 'bzip2-base'.
+#
+short_desc="${short_desc} (base files)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} base files."
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr
+	mv ${origdir}/usr/bin ${destdir}/usr
+}

templates/bzip2/dev.template

@@ -0,0 +1,17 @@
+# Template file for 'bzip2-dev'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+run_depends="bzip2-libs-${version}"
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/lib
+	mv ${origdir}/usr/include ${destdir}/usr
+	mv ${origdir}/usr/lib/libbz2.*a ${destdir}/usr/lib
+}

templates/bzip2/docs.template

@@ -0,0 +1,18 @@
+# Template file for 'bzip2-docs'.
+#
+short_desc="${short_desc} (documentation)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} documentation: manual pages
+ and info files."
+run_depends=
+noarch=yes
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/man ${destdir}/usr/share
+}

templates/bzip2/libs.depends

@@ -0,0 +1 @@
+run_depends="${run_depends} bzip2-libs-1.0.5"

templates/bzip2/libs.template

@@ -0,0 +1,17 @@
+# Template file for 'bzip2-libs'.
+#
+short_desc="${short_desc} (libraries)"
+long_desc="${long_desc}
+
+ This package contains only the ${sourcepkg} shared libraries."
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/lib
+	mv ${origdir}/usr/lib/libbz2.so* ${destdir}/usr/lib
+}

templates/bzip2/template

@@ -1,5 +1,6 @@
 # Template build file for 'bzip2'.
 pkgname=bzip2
+sourcepkg=bzip2
 version=1.0.5
 distfiles="http://www.bzip.org/1.0.5/$pkgname-$version.tar.gz"
 build_style=gnu_makefile
@@ -24,4 +25,4 @@ long_desc="
  predecessor, bzip (.bz)."
 
 base_chroot=yes
-run_depends="glibc-2.8"
+subpackages="base dev docs libs"

templates/coreutils-base

@@ -0,0 +1 @@
+coreutils

templates/coreutils-docs

@@ -0,0 +1 @@
+coreutils

templates/coreutils-locale

@@ -0,0 +1 @@
+coreutils

templates/coreutils/base.template

@@ -0,0 +1,17 @@
+# Template file for 'coreutils-base'.
+#
+short_desc="${short_desc} (base files)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} base files."
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}
+	mv ${origdir}/bin ${destdir}
+}

templates/coreutils/docs.template

@@ -0,0 +1,20 @@
+# Template file for 'coreutils-docs'.
+#
+short_desc="${short_desc} (documentation)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} documentation: manual pages
+ and info files."
+run_depends=
+noarch=yes
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	# Move manpages and info files.
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/man ${destdir}/usr/share
+	mv ${origdir}/usr/share/info ${destdir}/usr/share
+}

templates/coreutils/locale.template

@@ -0,0 +1,17 @@
+# Template file for 'coreutils-locale'.
+#
+short_desc="${short_desc} (locales)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} locale files, for non US users."
+run_depends=
+noarch=yes
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/locale ${destdir}/usr/share
+}

templates/coreutils/template

@@ -1,5 +1,6 @@
 # Template file for 'coreutils'
 pkgname=coreutils
+sourcepkg=coreutils
 version=6.12
 distfiles="http://ftp.gnu.org/gnu/coreutils/$pkgname-$version.tar.gz"
 build_style=gnu_configure
@@ -15,4 +16,4 @@ long_desc="
  which are expected to exist on every operating system."
 
 base_chroot=yes
-run_depends="glibc-2.8"
+subpackages="base docs locale"

templates/dash/template

@@ -18,7 +18,8 @@ long_desc="
 
 base_package=yes
 base_chroot=yes
-run_depends="glibc-2.8"
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
 
 post_install()
 {

templates/diffutils-base

@@ -0,0 +1 @@
+diffutils

templates/diffutils-docs

@@ -0,0 +1 @@
+diffutils

templates/diffutils-locale

@@ -0,0 +1 @@
+diffutils

templates/diffutils/base.template

@@ -0,0 +1,17 @@
+# Template file for 'diffutils-base'.
+#
+short_desc="${short_desc} (base files)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} base files."
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr
+	mv ${origdir}/usr/bin ${destdir}/usr
+}

templates/diffutils/docs.template

@@ -0,0 +1,19 @@
+# Template file for 'diffutils-docs'.
+#
+short_desc="${short_desc} (documentation)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} documentation: manual pages
+ and info files."
+run_depends=
+noarch=yes
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/info ${destdir}/usr/share
+	mv ${origdir}/usr/share/man ${destdir}/usr/share
+}

templates/diffutils/locale.template

@@ -0,0 +1,17 @@
+# Template file for 'diffutils-locale'.
+#
+short_desc="${short_desc} (locales)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} locale files, for non US users."
+run_depends=
+noarch=yes
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/locale ${destdir}/usr/share
+}

templates/diffutils/template

@@ -1,5 +1,6 @@
 # Template file for 'diffutils'
 pkgname=diffutils
+sourcepkg=diffutils
 version=2.8.1
 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu_configure
@@ -13,4 +14,4 @@ long_desc="
  These programs are usually used for creating patch files."
 
 base_chroot=yes
-run_depends="glibc-2.8"
+subpackages="base docs locale"

templates/file-base

@@ -0,0 +1 @@
+file

templates/file-dev

@@ -0,0 +1 @@
+file

templates/file-libs

@@ -0,0 +1 @@
+file

templates/file/base.template

@@ -0,0 +1,18 @@
+# Template file for 'file-base'.
+#
+short_desc="${short_desc} (base files)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} base files."
+run_depends="file-libs-${version}"
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share/man/man1
+	mv ${origdir}/usr/bin ${destdir}/usr
+	mv ${origdir}/usr/share/file ${destdir}/usr/share
+	mv ${origdir}/usr/share/man/man1 ${destdir}/usr/share/man
+}

templates/file/dev.template

@@ -0,0 +1,17 @@
+# Template file for 'file-dev'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+run_depends="file-libs-${version}"
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/lib
+	mv ${origdir}/usr/include ${destdir}/usr
+	mv ${origdir}/usr/lib/libmagic.*a ${destdir}/usr/lib
+}

templates/file/libs.depends

@@ -0,0 +1 @@
+run_depends="${run_depends} file-libs-5.00"

templates/file/libs.template

@@ -0,0 +1,21 @@
+# Template file for 'file-libs'.
+#
+short_desc="${short_desc} (libraries)"
+long_desc="${long_desc}
+
+ This package contains only the ${sourcepkg} shared libraries."
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+. ${XBPS_TEMPLATESDIR}/zlib/libs.depends
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/lib
+	mkdir -p ${destdir}/usr/share/man
+	mv ${origdir}/usr/lib/libmagic.so* ${destdir}/usr/lib
+	mv ${origdir}/usr/share/man/man3 ${destdir}/usr/share/man
+	mv ${origdir}/usr/share/man/man4 ${destdir}/usr/share/man
+}

templates/file/template

@@ -1,5 +1,6 @@
 # Template file for 'file'
 pkgname=file
+sourcepkg=file
 version=5.00
 distfiles="ftp://ftp.astron.com/pub/file/$pkgname-$version.tar.gz"
 build_style=gnu_configure
@@ -13,4 +14,4 @@ long_desc="
 
 base_chroot=yes
 build_depends="zlib-1.2.3"
-run_depends="glibc-2.8 zlib-1.2.3"
+subpackages="base dev libs"

templates/findutils-base

@@ -0,0 +1 @@
+findutils

templates/findutils-docs

@@ -0,0 +1 @@
+findutils

templates/findutils-locale

@@ -0,0 +1 @@
+findutils

templates/findutils/base.template

@@ -0,0 +1,19 @@
+# Template file for 'findutils-base'.
+#
+short_desc="${short_desc} (base files)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} base files."
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr
+	mv ${origdir}/usr/bin ${destdir}/usr
+	mv ${origdir}/usr/libexec ${destdir}/usr
+	mv ${origdir}/var ${destdir}
+}

templates/findutils/docs.template

@@ -0,0 +1,19 @@
+# Template file for 'findutils-docs'.
+#
+short_desc="${short_desc} (documentation)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} documentation: manual pages
+ and info files."
+run_depends=
+noarch=yes
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/info ${destdir}/usr/share
+	mv ${origdir}/usr/share/man ${destdir}/usr/share
+}

templates/findutils/locale.template

@@ -0,0 +1,17 @@
+# Template file for 'findutils-locale'.
+#
+short_desc="${short_desc} (locales)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} locale files, for non US users."
+run_depends=
+noarch=yes
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/locale ${destdir}/usr/share
+}

templates/findutils/template

@@ -1,5 +1,6 @@
 # Template file for 'findutils'
 pkgname=findutils
+sourcepkg=findutils
 version=4.4.0
 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu_configure
@@ -16,4 +17,4 @@ long_desc="
  locating capabilities to other commands."
 
 base_chroot=yes
-run_depends="glibc-2.8"
+subpackages="base docs locale"

templates/gawk/base.template

@@ -4,7 +4,8 @@ short_desc="${short_desc} (base files)"
 long_desc="${long_desc}
 
  This package contains the ${sourcepkg} base files."
-run_depends="glibc-libs-2.8"
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
 
 do_install()
 {

templates/gcc/base.template

@@ -4,7 +4,11 @@ short_desc="${short_desc} (base files)"
 long_desc="${long_desc}
 
  This package contains the ${sourcepkg} base programs and libraries."
-run_depends="glibc-libs-2.8 gmp-libs-4.2.4 mpfr-libs-2.3.2 binutils-2.18"
+
+run_depends="binutils-base-2.18"
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+. ${XBPS_TEMPLATESDIR}/gmp/libs.depends
+. ${XBPS_TEMPLATESDIR}/mpfr/libs.depends
 
 do_install()
 {
@@ -18,4 +22,5 @@ do_install()
 	mv ${origdir}/usr/lib/lib*.spec ${destdir}/usr/lib
 	mv ${origdir}/usr/lib/gcc/${xbps_machine}-pc-linux-gnu/${version} \
 		${destdir}/usr/lib/gcc/${xbps_machine}-pc-linux-gnu
+	cd ${destdir}/usr/lib && ln -s libgcc_s.so.1 libgcc_s.so
 }

templates/gcc/libs.depends

@@ -0,0 +1 @@
+run_depends="${run_depends} gcc-base-4.3.2"

templates/glibc/base.template

@@ -7,7 +7,8 @@ long_desc="${long_desc}
 
 conf_files="/etc/localtime /etc/ld.so.cache /etc/ld.so.conf /etc/rpc
  /etc/nsswitch.conf"
-run_depends="glibc-libs-${version}"
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
 
 do_install()
 {

templates/glibc/dev.template

@@ -4,7 +4,8 @@ short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
-run_depends="glibc-libs-${version}"
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
 
 do_install()
 {

templates/glibc/libs.depends

@@ -0,0 +1 @@
+run_depends="${run_depends} glibc-libs-2.8"

templates/gmp/libs.depends

@@ -0,0 +1 @@
+run_depends="${run_depends} gmp-libs-4.2.4"

templates/gmp/libs.template

@@ -4,7 +4,8 @@ short_desc="${short_desc} (libraries)"
 long_desc="${long_desc}
 
  This package contains only the ${sourcepkg} shared libraries."
-run_depends="glibc-libs-2.8"
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
 
 do_install()
 {

templates/grep-base

@@ -0,0 +1 @@
+grep

templates/grep-docs

@@ -0,0 +1 @@
+grep

templates/grep-locale

@@ -0,0 +1 @@
+grep

templates/grep/base.template

@@ -0,0 +1,17 @@
+# Template file for 'grep-base'.
+#
+short_desc="${short_desc} (base files)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} base files."
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}
+	mv ${origdir}/bin ${destdir}
+}

templates/grep/docs.template

@@ -0,0 +1,19 @@
+# Template file for 'grep-docs'.
+#
+short_desc="${short_desc} (documentation)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} documentation: manual pages
+ and info files."
+run_depends=
+noarch=yes
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/info ${destdir}/usr/share
+	mv ${origdir}/usr/share/man ${destdir}/usr/share
+}

templates/grep/locale.template

@@ -0,0 +1,17 @@
+# Template file for 'grep-locale'.
+#
+short_desc="${short_desc} (locales)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} locale files, for non US users."
+run_depends=
+noarch=yes
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/locale ${destdir}/usr/share
+}

templates/grep/template

@@ -1,5 +1,6 @@
 # Template build file for 'grep'.
 pkgname=grep
+sourcepkg=grep
 version=2.5.4
 distfiles="http://ftp.gnu.org/gnu/grep/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
@@ -17,4 +18,4 @@ long_desc="
 
 base_chroot=yes
 build_depends="texinfo-4.13a"
-run_depends="glibc-2.8"
+subpackages="base docs locale"

templates/gzip-base

@@ -0,0 +1 @@
+gzip

templates/gzip-docs

@@ -0,0 +1 @@
+gzip

templates/gzip/base.template

@@ -0,0 +1,17 @@
+# Template file for 'gzip-base'.
+#
+short_desc="${short_desc} (base files)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} base files."
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr
+	mv ${origdir}/usr/bin ${destdir}/usr
+}

templates/gzip/docs.template

@@ -0,0 +1,20 @@
+# Template file for 'gzip-docs'.
+#
+short_desc="${short_desc} (documentation)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} documentation: manual pages
+ and info files."
+run_depends=
+noarch=yes
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	# Move manpages and info files.
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/man ${destdir}/usr/share
+	mv ${origdir}/usr/share/info ${destdir}/usr/share
+}

templates/gzip/template

@@ -1,5 +1,6 @@
 # Template file for 'gzip'
 pkgname=gzip
+sourcepkg=gzip
 version=1.3.12
 distfiles="http://ftp.gnu.org/gnu/gzip/$pkgname-$version.tar.gz"
 build_style=gnu_configure
@@ -13,4 +14,4 @@ long_desc="
  standard compression program for its system."
 
 base_chroot=yes
-run_depends="glibc-2.8"
+subpackages="base docs"

templates/libarchive-base

@@ -0,0 +1 @@
+libarchive

templates/libarchive-dev

@@ -0,0 +1 @@
+libarchive

templates/libarchive-docs

@@ -0,0 +1 @@
+libarchive

templates/libarchive-libs

@@ -0,0 +1 @@
+libarchive

templates/libarchive/base.template

@@ -0,0 +1,17 @@
+# Template file for 'libarchive-base'.
+#
+short_desc="${short_desc} (base files)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} base files."
+
+. ${XBPS_TEMPLATESDIR}/libarchive/libs.depends
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr
+	mv ${origdir}/usr/bin ${destdir}/usr
+}

templates/libarchive/dev.template

@@ -0,0 +1,18 @@
+# Template file for 'libarchive-dev'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+. ${XBPS_TEMPLATESDIR}/libarchive/libs.depends
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/lib
+	mv ${origdir}/usr/include ${destdir}/usr
+	mv ${origdir}/usr/lib/libarchive.*a ${destdir}/usr/lib
+}

templates/libarchive/docs.template

@@ -0,0 +1,18 @@
+# Template file for 'libarchive-docs'.
+#
+short_desc="${short_desc} (documentation)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} documentation: manual pages
+ and info files."
+run_depends=
+noarch=yes
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/man ${destdir}/usr/share
+}

templates/libarchive/libs.depends

@@ -0,0 +1 @@
+run_depends="${run_depends} libarchive-libs-2.6.1"

templates/libarchive/libs.template

@@ -0,0 +1,20 @@
+# Template file for 'libarchive-libs'.
+#
+short_desc="${short_desc} (libraries)"
+long_desc="${long_desc}
+
+ This package contains only the ${sourcepkg} shared libraries."
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+. ${XBPS_TEMPLATESDIR}/zlib/libs.depends
+. ${XBPS_TEMPLATESDIR}/bzip2/libs.depends
+. ${XBPS_TEMPLATESDIR}/lzma-utils/libs.depends
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/lib
+	mv ${origdir}/usr/lib/libarchive.so* ${destdir}/usr/lib
+}

templates/libarchive/template

@@ -1,10 +1,9 @@
 # Template file for 'libarchive'
 pkgname=libarchive
+sourcepkg=libarchive
 version=2.6.1
 distfiles="http://libarchive.googlecode.com/files/$pkgname-$version.tar.gz"
 build_style=gnu_configure
-configure_args=" --disable-bsdcpio --disable-bsdtar --disable-xattr
- --disable-acl"
 short_desc="Library to read/write tar, cpio, pax, zip, iso9660, etc."
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=4d0ad4e5c33aa9725c7d92a42ae605815781372db949cd9906945e6c0d85c179
@@ -16,4 +15,4 @@ long_desc="
 
 base_chroot=yes 
 build_depends="gzip-1.3.12 bzip2-1.0.5 zlib-1.2.3 lzma-utils-4.32.7"
-run_depends="glibc-2.8 $build_depends"
+subpackages="base dev docs libs"

templates/lzma-utils-base

@@ -0,0 +1 @@
+lzma-utils

templates/lzma-utils-dev

@@ -0,0 +1 @@
+lzma-utils

templates/lzma-utils-docs

@@ -0,0 +1 @@
+lzma-utils

templates/lzma-utils-libs

@@ -0,0 +1 @@
+lzma-utils

templates/lzma-utils/base.template

@@ -0,0 +1,17 @@
+# Template file for 'lzma-utils-base'.
+#
+short_desc="${short_desc} (base files)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} base files."
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr
+	mv ${origdir}/usr/bin ${destdir}/usr
+}

templates/lzma-utils/dev.template

@@ -0,0 +1,17 @@
+# Template file for 'lzma-utils-dev'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+run_depends="lzma-utils-libs-${version}"
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/lib
+	mv ${origdir}/usr/include ${destdir}/usr
+	mv ${origdir}/usr/lib/liblzmadec.*a ${destdir}/usr/lib
+}

templates/lzma-utils/docs.template

@@ -0,0 +1,18 @@
+# Template file for 'lzma-utils-docs'.
+#
+short_desc="${short_desc} (documentation)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} documentation: manual pages
+ and info files."
+run_depends=
+noarch=yes
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/man ${destdir}/usr/share
+}

templates/lzma-utils/libs.depends

@@ -0,0 +1 @@
+run_depends="${run_depends} lzma-utils-libs-4.32.7"

templates/lzma-utils/libs.template

@@ -0,0 +1,17 @@
+# Template file for 'lzma-utils-libs'.
+#
+short_desc="${short_desc} (libraries)"
+long_desc="${long_desc}
+
+ This package contains only the ${sourcepkg} shared libraries."
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/lib
+	mv ${origdir}/usr/lib/liblzmadec.so* ${destdir}/usr/lib
+}

templates/lzma-utils/template

@@ -1,5 +1,6 @@
 # Template file for 'lzma-utils'
 pkgname=lzma-utils
+sourcepkg=lzma-utils
 version=4.32.7
 wrksrc="lzma-$version"
 distfiles="http://tukaani.org/lzma/lzma-$version.tar.gz"
@@ -13,4 +14,4 @@ long_desc="
  bzip2 utilities."
 
 base_chroot=yes
-run_depends="glibc-2.8"
+subpackages="base dev docs libs"

templates/make-base

@@ -0,0 +1 @@
+make

templates/make-docs

@@ -0,0 +1 @@
+make

templates/make-locale

@@ -0,0 +1 @@
+make

templates/make/base.template

@@ -0,0 +1,17 @@
+# Template file for 'make-base'.
+#
+short_desc="${short_desc} (base files)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} base files."
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr
+	mv ${origdir}/usr/bin ${destdir}/usr
+}

templates/make/docs.template

@@ -0,0 +1,19 @@
+# Template file for 'make-docs'.
+#
+short_desc="${short_desc} (documentation)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} documentation: manual pages
+ and info files."
+run_depends=
+noarch=yes
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/info ${destdir}/usr/share
+	mv ${origdir}/usr/share/man ${destdir}/usr/share
+}

templates/make/locale.template

@@ -0,0 +1,17 @@
+# Template file for 'make-locale'.
+#
+short_desc="${short_desc} (locales)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} locale files, for non US users."
+run_depends=
+noarch=yes
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/locale ${destdir}/usr/share
+}

templates/make/template

@@ -1,5 +1,6 @@
 # Template build file for 'make'
 pkgname=make
+sourcepkg=make
 version=3.81
 distfiles="http://ftp.gnu.org/pub/gnu/make/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
@@ -12,4 +13,4 @@ long_desc="
  recompile them, when necessary."
 
 base_chroot=yes
-run_depends="glibc-2.8"
+subpackages="base docs locale"

templates/mpfr/libs.depends

@@ -0,0 +1 @@
+run_depends="${run_depends} mpfr-libs-4.2.4"

templates/mpfr/libs.template

@@ -4,7 +4,9 @@ short_desc="${short_desc} (libraries)"
 long_desc="${long_desc}
 
  This package contains only the ${sourcepkg} shared libraries."
-run_depends="glibc-libs-2.8 gmp-libs-4.2.4"
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+. ${XBPS_TEMPLATESDIR}/gmp/libs.depends
 
 do_install()
 {

templates/ncurses-base

@@ -0,0 +1 @@
+ncurses

templates/ncurses-dev

@@ -0,0 +1 @@
+ncurses

templates/ncurses-docs

@@ -0,0 +1 @@
+ncurses