From 1ecc844eb424c4dc2d40c1e314d70431b348912e Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 27 Dec 2008 08:44:37 +0100
Subject: [PATCH] xbps-base-{chroot,system}: depend on xbps-base-dirs.

--HG--
extra : convert_revision : d63fdd36b263e76c4b605811406df2d809946134
---
 templates/xbps-base-chroot.tmpl | 18 +++---------------
 templates/xbps-base-system.tmpl | 18 +++---------------
 2 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/templates/xbps-base-chroot.tmpl b/templates/xbps-base-chroot.tmpl
index c2fa23178da..15cf97dd43d 100644
--- a/templates/xbps-base-chroot.tmpl
+++ b/templates/xbps-base-chroot.tmpl
@@ -1,7 +1,7 @@
 # Template file for 'xbps-base-chroot'
 pkgname=xbps-base-chroot
-version=0.4
-build_style=custom-install
+version=0.5
+build_style=meta-template
 short_desc="xbps base packages for the chroot target"
 maintainer="Juan RP <xtraeme@gmail.com>"
 long_desc="
@@ -13,17 +13,5 @@ build_depends="glibc-2.8 kernel-libc-headers-2.6.27.3 bash-3.2 coreutils-6.12
  bison-2.3 texinfo-4.13 m4-1.4.12 libarchive-2.5.5 binutils-2.18 gcc-4.3.2
  tar-1.20 bzip2-1.0.5 gzip-1.3.12 gawk-3.1.6 grep-2.5.3 findutils-4.4.0
  sed-4.1.5 make-3.81 diffutils-2.8.1 file-4.26 proplib-0.1 patch-2.5.4
- wget-1.11.4 dash-0.5.4"
+ wget-1.11.4 dash-0.5.4 xbps-base-dirs-0.1"
 run_depends="$build_depends"
-
-do_install()
-{
-	local destdir=$XBPS_DESTDIR/$pkgname-$version
-
-	if [ "$xbps_machine" = "x86_64" ]; then
-		mkdir -p $destdir/usr/lib
-		mkdir -p $destdir/lib
-		cd $destdir && ln -s lib lib64
-		cd $destdir/usr && ln -s lib lib64
-	fi
-}
diff --git a/templates/xbps-base-system.tmpl b/templates/xbps-base-system.tmpl
index 16d628aeb72..ce797abbeb6 100644
--- a/templates/xbps-base-system.tmpl
+++ b/templates/xbps-base-system.tmpl
@@ -1,7 +1,7 @@
 # Template file for 'xbps-base-chroot'
 pkgname=xbps-base-system
-version=0.1
-build_style=custom-install
+version=0.2
+build_style=meta-template
 short_desc="xbps base system packages"
 maintainer="Juan RP <xtraeme@gmail.com>"
 long_desc="
@@ -16,16 +16,4 @@ build_depends="man-pages-3.11 man-db-2.5.2 util-linux-ng-2.14.1
 run_depends="$build_depends initng-0.6.10.2 coreutils-6.12 dash-0.5.4
  zlib-1.2.3 file-4.26 diffutils-2.8.1 sed-4.1.5 findutils-4.4.0
  grep-2.5.3 gawk-3.1.6 gzip-1.3.12 bzip2-1.0.5 tar-1.20 ncurses-5.7
- bash-3.2 glibc-2.9 wget-1.11.4"
-
-do_install()
-{
-	local destdir=$XBPS_DESTDIR/$pkgname-$version
-
-	if [ "$xbps_machine" = "x86_64" ]; then
-		mkdir -p $destdir/usr/lib
-		mkdir -p $destdir/lib
-		cd $destdir && ln -s lib lib64
-		cd $destdir/usr && ln -s lib lib64
-	fi
-}
+ bash-3.2 glibc-2.9 wget-1.11.4 xbps-base-dirs-0.1"