Get rid of references to /usr/X11R6.

Package-Manager: portage-2.0.51.22-r2

7 files changed, 36 insertions, 29 deletions

diff --git a/x11-apps/xdm/ChangeLog b/x11-apps/xdm/ChangeLog
index 56cb03b0954c..0b1191f13ffd 100644
--- a/x11-apps/xdm/ChangeLog
+++ b/x11-apps/xdm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-apps/xdm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.3 2005/08/16 02:53:03 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.4 2005/08/16 20:17:09 spyderous Exp $
+
+  16 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; files/xdm.start:
+  Get rid of references to /usr/X11R6.
 
 *xdm-0.99.0-r1 (16 Aug 2005)
 
diff --git a/x11-apps/xdm/files/xdm.start b/x11-apps/xdm/files/xdm.start
index ab8eee1167cf..7d881edcd7b0 100755
--- a/x11-apps/xdm/files/xdm.start
+++ b/x11-apps/xdm/files/xdm.start
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/files/xdm.start,v 1.1 2005/08/16 02:53:03 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/files/xdm.start,v 1.2 2005/08/16 20:17:09 spyderous Exp $
 
 # This is here to serve as a note to myself, and future developers.
 #
@@ -62,17 +62,14 @@ setup_dm() {
 			;;
 		*)
 			EXE=
-			for x in /usr/bin /usr/X11R6/bin
-			do
-				# Fix #65586, where MY_XDM is empty so EXE=somedir
-				[ -x "${x}/${MY_XDM}" -a -f "${x}/${MY_XDM}" ] \
-					&& EXE="${x}/${MY_XDM}"
-			done
-			[ -z "${EXE}" ] && EXE="/usr/X11R6/bin/xdm"
+			# Fix #65586, where MY_XDM is empty so EXE=somedir
+			[ -x "/usr/bin/${MY_XDM}" -a -f "/usr/bin/${MY_XDM}" ] \
+				&& EXE="/usr/bin/${MY_XDM}"
+			[ -z "${EXE}" ] && EXE="/usr/bin/xdm"
 			;;
 	esac
 
-	test ! -x "${EXE}" && EXE=/usr/X11R6/bin/xdm
+	test ! -x "${EXE}" && EXE=/usr/bin/xdm
 
 	SERVICE="${EXE##*/}"
 }
diff --git a/x11-apps/xfs/ChangeLog b/x11-apps/xfs/ChangeLog
index eab816bf8939..d323799bb079 100644
--- a/x11-apps/xfs/ChangeLog
+++ b/x11-apps/xfs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-apps/xfs
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/ChangeLog,v 1.3 2005/08/16 03:08:47 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/ChangeLog,v 1.4 2005/08/16 20:13:43 spyderous Exp $
+
+  16 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; files/xfs.start:
+  Get rid of references to /usr/X11R6.
 
 *xfs-0.99.0-r1 (16 Aug 2005)
 
diff --git a/x11-apps/xfs/files/xfs.start b/x11-apps/xfs/files/xfs.start
index 52a9270dd92e..d7f1fa177417 100755
--- a/x11-apps/xfs/files/xfs.start
+++ b/x11-apps/xfs/files/xfs.start
@@ -2,7 +2,7 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
 # Author:  Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/files/xfs.start,v 1.1 2005/08/16 03:08:47 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/files/xfs.start,v 1.2 2005/08/16 20:13:43 spyderous Exp $
 
 #NB: Config is in /etc/conf.d/xfs
 
