Split pkgs required by xbps-base-chroot, as it was made in Fedora.

- Added an additional shell func to add full (build/run), build
  or run time dependencies to packages. An optional third parameter
  can be used to specify other version than the one set in
  the depends file.
- Use a "depends" file in package directory to specify minimum
  required ABI/API version for a package, so that there's no need
  to set the version all the time in pkgs.
- Updated bash to 4.0.

--HG--
extra : convert_revision : 1aa0ce32d4bdc2cd371eac19ae7bcff2c986b6b3

shutils/binpkg.sh

@@ -56,6 +56,7 @@ xbps_write_metadata_pkg()
 		if [ ! -f $XBPS_TEMPLATESDIR/${sourcepkg}/${subpkg}.template ]; then
 			msg_error "Cannot find subpackage template!"
 		fi
+		unset run_depends
 		. $XBPS_TEMPLATESDIR/${sourcepkg}/${subpkg}.template
 		pkgname=${sourcepkg}-${subpkg}
 		xbps_write_metadata_pkg_real
@@ -65,13 +66,11 @@ xbps_write_metadata_pkg()
 
 	[ -n "${subpackages}" ] && [ "$pkg" != "${sourcepkg}" ] && return $?
 
-	if [ -n "${subpackages}" ]; then
+	if [ -z "${run_depends}" ]; then
-		run_template ${sourcepkg}
-		unset run_depends
-	fi
 		for subpkg in ${subpackages}; do
 			run_depends="$run_depends ${sourcepkg}-${subpkg}-${version}"
 		done
+	fi
 	xbps_write_metadata_pkg_real
 }
 

shutils/pkgtarget_funcs.sh

@@ -23,6 +23,8 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #-
 
+. ${XBPS_SHUTILSDIR}/tmpl_funcs.sh
+
 #
 # Installs a pkg by reading its build template file.
 #

shutils/tmpl_funcs.sh

@@ -69,6 +69,7 @@ reset_tmpl_vars()
 			disable_parallel_build run_depends cross_compiler \
 			only_for_archs patch_args conf_files keep_dirs \
 			install_priority noarch subpackages sourcepkg \
+			abi_depends api_depends \
 			XBPS_EXTRACT_DONE XBPS_CONFIGURE_DONE \
 			XBPS_BUILD_DONE XBPS_INSTALL_DONE"
 
@@ -104,6 +105,46 @@ setup_tmpl()
 
 }
 
+Add_dependency()
+{
+	local type="$1"
+	local pkgname="$2"
+	local minver="$3"
+
+	case "$type" in
+		build|full|run) ;;
+		*) msg_error "Unknown dependency type for $pkgname." ;;
+	esac
+
+	if [ -f $XBPS_TEMPLATESDIR/$pkgname/$pkgname.depends ]; then
+		. $XBPS_TEMPLATESDIR/$pkgname/$pkgname.depends
+	elif [ -f $XBPS_TEMPLATESDIR/$pkgname/depends ]; then
+		. $XBPS_TEMPLATESDIR/$pkgname/depends
+	fi
+
+	if [ "$type" = "full" -o "$type" = "build" ]; then
+		if [ -z "$minver" -a -z "$api_depends" ]; then
+			build_depends="${build_depends} $pkgname-0"
+		elif [ -z "$minver" -a -n "$api_depends" ]; then
+			build_depends="${build_depends} $pkgname-$api_depends"
+		else
+			build_depends="${build_depends} $pkgname-$minver"
+		fi
+	fi
+
+	if [ "$type" = "full" -o "$type" = "run" ]; then
+		if [ -z "$minver" -a -z "$abi_depends" ]; then
+			run_depends="${run_depends} $pkgname-0"
+		elif [ -z "$minver" -a -n "$abi_depends" ]; then
+			run_depends="${run_depends} $pkgname-$abi_depends"
+		else
+			run_depends="${run_depends} $pkgname-$minver"
+		fi
+	fi
+
+	unset abi_depends api_depends
+}
+
 #
 # Checks some vars used in templates and sets some of them required.
 #

templates/bash-base

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

templates/bash-locale

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

templates/bash/base.template

@@ -1,21 +0,0 @@
-# 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

@@ -1,17 +0,0 @@
-# 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,7 +1,6 @@
 # Template build file for 'bash'.
 pkgname=bash
