From 6ae0a0671c61e77f4d6db57179c1627ce7377474 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 10 Jul 2012 18:09:38 +0200
Subject: [PATCH] base-directories: improve switch to /usr.

---
 srcpkgs/base-directories/INSTALL  | 4 ++--
 srcpkgs/base-directories/template | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/base-directories/INSTALL b/srcpkgs/base-directories/INSTALL
index 14acb34de3..e9152734b7 100644
--- a/srcpkgs/base-directories/INSTALL
+++ b/srcpkgs/base-directories/INSTALL
@@ -30,7 +30,7 @@ make_system_dirs()
 
 	# Create /bin, /sbin and /lib symlinks to /usr.
 	for d in bin sbin lib; do
-		if [ -d "$d" ]; then
+		if [ ! -h "$d" -a -d "$d" ]; then
 			echo "/${d} must not be a directory, exiting!"
 			exit 1
 		fi
@@ -43,7 +43,7 @@ make_system_dirs()
 
 	# Create /var/run and /var/lock symlinks.
 	for d in run lock; do
-		if [ -d var/${d} ]; then
+		if [ ! -h "var/$d" -a -d var/${d} ]; then
 			echo "/${d} must not be a directory, exiting!"
 			exit 1
 		fi
diff --git a/srcpkgs/base-directories/template b/srcpkgs/base-directories/template
index bb780dbb6c..c3f8fd7042 100644
--- a/srcpkgs/base-directories/template
+++ b/srcpkgs/base-directories/template
@@ -1,6 +1,6 @@
 # Template file for 'base-directories'
 pkgname=base-directories
-version=0.16
+version=0.17
 revision=1
 noarch=yes
 bootstrap=yes
@@ -13,8 +13,8 @@ long_desc="
  installed by any other package and are required on any GNU/Linux system."
 
 do_install() {
-	vmkdir var/db/xbps/$pkgname
-	touch ${DESTDIR}/var/db/xbps/$pkgname/.owned
+	vmkdir var/db/xbps/metadata/$pkgname
+	touch ${DESTDIR}/var/db/xbps/metadata/$pkgname/.owned
 }
 
 post_stow() {