@@ -184,9 +184,9 @@ setup_font_dirs() {
 	umask 022
 
 	local NEEDED_BIN
-	local NEEDED_BINS="/usr/X11R6/bin/mkfontdir
-		/usr/X11R6/bin/mkfontscale
-		/usr/X11R6/bin/ttmkfdir"
+	local NEEDED_BINS="/usr/bin/mkfontdir
+		/usr/bin/mkfontscale
+		/usr/bin/ttmkfdir"
 	for NEEDED_BIN in ${NEEDED_BINS}
 	do
 		if [ ! -x ${NEEDED_BIN} ]
@@ -204,7 +204,7 @@ setup_font_dirs() {
 	fi
 
 	# Generate the encodings.dir ...
-	/usr/X11R6/bin/mkfontdir -n \
+	/usr/bin/mkfontdir -n \
 		-e /usr/share/fonts/encodings \
 		-e /usr/share/fonts/encodings/large \
 		-- /usr/share/fonts/encodings
@@ -241,14 +241,14 @@ setup_font_dirs() {
 			if [ "${x/encodings}" = "${x}" -a \
 			     -n "$(find ${x} -iname '*.tt[cf]' -print)" ]
 			then
-				/usr/X11R6/bin/ttmkfdir -x 2 \
+				/usr/bin/ttmkfdir -x 2 \
 					-e /usr/share/fonts/encodings/encodings.dir \
 					-o ${x}/fonts.scale -d ${x} > /dev/null
 				# ttmkfdir fails on some stuff, so try mkfontscale if it does
 				local ttmkfdir_return=$?
 				if [ ${ttmkfdir_return} -ne 0 ]
 				then
-					/usr/X11R6/bin/mkfontscale \
+					/usr/bin/mkfontscale \
 						-a /usr/share/fonts/encodings/encodings.dir \
 						-- ${x}
 				fi
@@ -257,7 +257,7 @@ setup_font_dirs() {
 			elif [ "${x/encodings}" = "${x}" -a \
 				-n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]
 			then
-				/usr/X11R6/bin/mkfontscale \
+				/usr/bin/mkfontscale \
 					-a /usr/share/fonts/encodings/encodings.dir \
 					-- ${x}
 			fi
@@ -265,17 +265,17 @@ setup_font_dirs() {
 		  	# Now generate fonts.dir files ...
 			if [ "${x/encodings}" = "${x}" ]
 			then
-				/usr/X11R6/bin/mkfontdir \
+				/usr/bin/mkfontdir \
 					-e /usr/share/fonts/encodings \
 					-e /usr/share/fonts/encodings/large \
 					-- ${x} > /dev/null
 			fi
 
-			if [ "${x/encodings}" = "${x}" -a -x /usr/X11R6/bin/xftcache ] && \
+			if [ "${x/encodings}" = "${x}" -a -x /usr/bin/xftcache ] && \
 			   [ -n "$(find ${x} -iname '*.[otps][pft][cfad]' -print)" ]
 			then
 				# xftcache is broken, but run it anyhow ...
-				/usr/X11R6/bin/xftcache ${x} &> /dev/null
+				/usr/bin/xftcache ${x} &> /dev/null
 			fi
 			eend 0
 
@@ -312,11 +312,11 @@ start() {
 		mkdir /tmp/.font-unix
 		chmod 1777 /tmp/.font-unix
 
-		start-stop-daemon --start --quiet --exec /usr/X11R6/bin/xfs \
+		start-stop-daemon --start --quiet --exec /usr/bin/xfs \
 			-- -daemon -config /etc/X11/fs/config \
 				-droppriv -user xfs -port ${XFS_PORT} 1>&2
 	else
-		start-stop-daemon --start --quiet --exec /usr/X11R6/bin/xfs \
+		start-stop-daemon --start --quiet --exec /usr/bin/xfs \
 			-- -daemon -config /etc/X11/fs/config \
 				-port ${XFS_PORT} 1>&2
 	fi
@@ -325,7 +325,7 @@ start() {
 
 stop() {
 	ebegin "Stopping X Font Server"
-	start-stop-daemon --stop --quiet --exec /usr/X11R6/bin/xfs 1>&2
+	start-stop-daemon --stop --quiet --exec /usr/bin/xfs 1>&2
 	rm -rf /tmp/.font-unix
 	eend $?
 }
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index b3ff0b33d6c3..d7bc33cc0060 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/xinit
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.5 2005/08/15 17:55:50 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.6 2005/08/16 20:18:24 spyderous Exp $
+
+  16 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; files/chooser.sh,
+  files/xinitrc:
+  Get rid of references to /usr/X11R6.
 
   15 Aug 2005; Herbie Hopkins <herbs@gentoo.org> xinit-0.99.0-r2.ebuild:
   Marked ~amd64.
diff --git a/x11-apps/xinit/files/chooser.sh b/x11-apps/xinit/files/chooser.sh
index 16054d166440..1f6de165c136 100644
--- a/x11-apps/xinit/files/chooser.sh
+++ b/x11-apps/xinit/files/chooser.sh
@@ -2,7 +2,7 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
 # Author:  Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/chooser.sh,v 1.1 2005/08/14 00:12:39 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/chooser.sh,v 1.2 2005/08/16 20:18:24 spyderous Exp $
 
 # If $XSESSION is "", source first /etc/conf.d/basic, and then /etc/rc.conf
 if [ -z "${XSESSION}" ]
@@ -54,7 +54,7 @@ if [ -n "${XSESSION}" ]; then
 		done
 
 		# If all else fail, run twm
-		GENTOO_EXEC="/usr/X11R6/bin/twm"
+		GENTOO_EXEC="/usr/bin/twm"
 	fi
 fi
 
diff --git a/x11-apps/xinit/files/xinitrc b/x11-apps/xinit/files/xinitrc
index 53cde32559d2..2fbac7548eb8 100644
--- a/x11-apps/xinit/files/xinitrc
+++ b/x11-apps/xinit/files/xinitrc
@@ -3,7 +3,7 @@
 
 userresources=$HOME/.Xresources
 usermodmap=$HOME/.Xmodmap
-xinitdir=/usr/X11R6/lib/X11/xinit
+xinitdir=/usr/lib/X11/xinit
 sysresources=$xinitdir/.Xresources
 sysmodmap=$xinitdir/.Xmodmap