-sourcepkg=bash
+version=4.0
-version=3.2.48
 distfiles="http://ftp.gnu.org/gnu/bash/bash-$version.tar.gz"
 build_style=gnu_configure
 configure_args="--without-bash-malloc --with-curses
@@ -9,7 +8,7 @@ configure_args="--without-bash-malloc --with-curses
  ac_cv_func_working_mktime=yes"
 short_desc="The GNU Bourne Again Shell"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=28e9dc561b48a6675dbb30b5875e066d74cfac6a4eb261755dd2d93a38d301c5
+checksum=9793d394f640a95030c77d5ac989724afe196921956db741bcaf141801c50518
 long_desc="
  Bash is an sh-compatible shell that incorporates useful features from
  the Korn shell (ksh) and C shell (csh). It is intended to conform to
@@ -23,5 +22,6 @@ long_desc="
  modification."
 
 base_chroot=yes
-build_depends="ncurses-5.6"
+
-subpackages="base locale"
+Add_dependency run	glibc
+Add_dependency full	ncurses

templates/binutils-dev

@@ -1 +0,0 @@
-binutils

templates/binutils-docs

@@ -1 +0,0 @@
-binutils

templates/binutils-locale

@@ -1 +0,0 @@
-binutils

templates/binutils/base.template

@@ -1,20 +0,0 @@
-# Template file for 'binutils-base'.
-#
-short_desc="${short_desc} (base files)"
-long_desc="${long_desc}
-
- This package contains the ${sourcepkg} base programs and 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/bin ${destdir}/usr
-	mv ${origdir}/usr/lib/libbfd-${version}.so ${destdir}/usr/lib
-	mv ${origdir}/usr/lib/libopcodes-${version}.so ${destdir}/usr/lib
-	mv ${origdir}/usr/lib/ldscripts ${destdir}/usr/lib
-}

templates/binutils/depends

@@ -0,0 +1,2 @@
+abi_depends=2.18
+api_depends=${abi_depends}

templates/binutils/devel.template

@@ -1,10 +1,11 @@
-# Template file for 'binutils-dev'.
+# Template file for 'binutils-devel'.
 #
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
-run_depends="binutils-base-2.19"
+
+Add_dependency run binutils
 
 do_install()
 {
@@ -19,4 +20,5 @@ do_install()
 			mv ${origdir}/usr/lib/${f}.so ${destdir}/usr/lib
 		fi
 	done
+	mv ${origdir}/usr/lib/ldscripts ${destdir}/usr/lib
 }

templates/binutils/docs.template

@@ -1,21 +0,0 @@
-# Template file for 'binutils-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}
-
-	# Move manpages and info files.
-	mkdir -p ${destdir}/usr/share
-	mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/share/man \
-		${destdir}/usr/share
-	mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/share/info \
-		${destdir}/usr/share
-}

templates/binutils/libs.depends

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

templates/binutils/locale.template

@@ -1,17 +0,0 @@
-# Template file for 'binutils-locales'.
-#
-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}
-
-	mkdir -p ${destdir}/usr/share
-	mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/share/locale \
-		${destdir}/usr/share
-}

templates/binutils/template

@@ -25,4 +25,6 @@ long_desc="
  and other tools."
 
 base_chroot=yes
-subpackages="base dev docs locale"
+subpackages="devel"
+
+Add_dependency run glibc

templates/bzip2-dev

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

templates/bzip2-docs

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

templates/bzip2-libs

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

templates/bzip2/base.template

@@ -1,17 +0,0 @@
-# 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/depends

@@ -0,0 +1,2 @@
+abi_depends=1.0.5
+api_depends=${abi_depends}

templates/bzip2/devel.template

@@ -1,10 +1,11 @@
-# Template file for 'bzip2-dev'.
+# Template file for 'bzip2-devel'.
 #
 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}"
