Merge branch 'subpkgs'

--HG--
extra : convert_revision : ce65943c5b14c7082df703a8ab3edc52465571d1

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}
+		for subpkg in ${subpackages}; do
-		unset run_depends
+			run_depends="$run_depends ${sourcepkg}-${subpkg}-${version}"
+		done
 	fi
-	for subpkg in ${subpackages}; do
-		run_depends="$run_depends ${sourcepkg}-${subpkg}-${version}"
-	done
 	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/template

@@ -1,6 +1,6 @@
 # Template build file for 'bash'.
 pkgname=bash
-version=3.2.48
+version=4.0
 distfiles="http://ftp.gnu.org/gnu/bash/bash-$version.tar.gz"
 build_style=gnu_configure
 configure_args="--without-bash-malloc --with-curses
@@ -8,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
@@ -22,4 +22,6 @@ long_desc="
  modification."
 
 base_chroot=yes
-run_depends="glibc-2.8 ncurses-5.6"
+
+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,19 +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."
-run_depends="glibc-libs-2.8"
-
-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-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/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-devel

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

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 'glibc-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="glibc-libs-${version}"
+
+Add_dependency run bzip2
 
 do_install()
 {
@@ -13,5 +14,5 @@ do_install()
 
 	mkdir -p ${destdir}/usr/lib
 	mv ${origdir}/usr/include ${destdir}/usr
-	mv ${origdir}/usr/lib/*.a ${destdir}/usr/lib
+	mv ${origdir}/usr/lib/libbz2.*a ${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,6 @@ long_desc="
  predecessor, bzip (.bz)."
 
 base_chroot=yes
-run_depends="glibc-2.8"
+subpackages="devel"
+
+Add_dependency run glibc

templates/coreutils/template

@@ -15,4 +15,5 @@ long_desc="
  which are expected to exist on every operating system."
 
 base_chroot=yes
-run_depends="glibc-2.8"
+
+Add_dependency run glibc

templates/dash/template

@@ -18,7 +18,8 @@ long_desc="
 
 base_package=yes
 base_chroot=yes
-run_depends="glibc-2.8"
+
+Add_dependency run glibc
 
 post_install()
 {

templates/diffutils/template

@@ -12,5 +12,6 @@ long_desc="
  faster. Cmp has been moved into this package from the GNU textutils package.
  These programs are usually used for creating patch files."
 
-base_chroot=yes 
+base_chroot=yes
-run_depends="glibc-2.8"
+
+Add_dependency run glibc

templates/file-devel

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

templates/file/depends

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

templates/file/devel.template

@@ -1,17 +1,18 @@
-# Template file for 'gmp-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="gmp-libs-${version}"
+
+Add_dependency run file
 
 do_install()
 {
 	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
 
 	mkdir -p ${destdir}/usr/lib
-	mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/include ${destdir}/usr
+	mv ${origdir}/usr/include ${destdir}/usr
-	mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/lib/libgmp.*a \
+	mv ${origdir}/usr/lib/libmagic.*a ${destdir}/usr/lib
-		${destdir}/usr/lib
 }

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
@@ -12,5 +13,7 @@ long_desc="
  a description if a match is found."
 
 base_chroot=yes
-build_depends="zlib-1.2.3"
+subpackages="devel"
-run_depends="glibc-2.8 zlib-1.2.3"
+
+Add_dependency run glibc
+Add_dependency full zlib

templates/findutils/template

@@ -16,4 +16,5 @@ long_desc="
  locating capabilities to other commands."
 
 base_chroot=yes
-run_depends="glibc-2.8"
+
+Add_dependency run glibc

templates/gawk-base

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

templates/gawk-locale

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

templates/gawk/base.template

@@ -1,21 +0,0 @@
-# Template file for 'gawk-base'.
-#
-short_desc="${short_desc} (base files)"
-long_desc="${long_desc}
-
- This package contains the ${sourcepkg} base files."
-run_depends="glibc-libs-2.8"
-
-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
@@ -11,5 +10,6 @@ checksum=06dd872da7145088ae08475f7b11e5b9e810b8ead7d78d039003e671bb76ec65
 long_desc="
  The GNU AWK utility, a pattern scanning and processing tool."
 
-base_chroot=yes 
+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,21 +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="glibc-libs-2.8 gmp-libs-4.2.4 mpfr-libs-2.3.2 binutils-2.18"
-
-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
-}

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/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,24 +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"
-run_depends="glibc-libs-${version}"
-
-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
-}

templates/glibc/depends

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

templates/glibc/devel.template

@@ -0,0 +1,20 @@
+# Template file for 'glibc-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development: headers, static libs, etc."
+
+Add_dependency run glibc
+
+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/*.a ${destdir}/usr/lib
+	mv ${origdir}/usr/lib/*.so ${destdir}/usr/lib
+	mv ${origdir}/usr/lib/*crt1.o ${destdir}/usr/lib
+}

templates/glibc/libs.template

@@ -1,19 +0,0 @@
-# Template file for 'glibc-libs'.
-#
-short_desc="${short_desc} (libraries)"
-long_desc="${long_desc}
-
- This package contains only the ${sourcepkg} shared libraries."
-run_depends="xbps-base-dirs-1.0"
-
-do_install()
-{
-	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
-	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
-
-	mkdir -p ${destdir}/lib
-	mkdir -p ${destdir}/usr/lib
-	mv ${origdir}/lib/*.*o* ${destdir}/lib
-	mv ${origdir}/usr/lib/*.*o* ${destdir}/usr/lib
-	mv ${origdir}/usr/lib/gconv ${destdir}/usr/lib
-}

templates/glibc/locales.template

@@ -1,10 +1,9 @@
-# Template file for 'glibc-locale'.
+# Template file for 'glibc-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()

templates/glibc/template

@@ -23,8 +23,12 @@ long_desc="
  languages use the C library to access the underlying operating system."
 
 base_chroot=yes
-build_depends="gcc-4.3.2 gawk-3.1.6"
+subpackages="devel locales"
-subpackages="base dev libs locale"
+
+Add_dependency build	gcc
+Add_dependency build	gawk
+Add_dependency run	gcc-libgcc
+Add_dependency run	glibc-locales
 
 pre_configure()
 {

templates/gmp-libs

@@ -1 +0,0 @@
-gmp

templates/gmp/depends

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

templates/gmp/devel.template

@@ -0,0 +1,18 @@
+# Template file for 'gmp-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development: headers, static libs, etc."
+
+Add_dependency run gmp
+
+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/libgmp.*a ${destdir}/usr/lib
+}

templates/gmp/libs.template

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

templates/gmp/template

@@ -24,7 +24,9 @@ long_desc="
  operations, since GNU MP in many cases has asymptotically faster algorithms."
 
 base_chroot=yes
-subpackages="dev libs"
+subpackages="devel"
+
+Add_dependency run glibc
 
 pre_configure()
 {

templates/grep/template

@@ -16,5 +16,6 @@ long_desc="
  The result is typically many times faster than Unix grep or egrep."
 
 base_chroot=yes
-build_depends="texinfo-4.13a"
+
-run_depends="glibc-2.8"
+Add_dependency build texinfo
+Add_dependency run glibc

templates/gzip/template

@@ -13,4 +13,5 @@ long_desc="
  standard compression program for its system."
 
 base_chroot=yes
-run_depends="glibc-2.8"
+
+Add_dependency run glibc

templates/libarchive-devel

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

templates/libarchive/depends

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

templates/libarchive/devel.template

@@ -1,17 +1,18 @@
-# Template file for 'mpfr-dev'.
+# Template file for 'libarchive-devel'.
 #
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
-run_depends="mpfr-libs-${version}"
+
+Add_dependency run libarchive
 
 do_install()
 {
 	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
 
 	mkdir -p ${destdir}/usr/lib
-	mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/include ${destdir}/usr
+	mv ${origdir}/usr/include ${destdir}/usr
-	mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/lib/libmpfr.*a \
+	mv ${origdir}/usr/lib/libarchive.*a ${destdir}/usr/lib
-		${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
@@ -15,5 +14,8 @@ long_desc="
  shar archives and read ISO9660 CDROM images and ZIP archives."
 
 base_chroot=yes 
-build_depends="gzip-1.3.12 bzip2-1.0.5 zlib-1.2.3 lzma-utils-4.32.7"
+subpackages="devel"
-run_depends="glibc-2.8 $build_depends"
+
+Add_dependency full bzip2
+Add_dependency full lzma-utils-libs
+Add_dependency full zlib

templates/lzma-utils-devel

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

templates/lzma-utils-libs

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

templates/lzma-utils/depends

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

templates/lzma-utils/devel.template

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

templates/lzma-utils/libs.template

@@ -0,0 +1,18 @@
+# Template file for 'lzma-utils-libs'.
+#
+short_desc="${short_desc} (shared libraries)"
+long_desc="${long_desc}
+
+ This package contains the shared libraries."
+
+Add_dependency run glibc
+Add_dependency run gcc-libstdc++
+
+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,7 @@ long_desc="
  bzip2 utilities."
 
 base_chroot=yes
-run_depends="glibc-2.8"
+subpackages="devel libs"
+
+Add_dependency run glibc
+Add_dependency run gcc-libstdc++

templates/make/template

@@ -12,4 +12,5 @@ long_desc="
  recompile them, when necessary."
 
 base_chroot=yes
-run_depends="glibc-2.8"
+
+Add_dependency run glibc

templates/mpfr-libs

@@ -1 +0,0 @@
-mpfr

templates/mpfr/depends

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

templates/mpfr/devel.template

@@ -0,0 +1,18 @@
+# Template file for 'mpfr-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development: headers, static libs, etc."
+
+Add_dependency run mpfr
+
+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/libmpfr.*a ${destdir}/usr/lib
+}

templates/mpfr/libs.template

@@ -1,17 +0,0 @@
-# Template file for 'mpfr-libs'.
-#
-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"
-
-do_install()
-{
-	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
-
-	# Move the shared lib.
-	mkdir -p ${destdir}/usr/lib
-	mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/lib/libmpfr.so* \
-		${destdir}/usr/lib
-}

templates/mpfr/template

@@ -17,5 +17,6 @@ long_desc="
  library."
 
 base_chroot=yes
-build_depends="gmp-4.2.4"
+subpackages="devel"
-subpackages="dev libs"
+
+Add_dependency full gmp

templates/ncurses-base

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

templates/ncurses-devel

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

templates/ncurses-libs

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

templates/ncurses-term

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

templates/ncurses/base-files

@@ -0,0 +1,136 @@
+/usr/share/tabset
+/usr/share/tabset/std
+/usr/share/tabset/stdcrt
+/usr/share/tabset/vt100
+/usr/share/tabset/vt300
+/usr/share/terminfo
+/usr/share/terminfo/A
+/usr/share/terminfo/A/Apple_Terminal
+/usr/share/terminfo/E
+/usr/share/terminfo/E/Eterm
+/usr/share/terminfo/E/Eterm-256color
+/usr/share/terminfo/E/Eterm-88color
+/usr/share/terminfo/E/Eterm-color
+/usr/share/terminfo/a
+/usr/share/terminfo/a/ansi
+/usr/share/terminfo/a/ansi80x25
+/usr/share/terminfo/a/ansis
+/usr/share/terminfo/c
+/usr/share/terminfo/c/cons25
+/usr/share/terminfo/c/cygwin
+/usr/share/terminfo/d
+/usr/share/terminfo/d/dumb
+/usr/share/terminfo/g
+/usr/share/terminfo/g/gnome
+/usr/share/terminfo/g/gnome-2007
+/usr/share/terminfo/g/gnome-256color
+/usr/share/terminfo/g/gnome-fc5
+/usr/share/terminfo/g/gnome-rh62
+/usr/share/terminfo/g/gnome-rh72
+/usr/share/terminfo/g/gnome-rh80
+/usr/share/terminfo/g/gnome-rh90
+/usr/share/terminfo/h
+/usr/share/terminfo/h/hurd
+/usr/share/terminfo/j
+/usr/share/terminfo/j/jfbterm
+/usr/share/terminfo/k
+/usr/share/terminfo/k/kon
+/usr/share/terminfo/k/kon2
+/usr/share/terminfo/l
+/usr/share/terminfo/l/linux
+/usr/share/terminfo/m
+/usr/share/terminfo/m/mach
+/usr/share/terminfo/m/mach-bold
+/usr/share/terminfo/m/mach-color
+/usr/share/terminfo/m/mlterm
+/usr/share/terminfo/m/mrxvt
+/usr/share/terminfo/n
+/usr/share/terminfo/n/nsterm
+/usr/share/terminfo/n/nxterm
+/usr/share/terminfo/p
+/usr/share/terminfo/p/pcansi
+/usr/share/terminfo/p/putty
+/usr/share/terminfo/p/putty-256color
+/usr/share/terminfo/p/putty-vt100
+/usr/share/terminfo/r
+/usr/share/terminfo/r/rxvt
+/usr/share/terminfo/r/rxvt-16color
+/usr/share/terminfo/r/rxvt-256color
+/usr/share/terminfo/r/rxvt-88color
+/usr/share/terminfo/r/rxvt-basic
+/usr/share/terminfo/r/rxvt-color
+/usr/share/terminfo/r/rxvt-cygwin
+/usr/share/terminfo/r/rxvt-cygwin-native
+/usr/share/terminfo/r/rxvt-unicode
+/usr/share/terminfo/r/rxvt-xpm
+/usr/share/terminfo/s
+/usr/share/terminfo/s/screen
+/usr/share/terminfo/s/screen-16color
+/usr/share/terminfo/s/screen-16color-bce
+/usr/share/terminfo/s/screen-16color-bce-s
+/usr/share/terminfo/s/screen-16color-s
+/usr/share/terminfo/s/screen-256color
+/usr/share/terminfo/s/screen-256color-bce
+/usr/share/terminfo/s/screen-256color-bce-s
+/usr/share/terminfo/s/screen-256color-s
+/usr/share/terminfo/s/screen-bce
+/usr/share/terminfo/s/screen-s
+/usr/share/terminfo/s/screen-w
+/usr/share/terminfo/s/screen.linux
+/usr/share/terminfo/s/screen.mlterm
+/usr/share/terminfo/s/screen.rxvt
+/usr/share/terminfo/s/screen.teraterm
+/usr/share/terminfo/s/screen.xterm-new
+/usr/share/terminfo/s/screen.xterm-r6
+/usr/share/terminfo/s/screen.xterm-xfree86
+/usr/share/terminfo/s/sun
+/usr/share/terminfo/s/sun1
+/usr/share/terminfo/s/sun2
+/usr/share/terminfo/t
+/usr/share/terminfo/t/teraterm
+/usr/share/terminfo/v
+/usr/share/terminfo/v/vs100
+/usr/share/terminfo/v/vt100
+/usr/share/terminfo/v/vt100-am
+/usr/share/terminfo/v/vt100-nav
+/usr/share/terminfo/v/vt102
+/usr/share/terminfo/v/vt200
+/usr/share/terminfo/v/vt220
+/usr/share/terminfo/v/vt52
+/usr/share/terminfo/w
+/usr/share/terminfo/w/wsvt25
+/usr/share/terminfo/w/wsvt25m
+/usr/share/terminfo/x
+/usr/share/terminfo/x/xfce
+/usr/share/terminfo/x/xterm
+/usr/share/terminfo/x/xterm-1002
+/usr/share/terminfo/x/xterm-1003
+/usr/share/terminfo/x/xterm-16color
+/usr/share/terminfo/x/xterm-24
+/usr/share/terminfo/x/xterm-256color
+/usr/share/terminfo/x/xterm-88color
+/usr/share/terminfo/x/xterm-8bit
+/usr/share/terminfo/x/xterm-basic
+/usr/share/terminfo/x/xterm-bold
+/usr/share/terminfo/x/xterm-color
+/usr/share/terminfo/x/xterm-hp
+/usr/share/terminfo/x/xterm-new
+/usr/share/terminfo/x/xterm-nic
+/usr/share/terminfo/x/xterm-noapp
+/usr/share/terminfo/x/xterm-old
+/usr/share/terminfo/x/xterm-pcolor
+/usr/share/terminfo/x/xterm-r5
+/usr/share/terminfo/x/xterm-r6
+/usr/share/terminfo/x/xterm-sco
+/usr/share/terminfo/x/xterm-sun
+/usr/share/terminfo/x/xterm-vt220
+/usr/share/terminfo/x/xterm-vt52
+/usr/share/terminfo/x/xterm-xf86-v32
+/usr/share/terminfo/x/xterm-xf86-v33
+/usr/share/terminfo/x/xterm-xf86-v333
+/usr/share/terminfo/x/xterm-xf86-v40
+/usr/share/terminfo/x/xterm-xf86-v43
+/usr/share/terminfo/x/xterm-xf86-v44
+/usr/share/terminfo/x/xterm-xfree86
+/usr/share/terminfo/x/xterm-xi
+/usr/share/terminfo/x/xterms

templates/ncurses/base.template

@@ -0,0 +1,30 @@
+# Template file for 'ncurses-base'.
+#
+short_desc="${short_desc} (base files)"
+long_desc="${long_desc}
+
+ This package contains the base files."
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	cat $XBPS_TEMPLATESDIR/ncurses/base-files | while read line; do
+		if [ -f ${origdir}/${line} ]; then
+			install -D ${origdir}/${line} ${destdir}/${line}
+			rm -f ${origdir}/${line}
+		fi
+	done
+
+	mkdir -p ${destdir}/lib/terminfo/a
+	mkdir -p ${destdir}/lib/terminfo/l
+	mkdir -p ${destdir}/lib/terminfo/v
+
+	cp ${destdir}/usr/share/terminfo/a/ansi ${destdir}/lib/terminfo/a
+	cp ${destdir}/usr/share/terminfo/l/linux ${destdir}/lib/terminfo/l
+	for f in vt100 vt100-am vt100-nav vt102 vt200 vt220 vt52; do
+		cp ${destdir}/usr/share/terminfo/v/${f} \
+			${destdir}/lib/terminfo/v
+	done
+}