From a59f5dd92a17bec379bf4da9bd6481e992c128a5 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 15 Jul 2011 14:45:00 +0200
Subject: [PATCH] base-files: added some common dirs to /etc/profile.

---
 srcpkgs/base-files/files/profile |  3 +++
 srcpkgs/base-files/template      | 32 ++++++++++++--------------------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/srcpkgs/base-files/files/profile b/srcpkgs/base-files/files/profile
index a48dc12e1e4..871f006b6ab 100644
--- a/srcpkgs/base-files/files/profile
+++ b/srcpkgs/base-files/files/profile
@@ -25,9 +25,12 @@ if [ "$EUID" = "0" ]; then
 	pathmunge /usr/sbin
 	pathmunge /usr/local/sbin
 else
+	pathmunge /usr/local/bin after
 	pathmunge /usr/local/sbin after
 	pathmunge /usr/sbin after
 	pathmunge /sbin after
+	pathmunge /opt/bin after
+	pathmunge /opt/sbin after
 fi
 
 # No core files by default
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index 744dfdbb9e8..787e347d96b 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,11 +1,11 @@
 # Template file for 'base-files'
 pkgname=base-files
-version=0.46
+version=0.47
 build_style=custom-install
 short_desc="Vanilla GNU/Linux base system files"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="https://vanilla.github.com/"
-license="public domain"
+license="Public domain"
 long_desc="
  This package installs the base system files that aren't installed by any
  other package and are required on any GNU/Linux system."
@@ -29,33 +29,25 @@ Add_dependency full xbps-triggers
 
 do_install()
 {
-	#
 	# Install misc config files.
-	#
 	for f in bash_logout bash_profile bashrc; do
-		install -D -m644 ${FILESDIR}/dot_${f} ${DESTDIR}/etc/skel/.${f}
+		vinstall ${FILESDIR}/dot_${f} 644 etc/skel/.${f}
 	done
 
-	install -m644 ${FILESDIR}/profile ${DESTDIR}/etc
-	install -m600 ${FILESDIR}/securetty ${DESTDIR}/etc
-	install -m644 ${FILESDIR}/hosts ${DESTDIR}/etc
-	install -m644 ${FILESDIR}/host.conf ${DESTDIR}/etc
-	install -m644 ${FILESDIR}/issue ${DESTDIR}/etc
-	install -m644 ${FILESDIR}/lsb-release ${DESTDIR}/etc
-
-	install -d ${DESTDIR}/etc/profile.d
+	vinstall ${FILESDIR}/securetty 600 etc
+	for f in profile hosts host.conf issue lsb-release; do
+		vinstall ${FILESDIR}/${f} 644 etc
+	done
+	vmkdir etc/profile.d
 	install -m644 ${FILESDIR}/*.sh ${DESTDIR}/etc/profile.d
 	install -m644 ${FILESDIR}/DIR_COLORS* ${DESTDIR}/etc
 
-	install -d ${DESTDIR}/etc/modprobe.d
-	install -m644 ${FILESDIR}/usb-load-ehci-first \
-		${DESTDIR}/etc/modprobe.d/usb-load-ehci-first.conf
-	install -m644 ${FILESDIR}/blacklist.conf ${DESTDIR}/etc/modprobe.d
+	vinstall ${FILESDIR}/usb-load-ehci-first 644 etc/modprobe.d \
+		usb-load-ehci-first.conf
+	vinstall ${FILESDIR}/blacklist.conf 644 etc/modprobe.d
 
-	#
 	# Install comman licenses, from Debian.
-	#
-	install -d ${DESTDIR}/usr/share/licenses
+	vmkdir usr/share/licenses
 	install -m644 ${FILESDIR}/licenses/* ${DESTDIR}/usr/share/licenses
 
 	# vkpurge