+
+Add_dependency run bzip2
 
 do_install()
 {

templates/bzip2/docs.template

@@ -1,18 +0,0 @@
-# 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

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

templates/bzip2/libs.template

@@ -1,17 +0,0 @@
-# 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

@@ -25,4 +25,6 @@ long_desc="
  predecessor, bzip (.bz)."
 
 base_chroot=yes
-subpackages="base dev docs libs"
+subpackages="devel"
+
+Add_dependency run glibc

templates/coreutils-base

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

templates/coreutils-docs

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

templates/coreutils-locale

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

templates/coreutils/base.template

@@ -1,17 +0,0 @@
-# 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

@@ -1,20 +0,0 @@
-# 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

@@ -1,17 +0,0 @@
-# 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,6 +1,5 @@
 # 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
@@ -16,4 +15,5 @@ long_desc="
  which are expected to exist on every operating system."
 
 base_chroot=yes
-subpackages="base docs locale"
+
+Add_dependency run glibc

templates/dash/template

@@ -19,7 +19,7 @@ long_desc="
 base_package=yes
 base_chroot=yes
 
-. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+Add_dependency run glibc
 
 post_install()
 {

templates/diffutils-base

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

templates/diffutils-docs

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

templates/diffutils-locale

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

templates/diffutils/base.template

@@ -1,17 +0,0 @@
-# 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

@@ -1,19 +0,0 @@
-# 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

@@ -1,17 +0,0 @@
-# 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,6 +1,5 @@
 # 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
@@ -14,4 +13,5 @@ long_desc="
  These programs are usually used for creating patch files."
 
 base_chroot=yes
-subpackages="base docs locale"
+
+Add_dependency run glibc

templates/file-dev

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

templates/file-libs

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

templates/file/base.template

@@ -1,18 +0,0 @@
-# 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/depends

@@ -0,0 +1,2 @@
+abi_depends=4.90
+api_depends=${abi_depends}

templates/file/devel.template

@@ -1,10 +1,11 @@
-# Template file for 'file-dev'.
+# Template file for 'file-devel'.
 #
 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}"
+
+Add_dependency run file
 
 do_install()
 {

templates/file/libs.depends

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

templates/file/libs.template

@@ -1,21 +0,0 @@
-# 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

@@ -13,5 +13,7 @@ long_desc="
  a description if a match is found."
 
 base_chroot=yes
-build_depends="zlib-1.2.3"
+subpackages="devel"
-subpackages="base dev libs"
+
+Add_dependency run glibc
+Add_dependency full zlib

templates/findutils-base

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

templates/findutils-docs

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

templates/findutils-locale

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

templates/findutils/base.template

@@ -1,19 +0,0 @@
-# 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

@@ -1,19 +0,0 @@
-# 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

@@ -1,17 +0,0 @@
-# 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,6 +1,5 @@
 # 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
@@ -17,4 +16,5 @@ long_desc="
  locating capabilities to other commands."
 
 base_chroot=yes
-subpackages="base docs locale"
+
+Add_dependency run glibc

templates/gawk-base

@@ -1 +0,0 @@
-gawk

templates/gawk-locale

@@ -1 +0,0 @@
-gawk

templates/gawk/base.template

@@ -1,22 +0,0 @@
-# Template file for 'gawk-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/lib
-	mkdir -p ${destdir}/usr/share
-	mv ${origdir}/usr/bin ${destdir}/usr
-	mv ${origdir}/usr/libexec ${destdir}/usr
-	mv ${origdir}/usr/share/awk ${destdir}/usr/share
-	mv ${origdir}/usr/share/man ${destdir}/usr/share
-	mv ${origdir}/usr/share/info ${destdir}/usr/share
-}

templates/gawk/locale.template

@@ -1,17 +0,0 @@
-# Template file for 'gawk-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}
-
-	mkdir -p ${destdir}/usr/share
-	mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/share/locale \
-		${destdir}/usr/share
-}

templates/gawk/template

@@ -1,6 +1,5 @@
 # Template file for 'gawk'
 pkgname=gawk
-sourcepkg=gawk
 version=3.1.6
 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu_configure
@@ -12,4 +11,5 @@ long_desc="
  The GNU AWK utility, a pattern scanning and processing tool."
 
 base_chroot=yes
-subpackages="base locale"
+
+Add_dependency run glibc

templates/gcc-libmudflap-devel

@@ -0,0 +1 @@
+gcc

templates/gcc-libobjc

@@ -0,0 +1 @@
+gcc

templates/gcc-libobjc-devel

@@ -0,0 +1 @@
+gcc

templates/gcc-libstdc++

@@ -0,0 +1 @@
+gcc

templates/gcc-libstdc++-devel

@@ -0,0 +1 @@
+gcc

templates/gcc-objc

@@ -0,0 +1 @@
+gcc

templates/gcc-objc++

@@ -0,0 +1 @@
+gcc

templates/gcc/base.template

