summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeemant Kulleen <seemant@gentoo.org>2003-06-15 04:02:50 +0000
committerSeemant Kulleen <seemant@gentoo.org>2003-06-15 04:02:50 +0000
commit623ca9eadb8a5bb401606c7f61ae18a16034a81f (patch)
tree581c5564cefa3680029b9dea130abd79641c96aa /x11-base
parentposixify the chooser.sh script (diff)
downloadgentoo-2-623ca9eadb8a5bb401606c7f61ae18a16034a81f.tar.gz
gentoo-2-623ca9eadb8a5bb401606c7f61ae18a16034a81f.tar.bz2
gentoo-2-623ca9eadb8a5bb401606c7f61ae18a16034a81f.zip
posixify the chooser.sh script
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xfree/ChangeLog6
-rw-r--r--x11-base/xfree/Manifest6
-rw-r--r--x11-base/xfree/files/4.3.0/chooser.sh6
3 files changed, 10 insertions, 8 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index f47cc365d337..3fda6db9f033 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-base/xfree
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.149 2003/06/06 19:15:31 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.150 2003/06/15 04:02:47 seemant Exp $
+
+ 14 Jun 2003; Seemant Kulleen <seemant@gentoo.org> files/4.3.0/chooser.sh:
+ chooser.sh is now POSIX compliant. Thanks to: Bjorn Lindstrom
+ <bkhl@privat.utfors.se> in bug #20308
06 Jun 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r3.ebuild:
gcc-2 fixes, closing bug #22239 by Tristan Henderson <T.Henderson@cs.ucl.ac.uk>
diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest
index 0bdce4af2b55..a467e6647265 100644
--- a/x11-base/xfree/Manifest
+++ b/x11-base/xfree/Manifest
@@ -1,10 +1,9 @@
MD5 f11ed1feb06c079f6d570a0ca23d647c xfree-4.1.0-r6.ebuild 2963
MD5 44e37bf9fe2e16ebbb6cf0c4c9234a52 xfree-4.3.0-r2.ebuild 31229
-MD5 f7b99998cf439ec72118a881d38c13d0 xfree-4.3.0-r4.ebuild 32171
MD5 e98a09bb43033618521bf046d8d218fd xfree-4.3.0-r1.ebuild 25059
MD5 bd9ddb285a3d2f153656f2639025a9e0 xfree-4.2.1-r2.ebuild 24195
MD5 f7b99998cf439ec72118a881d38c13d0 xfree-4.3.0-r3.ebuild 32171
-MD5 6fef3af9f5f38587720240c66d2e802a ChangeLog 34591
+MD5 bd90e37e3abd861ed5c30d4e38a43c5c ChangeLog 34591
MD5 c702fab31b9adac56477a9a5c16911c4 xfree-4.2.0-r12.ebuild 10302
MD5 ab68703ef80727e333fd52ed5806df2d files/digest-xfree-4.1.0-r6 240
MD5 10e681917f61e8ed068030a373694906 files/xfree-4.2.x-home_end-keys.patch 666
@@ -12,7 +11,6 @@ MD5 e7a9b48bfe345c76aa9a5bf5b3149ea4 files/digest-xfree-4.2.1-r2 10826
MD5 be43a94caab2339e3a00372906f115a0 files/digest-xfree-4.3.0-r1 1384
MD5 07227cb734bf8bc053f2965a3ff77fe6 files/digest-xfree-4.3.0-r2 1928
MD5 b06734d1ff2513316b4fc0c3824b505c files/digest-xfree-4.3.0-r3 2009
-MD5 b06734d1ff2513316b4fc0c3824b505c files/digest-xfree-4.3.0-r4 2009
MD5 21d5f7a63f9dbf1948cc7df8b2bf67fc files/digest-xfree-4.2.0-r12 576
MD5 6c0fe2e04a359ddc367dbd0dd00c61a1 files/xfree-4.2.x.-bison.fixes.patch 2854
MD5 a9371704cf72bcb8d1aa713ca4b27546 files/XFree86-4.2.1-Xft11-Imakefile.patch 341
@@ -36,7 +34,7 @@ MD5 e194f962a63f74c674887c9ade54a5ea files/4.3.0/site.def 3731
MD5 d0cb338160e3be8790524af8071cc4df files/4.3.0/xdm.pamd 380
MD5 fbc03cfe0d80be07ad487d9ec7d9952e files/4.3.0/xfs.conf.d 801
MD5 55ed160cbb7076b1292ea8e3772a2761 files/4.3.0/xfs.config 1331
-MD5 910a3a319f8c0a87f4a2ac56d9826e80 files/4.3.0/chooser.sh 1584
+MD5 7b0aac9992e53a3da3ecfef90b81b528 files/4.3.0/chooser.sh 1584
MD5 10279070c11de97f1b61ec707676ec37 files/4.3.0/startDM.sh 901
MD5 df994262f837448b346405eb7b7a997c files/4.3.0/xdm.start 2853
MD5 a29418c10f780d4bfebbd346be495c43 files/4.3.0/xfs.start 6661
diff --git a/x11-base/xfree/files/4.3.0/chooser.sh b/x11-base/xfree/files/4.3.0/chooser.sh
index 1e25d530f509..46dbc677d10e 100644
--- a/x11-base/xfree/files/4.3.0/chooser.sh
+++ b/x11-base/xfree/files/4.3.0/chooser.sh
@@ -2,13 +2,13 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License, v2 or later
# Author: Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.3.0/chooser.sh,v 1.1 2003/02/28 04:28:29 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.3.0/chooser.sh,v 1.2 2003/06/15 04:02:47 seemant Exp $
# If $XSESSION is "", source first /etc/conf.d/basic, and then /etc/rc.conf
if [ -z "${XSESSION}" ]
then
- [ -f /etc/conf.d/basic ] && source /etc/conf.d/basic
- [ -f /etc/rc.conf ] && source /etc/rc.conf
+ [ -f /etc/conf.d/basic ] && . /etc/conf.d/basic
+ [ -f /etc/rc.conf ] && . /etc/rc.conf
fi
# Find a match for $XSESSION in /etc/X11/Sessions