From 83ee032c38031cde25e484b818dc5569cc0af2e4 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 4 Feb 2009 01:30:04 +0100
Subject: [PATCH] Rather than adding the xbps-base-dirs dep on
 xbps-base-{chroot,system}, add the dependency to glibc instead.

Almost all packages depend on it, and this ensures that it's always installed
before anything else.

--HG--
extra : convert_revision : 45bbc22a15feeb663d2895324e611b6d711ea062
---
 templates/glibc/template            | 1 +
 templates/xbps-base-chroot/template | 2 +-
 templates/xbps-base-system/template | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/templates/glibc/template b/templates/glibc/template
index 5b7c5d62a65..cb754003675 100644
--- a/templates/glibc/template
+++ b/templates/glibc/template
@@ -26,6 +26,7 @@ conf_files="/etc/localtime /etc/ld.so.cache /etc/ld.so.conf /etc/rpc
  /etc/nsswitch.conf"
 base_chroot=yes
 build_depends="gcc-4.3.2"
+run_depends="xbps-base-dirs-0.1"
 
 pre_configure()
 {
diff --git a/templates/xbps-base-chroot/template b/templates/xbps-base-chroot/template
index 15cf97dd43d..939056f72be 100644
--- a/templates/xbps-base-chroot/template
+++ b/templates/xbps-base-chroot/template
@@ -13,5 +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 xbps-base-dirs-0.1"
+ wget-1.11.4 dash-0.5.4"
 run_depends="$build_depends"
diff --git a/templates/xbps-base-system/template b/templates/xbps-base-system/template
index c6885867098..38e440b62d5 100644
--- a/templates/xbps-base-system/template
+++ b/templates/xbps-base-system/template
@@ -16,4 +16,4 @@ build_depends="man-pages-3.11 man-db-2.5.2 util-linux-ng-2.14.1
 run_depends="tzdata-0 $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 xbps-base-dirs-0.1"
+ bash-3.2 glibc-2.9 wget-1.11.4"