@@ -1,26 +0,0 @@
-# Template file for 'gcc-base'.
-#
-short_desc="${short_desc} (base files)"
-long_desc="${long_desc}
-
- This package contains the ${sourcepkg} base programs and libraries."
-
-run_depends="binutils-base-2.18"
-. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
-. ${XBPS_TEMPLATESDIR}/gmp/libs.depends
-. ${XBPS_TEMPLATESDIR}/mpfr/libs.depends
-
-do_install()
-{
-	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
-	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
-
-	mkdir -p ${destdir}/usr/lib/gcc/${xbps_machine}-pc-linux-gnu
-	mv ${origdir}/usr/bin ${destdir}/usr
-	mv ${origdir}/usr/libexec ${destdir}/usr
-	mv ${origdir}/usr/lib/lib*.so.* ${destdir}/usr/lib
-	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/c++.template

@@ -0,0 +1,35 @@
+# Template file for 'gcc-c++'.
+#
+short_desc="GCC C++ support"
+long_desc="${long_desc}
+
+ This package contains GCC C++ support."
+
+Add_dependency run gcc
+Add_dependency run gcc-libstdc++
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+	local triplet=
+
+	if [ "${xbps_machine}" = "x86_64" ]; then
+		triplet="${xbps_machine}-unknown-linux-gnu"
+	else
+		triplet="${xbps_machine}-pc-linux-gnu"
+	fi
+
+	mkdir -p ${destdir}/usr/lib
+	mkdir -p ${destdir}/usr/bin
+	mkdir -p ${destdir}/usr/share/man/man1
+	mkdir -p ${destdir}/usr/libexec/gcc/${triplet}/${version}
+
+	for f in g++ c++ ${triplet}-g++ ${triplet}-c++; do
+		mv ${origdir}/usr/bin/${f} ${destdir}/usr/bin
+	done
+	mv ${origdir}/usr/libexec/gcc/${triplet}/${version}/cc1plus \
+		${destdir}/usr/libexec/gcc/${triplet}/${version}
+
+	mv ${origdir}/usr/share/man/man1/g++.1 ${destdir}/usr/share/man/man1
+}

templates/gcc/depends

@@ -0,0 +1,2 @@
+abi_depends=4.3.0
+api_depends=${abi_depends}

templates/gcc/dev.template

@@ -1,29 +0,0 @@
-# Template file for 'gcc-dev'.
-#
-short_desc="${short_desc} (development files)"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-run_depends="gcc-base-${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
-
-	for f in mudflap mudflapth ssp_nonshared supc++ ssp stdc++ \
-		 objc gomp gcc_s; do
-		for ext in a la; do
-			if [ -f ${origdir}/usr/lib/lib${f}.${ext} ]; then
-				mv ${origdir}/usr/lib/lib${f}.${ext} ${destdir}/usr/lib
-			fi
-		done
-		if [ -f ${origdir}/usr/lib/lib${f}.so ]; then
-			mv ${origdir}/usr/lib/lib${f}.so ${destdir}/usr/lib
-		fi
-	done
-}

templates/gcc/docs.template

@@ -1,21 +0,0 @@
-# Template file for 'gcc-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}
-
-	# Move manpages and info files.
-	mkdir -p ${destdir}/usr/share
-	mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/share/man \
-		${destdir}/usr/share
-	mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/share/info \
-		${destdir}/usr/share
-}

templates/gcc/libgcc.template

@@ -0,0 +1,15 @@
+# Template file for 'gcc-libgcc'.
+#
+short_desc="GCC version ${version} shared library support"
+long_desc="${long_desc}
+
+ This package contains the GCC shared library."
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/lib
+	mv ${origdir}/usr/lib/libgcc_s.so* ${destdir}/usr/lib
+}

templates/gcc/libgomp.template

@@ -0,0 +1,22 @@
+# Template file for 'gcc-libgomp'.
+#
+short_desc="GCC OpenMP v3.0 shared support library"
+long_desc="${long_desc}
+
+ This package contains GCC shared support library which is needed
+ for OpenMP v3.0 support."
+
+Add_dependency run glibc
+Add_dependency run gcc-libgcc
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/lib
+	mkdir -p ${destdir}/usr/share
+
+	mv ${origdir}/usr/lib/libgomp.* ${destdir}/usr/lib
+	mv ${origdir}/usr/share/info ${destdir}/usr/share
+}

templates/gcc/libmudflap-devel.template

@@ -0,0 +1,19 @@
+# Template file for 'gcc-libmudflap-devel'.
+#
+short_desc="GCC mudflap shared support library (development files)"
+long_desc="${long_desc}
+
+ This package contains GCC mudflap headers and static libraries for
+ building mudflap-instrumented programs."
+
+Add_dependency run gcc-libmudflap
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/lib
+	mv ${origdir}/usr/lib/libmudflap*.*a ${destdir}/usr/lib
+	mv ${origdir}/usr/lib/libmudflap*.so ${destdir}/usr/lib
+}

templates/gcc/libmudflap.template

@@ -0,0 +1,19 @@
+# Template file for 'gcc-libmudflap'.
+#
+short_desc="GCC mudflap shared support library"
+long_desc="${long_desc}
+
+ This package contains GCC shared support library which is needed
+ for mudflap support."
+
+Add_dependency run glibc
+Add_dependency run gcc-libgcc
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/lib
+	mv ${origdir}/usr/lib/libmudflap*.so.* ${destdir}/usr/lib
+}

templates/gcc/libobjc-devel.template

@@ -0,0 +1,19 @@
+# Template file for 'gcc-libobjc-devel'.
+#
+short_desc="GCC Objective-C shared library support (development files)"
+long_desc="${long_desc}
+
+ This package contains GCC Objective-C headers and static libs, to
+ build Objective-C programs."
+
+Add_dependency run gcc-libobjc
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/lib
+	mv ${origdir}/usr/lib/libobjc.*a ${destdir}/usr/lib
+	mv ${origdir}/usr/lib/libobjc.so ${destdir}/usr/lib
+}

templates/gcc/libobjc.template

@@ -0,0 +1,19 @@
+# Template file for 'gcc-libobjc'.
+#
+short_desc="GCC Objective-C shared library support"
+long_desc="${long_desc}
+
+ This package contains GCC Objective-C shared support library which is needed
+ to run Objective-C dynamically linked programs."
+
+Add_dependency run glibc
+Add_dependency run gcc-libgcc
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/lib
+	mv ${origdir}/usr/lib/libobjc.so.* ${destdir}/usr/lib
+}

templates/gcc/libs.depends

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

templates/gcc/libstdc++-devel.template

@@ -0,0 +1,23 @@
+# Template file for 'gcc-libstdc++-devel'.
+#
+short_desc="GCC Standard C++ Library (development files)"
+long_desc="${long_desc}
+
+ This package contains GCC Header files and libraries for
+ C++ development."
+
+Add_dependency run gcc-libstdc++
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/lib
+	mkdir -p ${destdir}/usr/include
+
+	mv ${origdir}/usr/lib/libstdc++.*a ${destdir}/usr/lib
+	mv ${origdir}/usr/lib/libstdc++.so ${destdir}/usr/lib
+	mv ${origdir}/usr/lib/libsupc++.* ${destdir}/usr/lib
+	mv ${origdir}/usr/include/c++ ${destdir}/usr/include
+}

templates/gcc/libstdc++.template

@@ -0,0 +1,26 @@
+# Template file for 'gcc-libstdc++'.
+#
+short_desc="GCC Standard C++ Library"
+long_desc="${long_desc}
+
+ This package contains a rewritten standard compliant GCC Standard
+ C++ library."
+
+Add_dependency run glibc
+Add_dependency run gcc-libgcc
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/lib
+	mkdir -p ${destdir}/usr/share/locale/fr/LC_MESSAGES
+	mkdir -p ${destdir}/usr/share/locale/de/LC_MESSAGES
+
+	mv ${origdir}/usr/lib/libstdc++.so.* ${destdir}/usr/lib
+	mv ${origdir}/usr/share/locale/fr/LC_MESSAGES/libstdc++.mo \
+		${destdir}/usr/share/locale/fr/LC_MESSAGES
+	mv ${origdir}/usr/share/locale/de/LC_MESSAGES/libstdc++.mo \
+		${destdir}/usr/share/locale/de/LC_MESSAGES
+}

templates/gcc/locale.template

@@ -1,17 +0,0 @@
-# Template file for 'gcc-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}
-
-	mkdir -p ${destdir}/usr/share
-	mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/share/locale \
-		${destdir}/usr/share
-}

templates/gcc/objc++.template

@@ -0,0 +1,28 @@
+# Template file for 'gcc-objc++'.
+#
+short_desc="GCC Objective-C++ support"
+long_desc="${long_desc}
+
+ This package contains GCC Objective-C++ support."
+
+Add_dependency run gmp
+Add_dependency run mpfr
+Add_dependency run gcc-c++
+Add_dependency run gcc-objc
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+	local triplet=
+
+	if [ "${xbps_machine}" = "x86_64" ]; then
+		triplet="${xbps_machine}-unknown-linux-gnu"
+	else
+		triplet="${xbps_machine}-pc-linux-gnu"
+	fi
+
+	mkdir -p ${destdir}/usr/libexec/gcc/${triplet}/${version}
+	mv ${origdir}/usr/libexec/gcc/${triplet}/${version}/cc1objplus \
+		${destdir}/usr/libexec/gcc/${triplet}/${version}
+}

templates/gcc/objc.template

@@ -0,0 +1,32 @@
+# Template file for 'gcc-objc'.
+#
+short_desc="GCC Objective-C support"
+long_desc="${long_desc}
+
+ This package contains GCC Objective-C support."
+
+Add_dependency run gmp
+Add_dependency run mpfr
+Add_dependency run gcc
+Add_dependency run gcc-libobjc
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+	local triplet=
+
+	if [ "${xbps_machine}" = "x86_64" ]; then
+		triplet="${xbps_machine}-unknown-linux-gnu"
+	else
+		triplet="${xbps_machine}-pc-linux-gnu"
+	fi
+
+	mkdir -p ${destdir}//usr/lib/gcc/${triplet}/${version}
+	mkdir -p ${destdir}/usr/libexec/gcc/${triplet}/${version}/include
+
+	mv ${origdir}/usr/lib/gcc/${triplet}/${version}/include/objc \
+		${destdir}/usr/lib/gcc/${triplet}/${version}/include
+	mv ${origdir}/usr/libexec/gcc/${triplet}/${version}/cc1obj \
+		${destdir}/usr/libexec/gcc/${triplet}/${version}
+}

templates/gcc/template

@@ -19,8 +19,16 @@ long_desc="
  The GNU C Compiler suite, with support for C, C++, Fortran, ObjC."
 
 base_chroot=yes
-build_depends="gmp-4.2.4 mpfr-2.3.2 binutils-2.18"
+subpackages="libgcc libstdc++ libstdc++-devel libgomp libmudflap"
-subpackages="base dev docs locale"
+subpackages="${subpackages} libmudflap-devel libobjc libobjc-devel"
+subpackages="${subpackages} c++ objc objc++"
+
+Add_dependency full	gmp
+Add_dependency full	mpfr
+Add_dependency full	binutils
+Add_dependency run	gcc-libgcc
+Add_dependency run	gcc-libgomp
+Add_dependency run	glibc-devel
 
 # As specified in the LFS book, disable installing libiberty.
 pre_configure()
@@ -28,8 +36,9 @@ pre_configure()
 	sed -i 's/install_to_$(INSTALL_DEST) //' $wrksrc/libiberty/Makefile.in
 }
 
-# Make /usr/bin/gcc -> /usr/bin/cc symlink.
 post_install()
 {
-	cd $XBPS_DESTDIR/$pkgname-$version/usr/bin && ln -s gcc cc
+	local destdir=$XBPS_DESTDIR/$pkgname-$version
+
+	cd $destdir/usr/bin && ln -s gcc cc
 }

templates/glibc-libs

@@ -1 +0,0 @@
-glibc

templates/glibc-locale

@@ -1 +0,0 @@
-glibc

templates/glibc/base.template

@@ -1,25 +0,0 @@
-# Template file for 'glibc-base'.
-#
-short_desc="${short_desc} (base files)"
-long_desc="${long_desc}
-
- This package contains the ${sourcepkg} base programs and libraries."
-
-conf_files="/etc/localtime /etc/ld.so.cache /etc/ld.so.conf /etc/rpc
- /etc/nsswitch.conf"
-
-. ${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}/etc ${destdir}
-	mv ${origdir}/sbin ${destdir}
-	mv ${origdir}/usr/bin ${destdir}/usr
-	mv ${origdir}/usr/sbin ${destdir}/usr
-	mv ${origdir}/usr/lib/getconf ${destdir}/usr/lib
-	mv ${origdir}/usr/lib/pt_chown ${destdir}/usr/lib
-}