[PC-BSD Commits] r4005 - in pcbsd/trunk/system-overlay/usr/PCBSD: Scripts/System Services/cups Services/denyhosts Services/hplip bin conf local/bin local/etc local/etc/cups local/etc/foomatic local/etc/hp local/etc/periodic/monthly local/etc/rc.d local/kde4/share/apps/kdm/sessions local/kde4/share/config/kdm local/lib/nspluginwrapper/noarch local/libexec/cups/filter local/share/applications local/share/fluxbox local/share/mime/packages xorg-gui/bin xorg-gui/cardDetect xorg-gui/conf xorg-gui/conf/.fluxbox xorg-gui/templates/header
svn at pcbsd.org
svn at pcbsd.org
Fri May 29 07:12:31 PDT 2009
Author: kris
Date: 2009-05-29 07:12:31 -0700 (Fri, 29 May 2009)
New Revision: 4005
Modified:
pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/System/fastest_cvsup
pcbsd/trunk/system-overlay/usr/PCBSD/Services/cups/restart.sh
pcbsd/trunk/system-overlay/usr/PCBSD/Services/cups/start.sh
pcbsd/trunk/system-overlay/usr/PCBSD/Services/cups/stop.sh
pcbsd/trunk/system-overlay/usr/PCBSD/Services/denyhosts/restart.sh
pcbsd/trunk/system-overlay/usr/PCBSD/Services/denyhosts/start.sh
pcbsd/trunk/system-overlay/usr/PCBSD/Services/denyhosts/stop.sh
pcbsd/trunk/system-overlay/usr/PCBSD/Services/hplip/restart.sh
pcbsd/trunk/system-overlay/usr/PCBSD/Services/hplip/run-toolbox.sh
pcbsd/trunk/system-overlay/usr/PCBSD/Services/hplip/start.sh
pcbsd/trunk/system-overlay/usr/PCBSD/Services/hplip/stop.sh
pcbsd/trunk/system-overlay/usr/PCBSD/bin/pdm
pcbsd/trunk/system-overlay/usr/PCBSD/conf/pcbsdbase
pcbsd/trunk/system-overlay/usr/PCBSD/local/bin/foomatic-rip
pcbsd/trunk/system-overlay/usr/PCBSD/local/bin/lpr
pcbsd/trunk/system-overlay/usr/PCBSD/local/bin/lprsetup.sh
pcbsd/trunk/system-overlay/usr/PCBSD/local/bin/unix-lpr.sh
pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/cups/cupsd.conf
pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/denyhosts.conf
pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/foomatic/filter.conf
pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/hp/hplip.conf
pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/periodic/monthly/300.statistics
pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/rc.d/bsdstats.sh
pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/rc.d/cupsd
pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/rc.d/hald
pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/apps/kdm/sessions/kde.desktop
pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/README
pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xreset
pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xresources
pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xservers
pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xsession
pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xstartup
pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/backgroundrc
pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/kdmrc
pcbsd/trunk/system-overlay/usr/PCBSD/local/lib/nspluginwrapper/noarch/npviewer
pcbsd/trunk/system-overlay/usr/PCBSD/local/libexec/cups/filter/foomatic-rip-hplip
pcbsd/trunk/system-overlay/usr/PCBSD/local/share/applications/hplip.desktop
pcbsd/trunk/system-overlay/usr/PCBSD/local/share/fluxbox/init
pcbsd/trunk/system-overlay/usr/PCBSD/local/share/mime/packages/freedesktop.org.xml
pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/bin/rundetect.sh
pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/cardDetect/XF86Config.compat
pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/cardDetect/XF86Config.default
pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/cardDetect/x_config.sh
pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/conf/.fluxbox/init
pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/conf/xorg.conf.basic
pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/header/ati-3d-enable.xorg.conf
pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/header/ati.xorg.conf
pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/header/intel-3d-enable.xorg.conf
pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/header/intel.xorg.conf
pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/header/mga-3d-enable.xorg.conf
pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/header/nvidia.xorg.conf
pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/header/xorg.conf.generic
Log:
Finished updating our system-overlay to new /usr/PCBSD localbase
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/System/fastest_cvsup
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/System/fastest_cvsup 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/System/fastest_cvsup 2009-05-29 14:12:31 UTC (rev 4005)
@@ -695,7 +695,7 @@
#!/bin/sh
if SERVER=`fastest_cvsup -q -c uk`; then
- cvsup -h $SERVER /PCBSD/local/etc/cvsup/supfile
+ cvsup -h $SERVER /usr/PCBSD/local/etc/cvsup/supfile
fi
=back
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Services/cups/restart.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Services/cups/restart.sh 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Services/cups/restart.sh 2009-05-29 14:12:31 UTC (rev 4005)
@@ -13,7 +13,7 @@
${DIR}/enable.sh
fi
-/PCBSD/local/etc/rc.d/cupsd restart
+/usr/PCBSD/local/etc/rc.d/cupsd restart
ERR=$?
if [ "${ENABLED}" = "NO" ]
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Services/cups/start.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Services/cups/start.sh 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Services/cups/start.sh 2009-05-29 14:12:31 UTC (rev 4005)
@@ -13,7 +13,7 @@
${DIR}/enable.sh
fi
-/PCBSD/local/etc/rc.d/cupsd start
+/usr/PCBSD/local/etc/rc.d/cupsd start
ERR=$?
if [ "${ENABLED}" = "NO" ]
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Services/cups/stop.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Services/cups/stop.sh 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Services/cups/stop.sh 2009-05-29 14:12:31 UTC (rev 4005)
@@ -13,7 +13,7 @@
${DIR}/enable.sh
fi
-/PCBSD/local/etc/rc.d/cupsd stop
+/usr/PCBSD/local/etc/rc.d/cupsd stop
ERR=$?
if [ "${ENABLED}" = "NO" ]
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Services/denyhosts/restart.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Services/denyhosts/restart.sh 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Services/denyhosts/restart.sh 2009-05-29 14:12:31 UTC (rev 4005)
@@ -12,7 +12,7 @@
${DIR}/enable.sh
fi
-/PCBSD/local/etc/rc.d/denyhosts.sh restart
+/usr/PCBSD/local/etc/rc.d/denyhosts.sh restart
ERR=$?
if [ "${ENABLED}" = "NO" ]
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Services/denyhosts/start.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Services/denyhosts/start.sh 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Services/denyhosts/start.sh 2009-05-29 14:12:31 UTC (rev 4005)
@@ -12,7 +12,7 @@
${DIR}/enable.sh
fi
-/PCBSD/local/etc/rc.d/denyhosts.sh start
+/usr/PCBSD/local/etc/rc.d/denyhosts.sh start
ERR=$?
if [ "${ENABLED}" = "NO" ]
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Services/denyhosts/stop.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Services/denyhosts/stop.sh 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Services/denyhosts/stop.sh 2009-05-29 14:12:31 UTC (rev 4005)
@@ -12,7 +12,7 @@
${DIR}/enable.sh
fi
-/PCBSD/local/etc/rc.d/denyhosts.sh stop
+/usr/PCBSD/local/etc/rc.d/denyhosts.sh stop
ERR=$?
if [ "${ENABLED}" = "NO" ]
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Services/hplip/restart.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Services/hplip/restart.sh 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Services/hplip/restart.sh 2009-05-29 14:12:31 UTC (rev 4005)
@@ -2,7 +2,7 @@
# This script restarts a currently running service
# Return a "0" on success, or a "1" on failure
-/PCBSD/local/etc/rc.d/hpssd restart
+/usr/PCBSD/local/etc/rc.d/hpssd restart
if [ "$?" = "0" ]
then
exit 0
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Services/hplip/run-toolbox.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Services/hplip/run-toolbox.sh 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Services/hplip/run-toolbox.sh 2009-05-29 14:12:31 UTC (rev 4005)
@@ -1,23 +1,23 @@
#!/bin/sh
# Check if the hplip service is running
-/PCBSD/Services/hplip/isRunning.sh
+/usr/PCBSD/Services/hplip/isRunning.sh
if [ "$?" = "0" ]
then
- /PCBSD/local/share/hplip/toolbox.py
+ /usr/PCBSD/local/share/hplip/toolbox.py
else
kdialog --title "HPLIP not available" --yesno "The HPLIP service is not running! Do you wish to enable it to continue? (It may be disabled from System Settings -> Service Manager)"
if [ "$?" = "0" ]
then
- kdesu /PCBSD/Services/hplip/enable.sh
+ kdesu /usr/PCBSD/Services/hplip/enable.sh
sleep 1
# Check if the hplip service is running
- /PCBSD/Services/hplip/isRunning.sh
+ /usr/PCBSD/Services/hplip/isRunning.sh
if [ "$?" = "0" ]
then
- /PCBSD/local/share/hplip/toolbox.py
+ /usr/PCBSD/local/share/hplip/toolbox.py
else
kdialog --title "HPLIP not available" --error "Failed to start HPLIP!"
fi
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Services/hplip/start.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Services/hplip/start.sh 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Services/hplip/start.sh 2009-05-29 14:12:31 UTC (rev 4005)
@@ -2,7 +2,7 @@
# This script starts a stopped service
# Return 0 on success, or "1" on failure
-/PCBSD/local/etc/rc.d/hpssd start
+/usr/PCBSD/local/etc/rc.d/hpssd start
if [ "$?" = "0" ]
then
return 0
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Services/hplip/stop.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Services/hplip/stop.sh 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Services/hplip/stop.sh 2009-05-29 14:12:31 UTC (rev 4005)
@@ -2,7 +2,7 @@
# This script stops a started service
# Return 0 on success, or "1" on failure
-/PCBSD/local/etc/rc.d/hpssd stop
+/usr/PCBSD/local/etc/rc.d/hpssd stop
if [ "$?" = "0" ]
then
return 0
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/bin/pdm
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/bin/pdm 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/bin/pdm 2009-05-29 14:12:31 UTC (rev 4005)
@@ -4,7 +4,7 @@
###############################################################################
# Setup PATH with our binary locations
-PATH="${PATH}:/PCBSD/local/bin:/PCBSD/local/sbin:/PCBSD/local/kde4/bin"
+PATH="${PATH}:/usr/PCBSD/local/bin:/usr/PCBSD/local/sbin:/usr/PCBSD/local/kde4/bin"
export PATH
LD_ELF_HINTS_PATH="/var/run/ld-pcbsd-elf.so.hints"
@@ -12,24 +12,24 @@
# Check if we need to add our KDEDIRS variable to startkde4
-grep ^KDEDIRS= /PCBSD/local/kde4/bin/startkde >/dev/null 2>/dev/null
+grep ^KDEDIRS= /usr/PCBSD/local/kde4/bin/startkde >/dev/null 2>/dev/null
if [ "$?" != "0" ]
then
- awk '{sub(/# When the/,"KDEDIRS=\"`kde4-config --prefix`:`kde-config --prefix`:/Programs/kde\" ; export KDEDIRS\n\n# When the");print}' < /PCBSD/local/kde4/bin/startkde >/tmp/$$.awk
- mv /tmp/$$.awk /PCBSD/local/kde4/bin/startkde
- chmod 755 /PCBSD/local/kde4/bin/startkde
+ awk '{sub(/# When the/,"KDEDIRS=\"`kde4-config --prefix`:`kde-config --prefix`:/Programs/kde\" ; export KDEDIRS\n\n# When the");print}' < /usr/PCBSD/local/kde4/bin/startkde >/tmp/$$.awk
+ mv /tmp/$$.awk /usr/PCBSD/local/kde4/bin/startkde
+ chmod 755 /usr/PCBSD/local/kde4/bin/startkde
fi
setup_xorg() {
- /PCBSD/xorg-gui/bin/rundetect.sh
- rm -f /PCBSD/conf/.runxsetup
+ /usr/PCBSD/xorg-gui/bin/rundetect.sh
+ rm -f /usr/PCBSD/conf/.runxsetup
}
setup_xvesa() {
echo "Using failsafe VESA 1024x768 mode..." >/dev/console
rm /etc/X11/xorg.conf
- cp /PCBSD/xorg-gui/cardDetect/XF86Config.compat /etc/X11/xorg.conf
- rm -f/PCBSD/conf/.runxsetup
+ cp /usr/PCBSD/xorg-gui/cardDetect/XF86Config.compat /etc/X11/xorg.conf
+ rm -f/usr/PCBSD/conf/.runxsetup
}
xvesa="NO"
@@ -39,7 +39,7 @@
fi
# Check if we need to set the LANG variable so that KDM works with i18n
-KLANG="`grep ^Language= /PCBSD/local/kde4/share/config/kdm/kdmrc | cut -d '=' -f 2`"
+KLANG="`grep ^Language= /usr/PCBSD/local/kde4/share/config/kdm/kdmrc | cut -d '=' -f 2`"
if [ "$KLANG" != "" -a "${KLANG}" != "en_US" ]
then
# Check if we have a .UTF-8 or some other extension and add it if missing
@@ -71,7 +71,7 @@
setup_xorg
fi
else
- exec /PCBSD/local/kde4/bin/kdm "$@"
+ exec /usr/PCBSD/local/kde4/bin/kdm "$@"
fi
sleep 2
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/conf/pcbsdbase
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/conf/pcbsdbase 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/conf/pcbsdbase 2009-05-29 14:12:31 UTC (rev 4005)
@@ -1 +1 @@
-/PCBSD/local
+/usr/PCBSD/local
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/local/bin/foomatic-rip
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/local/bin/foomatic-rip 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/local/bin/foomatic-rip 2009-05-29 14:12:31 UTC (rev 4005)
@@ -44,10 +44,10 @@
# possibly other stuff. The default path is often fine on Linux, but
# may not be on other systems.
#
-my $execpath = "/PCBSD/local/bin:/usr/local/bin:/usr/bin:/bin";
+my $execpath = "/usr/PCBSD/local/bin:/usr/local/bin:/usr/bin:/bin";
# CUPS raster drivers are searched here
-my $cupsfilterpath = "/PCBSD/local/lib/cups/filter:/PCBSD/local/libexec/cups/filter:/opt/cups/filter:/usr/lib/cups/filter";
+my $cupsfilterpath = "/usr/PCBSD/local/lib/cups/filter:/usr/PCBSD/local/libexec/cups/filter:/opt/cups/filter:/usr/lib/cups/filter";
# Location of the configuration file "filter.conf", this file can be
# used to change the settings of foomatic-rip without editing
@@ -55,7 +55,7 @@
# of the directory which contains the configuration file, usually
# "/etc/foomatic".
# Some versions of configure do not fully expand $sysconfdir
-my $prefix = "/PCBSD/local";
+my $prefix = "/usr/PCBSD/local";
my $configpath = "${prefix}/etc/foomatic";
# For the stuff below, the settings in the configuration file have priority.
@@ -877,12 +877,12 @@
$ppdfile = "$configpath/${printer}.ppd";
} elsif (-r "/etc/cups/ppd/${printer}.ppd") { # CUPS config dir
$ppdfile = "/etc/cups/ppd/${printer}.ppd";
- } elsif (-r "/PCBSD/local/etc/cups/ppd/${printer}.ppd") {
- $ppdfile = "/PCBSD/local/etc/cups/ppd/${printer}.ppd";
+ } elsif (-r "/usr/PCBSD/local/etc/cups/ppd/${printer}.ppd") {
+ $ppdfile = "/usr/PCBSD/local/etc/cups/ppd/${printer}.ppd";
} elsif (-r "/usr/share/ppr/PPDFiles/${printer}.ppd") { # PPR PPDs
$ppdfile = "/usr/share/ppr/PPDFiles/${printer}.ppd";
- } elsif (-r "/PCBSD/local/share/ppr/PPDFiles/${printer}.ppd") {
- $ppdfile = "/PCBSD/local/share/ppr/PPDFiles/${printer}.ppd";
+ } elsif (-r "/usr/PCBSD/local/share/ppr/PPDFiles/${printer}.ppd") {
+ $ppdfile = "/usr/PCBSD/local/share/ppr/PPDFiles/${printer}.ppd";
} else {
rip_die ("There is no readable PPD file for the printer " .
"$printer, is it configured?",
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/local/bin/lpr
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/local/bin/lpr 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/local/bin/lpr 2009-05-29 14:12:31 UTC (rev 4005)
@@ -1,2 +1,2 @@
#!/bin/sh
-/PCBSD/local/bin/gtklp "$@"
+/usr/PCBSD/local/bin/gtklp "$@"
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/local/bin/lprsetup.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/local/bin/lprsetup.sh 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/local/bin/lprsetup.sh 2009-05-29 14:12:31 UTC (rev 4005)
@@ -15,7 +15,7 @@
# The kind of printer (accepted values: 'parallel' and 'serial')
PRINTERTYPE=parallel
-GSDIR=/PCBSD/local/lib/ghostscript
+GSDIR=/usr/PCBSD/local/lib/ghostscript
GSFILTERDIR=$GSDIR/filt
SPOOLDIR=/var/spool
GSIF=unix-lpr.sh
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/local/bin/unix-lpr.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/local/bin/unix-lpr.sh 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/local/bin/unix-lpr.sh 2009-05-29 14:12:31 UTC (rev 4005)
@@ -20,10 +20,10 @@
# executable name set in the makefile
GS_EXECUTABLE=gs
-PBMPLUSPATH=/PCBSD/local/bin
-PSFILTERPATH=/PCBSD/local/lib/ghostscript
-LOCALPATH=/PCBSD/local/bin
-X11HOME=/PCBSD/local
+PBMPLUSPATH=/usr/PCBSD/local/bin
+PSFILTERPATH=/usr/PCBSD/local/lib/ghostscript
+LOCALPATH=/usr/PCBSD/local/bin
+X11HOME=/usr/PCBSD/local
PATH=/bin:/usr/bin:/usr/ucb:/usr/etc
PATH=${PATH}\:${LOCALPATH}\:${PBMPLUSPATH}\:${PSFILTERPATH}
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/cups/cupsd.conf
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/cups/cupsd.conf 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/cups/cupsd.conf 2009-05-29 14:12:31 UTC (rev 4005)
@@ -139,7 +139,7 @@
#
#ServerCertificate /etc/cups/ssl/server.crt
-ServerCertificate /PCBSD/local/etc/cups/ssl/server.crt
+ServerCertificate /usr/PCBSD/local/etc/cups/ssl/server.crt
# Encryption key (ServerKey)
#
@@ -150,7 +150,7 @@
#
#ServerKey /etc/cups/ssl/server.key
-ServerKey /PCBSD/local/etc/cups/ssl/server.key
+ServerKey /usr/PCBSD/local/etc/cups/ssl/server.key
# Access permissions
#
@@ -568,7 +568,7 @@
#
#DataDir /usr/share/cups
-DataDir /PCBSD/local/share/cups
+DataDir /usr/PCBSD/local/share/cups
# Document directory (DocumentRoot)
#
@@ -579,7 +579,7 @@
#
#DocumentRoot /usr/share/cups/doc
-DocumentRoot /PCBSD/local/share/doc/cups
+DocumentRoot /usr/PCBSD/local/share/doc/cups
# Font path (FontPath)
#
@@ -611,7 +611,7 @@
#
#ServerBin /usr/lib/cups
-ServerBin /PCBSD/local/libexec/cups
+ServerBin /usr/PCBSD/local/libexec/cups
# Server files (ServerRoot)
#
@@ -622,7 +622,7 @@
#
#ServerRoot /etc/cups
-ServerRoot /PCBSD/local/etc/cups
+ServerRoot /usr/PCBSD/local/etc/cups
# Temporary files (TempDir)
#
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/denyhosts.conf
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/denyhosts.conf 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/denyhosts.conf 2009-05-29 14:12:31 UTC (rev 4005)
@@ -152,7 +152,7 @@
# Note: it is recommended that you use an absolute pathname
# for this value (eg. /home/foo/denyhosts/data)
#
-WORK_DIR = /PCBSD/local/share/denyhosts/data
+WORK_DIR = /usr/PCBSD/local/share/denyhosts/data
#
#######################################################################
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/foomatic/filter.conf
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/foomatic/filter.conf 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/foomatic/filter.conf 2009-05-29 14:12:31 UTC (rev 4005)
@@ -35,8 +35,8 @@
# gspath: gs
# Set the PATH value to be used by foomatic-rip:
-execpath: /PCBSD/local/bin:/usr/bin:/bin
+execpath: /usr/PCBSD/local/bin:/usr/bin:/bin
# Set the directories in which foomatic-rip should search for CUPS filters:
-cupsfilterpath: /PCBSD/local/lib/cups/filter:/PCBSD/local/libexec/cups/filter:/opt/cups/filter:/usr/lib/cups/filter
+cupsfilterpath: /usr/PCBSD/local/lib/cups/filter:/usr/PCBSD/local/libexec/cups/filter:/opt/cups/filter:/usr/lib/cups/filter
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/hp/hplip.conf
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/hp/hplip.conf 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/hp/hplip.conf 2009-05-29 14:12:31 UTC (rev 4005)
@@ -14,11 +14,11 @@
jdprobe=0
[dirs]
-home=/PCBSD/local/share/hplip
+home=/usr/PCBSD/local/share/hplip
run=/var/run
-ppd=/PCBSD/local/share/ppd/HP
-ppdbase=/PCBSD/local/share/ppd
-doc=/PCBSD/local/share/doc/hplip-1.7.4a
+ppd=/usr/PCBSD/local/share/ppd/HP
+ppdbase=/usr/PCBSD/local/share/ppd
+doc=/usr/PCBSD/local/share/doc/hplip-1.7.4a
# Following values are determined at configure time and cannot be changed.
[configure]
@@ -31,5 +31,5 @@
installinitd=
chkconfig=
internal-tag=1.7.4.13
-home=/PCBSD/local/share/hplip
-ppd=/PCBSD/local/share/ppd
+home=/usr/PCBSD/local/share/hplip
+ppd=/usr/PCBSD/local/share/ppd
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/periodic/monthly/300.statistics
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/periodic/monthly/300.statistics 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/periodic/monthly/300.statistics 2009-05-29 14:12:31 UTC (rev 4005)
@@ -27,7 +27,7 @@
bsdstats_log=${monthly_statistics_logfile:-"/var/log/bsdstats"}
id_token_file='/var/db/bsdstats'
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:/PCBSD/local/sbin:/PCBSD/local/bin:/usr/local/sbin:/usr/local/bin
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/PCBSD/local/sbin:/usr/PCBSD/local/bin:/usr/local/sbin:/usr/local/bin
export PATH
unset HTTP_USER_AGENT
@@ -397,7 +397,7 @@
case "$monthly_statistics_enable" in
[Yy][Ee][Ss])
check_dns
- REL="`/PCBSD/local/bin/pbreg get /PC-BSD/Version`"
+ REL="`/usr/PCBSD/local/bin/pbreg get /PC-BSD/Version`"
ARCH=`/usr/bin/uname -m`
OS="PC-BSD"
get_id_token
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/rc.d/bsdstats.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/rc.d/bsdstats.sh 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/rc.d/bsdstats.sh 2009-05-29 14:12:31 UTC (rev 4005)
@@ -21,7 +21,7 @@
name=bsdstats
rcvar=`set_rcvar`
-command=/PCBSD/local/etc/periodic/monthly/300.statistics
+command=/usr/PCBSD/local/etc/periodic/monthly/300.statistics
# default to disable
bsdstats_enable=${bsdstats_enable:-"NO"}
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/rc.d/cupsd
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/rc.d/cupsd 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/rc.d/cupsd 2009-05-29 14:12:31 UTC (rev 4005)
@@ -11,7 +11,7 @@
# cupsd_enable="YES"
#
-LD_LIBRARY_PATH="/PCBSD/local/lib" ; export LD_LIBRARY_PATH
+LD_LIBRARY_PATH="/usr/PCBSD/local/lib" ; export LD_LIBRARY_PATH
. /etc/rc.subr
@@ -20,7 +20,7 @@
start_precmd=${name}_prestart
-command=/PCBSD/local/sbin/cupsd
+command=/usr/PCBSD/local/sbin/cupsd
extra_commands=reload
cupsd_prestart()
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/rc.d/hald
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/rc.d/hald 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/rc.d/hald 2009-05-29 14:12:31 UTC (rev 4005)
@@ -12,9 +12,9 @@
#
. /etc/rc.subr
-. /PCBSD/local/etc/gnome.subr
+. /usr/PCBSD/local/etc/gnome.subr
-LD_LIBRARY_PATH="/PCBSD/local/lib" ; export LD_LIBRARY_PATH
+LD_LIBRARY_PATH="/usr/PCBSD/local/lib" ; export LD_LIBRARY_PATH
hald_enable=${hald_enable-${gnome_enable}}
@@ -23,7 +23,7 @@
name=hald
rcvar=`set_rcvar`
-command="/PCBSD/local/sbin/hald"
+command="/usr/PCBSD/local/sbin/hald"
pidfile="/var/run/${name}/${name}.pid"
stop_postcmd="hald_postcmd"
@@ -33,12 +33,12 @@
local_force_depend()
{
_depend="$1"
- if [ -f /PCBSD/local/etc/rc.d/${_depend}.sh ]; then
+ if [ -f /usr/PCBSD/local/etc/rc.d/${_depend}.sh ]; then
_depend="${_depend}.sh"
fi
- if ! /PCBSD/local/etc/rc.d/${_depend} forcestatus 1>/dev/null 2>&1 &&
- ! /PCBSD/local/etc/rc.d/${_depend} forcestart; then
+ if ! /usr/PCBSD/local/etc/rc.d/${_depend} forcestatus 1>/dev/null 2>&1 &&
+ ! /usr/PCBSD/local/etc/rc.d/${_depend} forcestart; then
return 1
fi
return 0
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/apps/kdm/sessions/kde.desktop
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/apps/kdm/sessions/kde.desktop 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/apps/kdm/sessions/kde.desktop 2009-05-29 14:12:31 UTC (rev 4005)
@@ -1,8 +1,8 @@
[Desktop Entry]
Encoding=UTF-8
Type=XSession
-Exec=/PCBSD/local/kde4/bin/startkde4
-TryExec=/PCBSD/local/kde4/bin/startkde4
+Exec=/usr/PCBSD/local/kde4/bin/startkde4
+TryExec=/usr/PCBSD/local/kde4/bin/startkde4
Name=KDE
Name[hi]=केडीई
Name[mn]=КДЭ
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/README
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/README 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/README 2009-05-29 14:12:31 UTC (rev 4005)
@@ -1,20 +1,20 @@
This automatically generated configuration consists of the following files:
-- /PCBSD/local/kde4/share/config/kdm/kdmrc
-- /PCBSD/local/kde4/share/config/kdm/Xaccess
-- /PCBSD/local/kde4/share/config/kdm/Xwilling
-- /PCBSD/local/kde4/share/config/kdm/Xsetup
-- /PCBSD/local/kde4/share/config/kdm/Xstartup
-- /PCBSD/local/kde4/share/config/kdm/Xreset
-- /PCBSD/local/kde4/share/config/kdm/Xsession
-- /PCBSD/local/kde4/share/config/kdm/backgroundrc
+- /usr/PCBSD/local/kde4/share/config/kdm/kdmrc
+- /usr/PCBSD/local/kde4/share/config/kdm/Xaccess
+- /usr/PCBSD/local/kde4/share/config/kdm/Xwilling
+- /usr/PCBSD/local/kde4/share/config/kdm/Xsetup
+- /usr/PCBSD/local/kde4/share/config/kdm/Xstartup
+- /usr/PCBSD/local/kde4/share/config/kdm/Xreset
+- /usr/PCBSD/local/kde4/share/config/kdm/Xsession
+- /usr/PCBSD/local/kde4/share/config/kdm/backgroundrc
This config was derived from existing files. As the used algorithms are
pretty dumb, it may be broken.
Information from these files was extracted:
-- /PCBSD/local/kde4/share/config/kdm/kdmrc
+- /usr/PCBSD/local/kde4/share/config/kdm/kdmrc
These files were directly incorporated:
-- /PCBSD/local/kde4/share/config/kdm/Xaccess
-- /PCBSD/local/kde4/share/config/kdm/backgroundrc
+- /usr/PCBSD/local/kde4/share/config/kdm/Xaccess
+- /usr/PCBSD/local/kde4/share/config/kdm/backgroundrc
Old files that would have been overwritten were renamed to <oldname>.bak.
Try 'genkdmconf --help' if you want to generate another configuration.
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xreset
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xreset 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xreset 2009-05-29 14:12:31 UTC (rev 4005)
@@ -7,4 +7,4 @@
#chown root /dev/console
#chmod 622 /dev/console
-#exec sessreg -d -l $DISPLAY -h "`echo $DISPLAY | cut -d: -f1`" -x /PCBSD/local/kde4/share/config/kdm/Xservers $USER
+#exec sessreg -d -l $DISPLAY -h "`echo $DISPLAY | cut -d: -f1`" -x /usr/PCBSD/local/kde4/share/config/kdm/Xservers $USER
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xresources
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xresources 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xresources 2009-05-29 14:12:31 UTC (rev 4005)
@@ -68,9 +68,9 @@
#endif
#if PLANES >= 8
-xlogin*logoFileName: /PCBSD/local/lib/X11/xdm/pixmaps/xorg.xpm
+xlogin*logoFileName: /usr/PCBSD/local/lib/X11/xdm/pixmaps/xorg.xpm
#else
-xlogin*logoFileName: /PCBSD/local/lib/X11/xdm/pixmaps/xorg-bw.xpm
+xlogin*logoFileName: /usr/PCBSD/local/lib/X11/xdm/pixmaps/xorg-bw.xpm
#endif
xlogin*useShape: true
xlogin*logoPadding: 10
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xservers
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xservers 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xservers 2009-05-29 14:12:31 UTC (rev 4005)
@@ -10,4 +10,4 @@
# look like:
# XTerminalName:0 foreign
#
-:0 local /PCBSD/local/bin/X :0
+:0 local /usr/PCBSD/local/bin/X :0
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xsession
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xsession 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xsession 2009-05-29 14:12:31 UTC (rev 4005)
@@ -56,7 +56,7 @@
exec $HOME/.xsession
;;
default)
- exec /PCBSD/local/kde4/bin/startkde
+ exec /usr/PCBSD/local/kde4/bin/startkde
;;
*)
eval exec "$session"
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xstartup
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xstartup 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xstartup 2009-05-29 14:12:31 UTC (rev 4005)
@@ -10,6 +10,6 @@
#
#chown $USER /dev/console
-#exec sessreg -a -l $DISPLAY -h "`echo $DISPLAY | cut -d: -f1`" -x /PCBSD/local/kde4/share/config/kdm/Xservers $USER
+#exec sessreg -a -l $DISPLAY -h "`echo $DISPLAY | cut -d: -f1`" -x /usr/PCBSD/local/kde4/share/config/kdm/Xservers $USER
# NOTE: The session is aborted if the last command returns non-zero.
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/backgroundrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/backgroundrc 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/backgroundrc 2009-05-29 14:12:31 UTC (rev 4005)
@@ -13,6 +13,6 @@
Program=
ReverseBlending=false
UseSHM=false
-Wallpaper=/PCBSD/local/kde4/share/wallpapers/Galileo/contents/images/1600x1200.png
+Wallpaper=/usr/PCBSD/local/kde4/share/wallpapers/Galileo/contents/images/1600x1200.png
WallpaperList=
WallpaperMode=Scaled
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/kdmrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/kdmrc 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/kdmrc 2009-05-29 14:12:31 UTC (rev 4005)
@@ -116,10 +116,10 @@
#Port=177
# File with the private keys of X-terminals. Required for XDM authentication.
# Default is ""
-#KeyFile=/PCBSD/local/kde4/share/config/kdm/kdmkeys
+#KeyFile=/usr/PCBSD/local/kde4/share/config/kdm/kdmkeys
# XDMCP access control file in the usual XDM-Xaccess format.
-# Default is "/PCBSD/local/kde4/share/config/kdm/Xaccess"
-Xaccess=/PCBSD/local/kde4/share/config/kdm/Xaccess
+# Default is "/usr/PCBSD/local/kde4/share/config/kdm/Xaccess"
+Xaccess=/usr/PCBSD/local/kde4/share/config/kdm/Xaccess
# Number of seconds to wait for display to respond after the user has
# selected a host from the chooser.
# Default is 15
@@ -136,7 +136,7 @@
# DirectQuery or BroadcastQuery requests.
# If empty, no program is invoked and "Willing to manage" is sent.
# Default is ""
-Willing=/PCBSD/local/kde4/share/config/kdm/Xwilling
+Willing=/usr/PCBSD/local/kde4/share/config/kdm/Xwilling
[Shutdown]
# The command (subject to word splitting) to run to halt the system.
@@ -204,31 +204,31 @@
#Resources=
# The xrdb program to use to read the above specified recources.
# Subject to word splitting.
-# Default is "/PCBSD/local/bin/xrdb"
+# Default is "/usr/PCBSD/local/bin/xrdb"
#Xrdb=
# A program to run before the greeter is shown. Can be used to start an
# xconsole or an alternative background generator. Subject to word splitting.
# Default is ""
-Setup=/PCBSD/local/kde4/share/config/kdm/Xsetup
+Setup=/usr/PCBSD/local/kde4/share/config/kdm/Xsetup
# A program to run before a user session starts. Subject to word splitting.
# Default is ""
-Startup=/PCBSD/local/kde4/share/config/kdm/Xstartup
+Startup=/usr/PCBSD/local/kde4/share/config/kdm/Xstartup
# A program to run after a user session exits. Subject to word splitting.
# Default is ""
-Reset=/PCBSD/local/kde4/share/config/kdm/Xreset
+Reset=/usr/PCBSD/local/kde4/share/config/kdm/Xreset
# The program which is run as the user which logs in. It is supposed to
# interpret the session argument (see SessionsDirs) and start an appropriate
# session according to it. Subject to word splitting.
-# Default is "/PCBSD/local/bin/xterm -ls -T"
-Session=/PCBSD/local/kde4/share/config/kdm/Xsession
+# Default is "/usr/PCBSD/local/bin/xterm -ls -T"
+Session=/usr/PCBSD/local/kde4/share/config/kdm/Xsession
# The program to run if Session fails.
-# Default is "/PCBSD/local/bin/xterm"
+# Default is "/usr/PCBSD/local/bin/xterm"
#FailsafeClient=
# The PATH for the Session program.
-# Default is "/usr/local/bin:/usr/bin:/bin:/PCBSD/local/bin:/usr/games"
+# Default is "/usr/local/bin:/usr/bin:/bin:/usr/PCBSD/local/bin:/usr/games"
#UserPath=
# The PATH for Setup, Startup and Reset, etc.
-# Default is "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/PCBSD/local/bin"
+# Default is "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/PCBSD/local/bin"
#SystemPath=
# The default system shell.
# Default is "/bin/sh"
@@ -278,8 +278,8 @@
#ScheduledSd=Optional
# The directories containing session type definitions in .desktop format,
# ordered by falling priority.
-# Default is "/PCBSD/local/kde4/share/apps/kdm/sessions"
-SessionsDirs=/PCBSD/local/kde4/share/config/kdm/sessions,/PCBSD/local/kde4/share/apps/kdm/sessions
+# Default is "/usr/PCBSD/local/kde4/share/apps/kdm/sessions"
+SessionsDirs=/usr/PCBSD/local/kde4/share/config/kdm/sessions,/usr/PCBSD/local/kde4/share/apps/kdm/sessions
# The file (relative to $HOME) to redirect the session output to. The
# following character pairs are replaced:
# - %d -> current display
@@ -320,7 +320,7 @@
LogoArea=Logo
# The image to show when LogoArea=Logo.
# Default is ""
-LogoPixmap=/PCBSD/local/kde4/share/apps/kdm/pics/kdelogo.png
+LogoPixmap=/usr/PCBSD/local/kde4/share/apps/kdm/pics/kdelogo.png
# The relative coordinates (X,Y in percent) of the center of the greeter.
# Default is "50,50"
GreeterPos=50,50
@@ -399,7 +399,7 @@
# Default is AdminOnly
FaceSource=AdminOnly
# The directory containing the user images if FaceSource is not UserOnly.
-# Default is "/PCBSD/local/kde4/share/apps/kdm/faces"
+# Default is "/usr/PCBSD/local/kde4/share/apps/kdm/faces"
#FaceDir=/usr/share/faces
# Specify, if/which user should be preselected for log in.
# "None" - do not preselect any user
@@ -420,8 +420,8 @@
# Default is true
UseBackground=true
# The configuration file to be used by krootimage.
-# Default is "/PCBSD/local/kde4/share/config/kdm/backgroundrc"
-BackgroundCfg=/PCBSD/local/kde4/share/config/kdm/backgroundrc
+# Default is "/usr/PCBSD/local/kde4/share/config/kdm/backgroundrc"
+BackgroundCfg=/usr/PCBSD/local/kde4/share/config/kdm/backgroundrc
# Hold the X-server grabbed the whole time the greeter is visible. This
# may be more secure, but it will disable any background and other
# X-clients started from the Setup script.
@@ -458,14 +458,14 @@
# as much as possible of the session that is going to be started (most
# probably).
# Default is ""
-Preloader=/PCBSD/local/kde4/bin/preloadkde
+Preloader=/usr/PCBSD/local/kde4/bin/preloadkde
# Whether the greeter should be themed.
# Default is false
UseTheme=true
# The theme to use for the greeter. Can point to either a directory or an XML
# file.
# Default is ""
-Theme=/PCBSD/local/kde4/share/apps/kdm/themes/galileo
+Theme=/usr/PCBSD/local/kde4/share/apps/kdm/themes/galileo
# Core config for local displays
[X-:*-Core]
@@ -478,8 +478,8 @@
#ServerTimeout=15
# The command line to start the X-server, without display number and VT spec.
# This string is subject to word splitting.
-# Default is "/PCBSD/local/bin/X"
-ServerCmd=/PCBSD/local/bin/X -br
+# Default is "/usr/PCBSD/local/bin/X"
+ServerCmd=/usr/PCBSD/local/bin/X -br
# Additional arguments for the X-servers for local sessions.
# This string is subject to word splitting.
# Default is ""
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/local/lib/nspluginwrapper/noarch/npviewer
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/local/lib/nspluginwrapper/noarch/npviewer 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/local/lib/nspluginwrapper/noarch/npviewer 2009-05-29 14:12:31 UTC (rev 4005)
@@ -4,7 +4,7 @@
#
OS="`uname -s`"
ARCH="`uname -m`"
-NPW_LIBDIR="/PCBSD/local/lib/nspluginwrapper"
+NPW_LIBDIR="/usr/PCBSD/local/lib/nspluginwrapper"
if test -z "$TARGET_OS"; then
echo "*** NSPlugin Viewer *** error, TARGET_OS not initialized"
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/local/libexec/cups/filter/foomatic-rip-hplip
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/local/libexec/cups/filter/foomatic-rip-hplip 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/local/libexec/cups/filter/foomatic-rip-hplip 2009-05-29 14:12:31 UTC (rev 4005)
@@ -44,10 +44,10 @@
# possibly other stuff. The default path is often fine on Linux, but
# may not be on other systems.
#
-my $execpath = "NONE/bin:/PCBSD/local/bin:/usr/bin:/bin";
+my $execpath = "NONE/bin:/usr/PCBSD/local/bin:/usr/bin:/bin";
# CUPS raster drivers are searched here
-my $cupsfilterpath = "/PCBSD/local/lib/cups/filter:/PCBSD/local/lib/cups/filter:/PCBSD/local/libexec/cups/filter:/opt/cups/filter:/usr/lib/cups/filter";
+my $cupsfilterpath = "/usr/PCBSD/local/lib/cups/filter:/usr/PCBSD/local/lib/cups/filter:/usr/PCBSD/local/libexec/cups/filter:/opt/cups/filter:/usr/lib/cups/filter";
# Location of the configuration file "filter.conf", this file can be
# used to change the settings of foomatic-rip without editing
@@ -55,7 +55,7 @@
# of the directory which contains the configuration file, usually
# "/etc/foomatic".
# Some versions of configure do not fully expand $sysconfdir
-my $prefix = "/PCBSD/local";
+my $prefix = "/usr/PCBSD/local";
my $configpath = "${prefix}/etc/foomatic";
# For the stuff below, the settings in the configuration file have priority.
@@ -1011,12 +1011,12 @@
$ppdfile = "$configpath/${printer}.ppd";
} elsif (-r "/etc/cups/ppd/${printer}.ppd") { # CUPS config dir
$ppdfile = "/etc/cups/ppd/${printer}.ppd";
- } elsif (-r "/PCBSD/local/etc/cups/ppd/${printer}.ppd") {
- $ppdfile = "/PCBSD/local/etc/cups/ppd/${printer}.ppd";
+ } elsif (-r "/usr/PCBSD/local/etc/cups/ppd/${printer}.ppd") {
+ $ppdfile = "/usr/PCBSD/local/etc/cups/ppd/${printer}.ppd";
} elsif (-r "/usr/share/ppr/PPDFiles/${printer}.ppd") { # PPR PPDs
$ppdfile = "/usr/share/ppr/PPDFiles/${printer}.ppd";
- } elsif (-r "/PCBSD/local/share/ppr/PPDFiles/${printer}.ppd") {
- $ppdfile = "/PCBSD/local/share/ppr/PPDFiles/${printer}.ppd";
+ } elsif (-r "/usr/PCBSD/local/share/ppr/PPDFiles/${printer}.ppd") {
+ $ppdfile = "/usr/PCBSD/local/share/ppr/PPDFiles/${printer}.ppd";
} else {
rip_die ("There is no readable PPD file for the printer " .
"$printer, is it configured?",
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/local/share/applications/hplip.desktop
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/local/share/applications/hplip.desktop 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/local/share/applications/hplip.desktop 2009-05-29 14:12:31 UTC (rev 4005)
@@ -4,8 +4,8 @@
Name=HP Device Manager
GenericName=HP Device Manager
Comment=View device status, ink levels and perform maintenance.
-Exec=/PCBSD/Services/hplip/run-toolbox.sh
-Icon=/PCBSD/local/share/hplip/data/images/HPmenu.png
+Exec=/usr/PCBSD/Services/hplip/run-toolbox.sh
+Icon=/usr/PCBSD/local/share/hplip/data/images/HPmenu.png
Terminal=false
Categories=Application;Utility;
X-KDE-StartupNotify=false
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/local/share/fluxbox/init
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/local/share/fluxbox/init 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/local/share/fluxbox/init 2009-05-29 14:12:31 UTC (rev 4005)
@@ -28,7 +28,7 @@
session.autoRaiseDelay: 250
session.menuFile: ~/.fluxbox/menu
session.cacheLife: 5
-session.styleFile: /PCBSD/local/share/fluxbox/styles/Clean
+session.styleFile: /usr/PCBSD/local/share/fluxbox/styles/Clean
session.keyFile: ~/.fluxbox/keys
session.colorsPerChannel: 4
session.doubleClickInterval: 250
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/local/share/mime/packages/freedesktop.org.xml
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/local/share/mime/packages/freedesktop.org.xml 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/local/share/mime/packages/freedesktop.org.xml 2009-05-29 14:12:31 UTC (rev 4005)
@@ -3379,8 +3379,8 @@
<match value="#! /bin/gawk" type="string" offset="0"/>
<match value="#!/usr/bin/gawk" type="string" offset="0"/>
<match value="#! /usr/bin/gawk" type="string" offset="0"/>
- <match value="#!/PCBSD/local/bin/gawk" type="string" offset="0"/>
- <match value="#! /PCBSD/local/bin/gawk" type="string" offset="0"/>
+ <match value="#!/usr/PCBSD/local/bin/gawk" type="string" offset="0"/>
+ <match value="#! /usr/PCBSD/local/bin/gawk" type="string" offset="0"/>
<match value="#!/bin/awk" type="string" offset="0"/>
<match value="#! /bin/awk" type="string" offset="0"/>
<match value="#!/usr/bin/awk" type="string" offset="0"/>
@@ -8480,7 +8480,7 @@
<sub-class-of type="text/plain"/>
<generic-icon name="text-x-script"/>
<magic priority="50">
- <match value='eval \"exec /PCBSD/local/bin/perl' type="string" offset="0"/>
+ <match value='eval \"exec /usr/PCBSD/local/bin/perl' type="string" offset="0"/>
<match value="/bin/perl" type="string" offset="1:16"/>
<match value="/bin/env perl" type="string" offset="1:16"/>
</magic>
@@ -18491,9 +18491,9 @@
<match value="#!/usr/bin/python" type="string" offset="0"/>
<match value="#! /usr/bin/python" type="string" offset="0"/>
<match value='eval \"exec /usr/bin/python' type="string" offset="0"/>
- <match value="#!/PCBSD/local/bin/python" type="string" offset="0"/>
- <match value="#! /PCBSD/local/bin/python" type="string" offset="0"/>
- <match value='eval \"exec /PCBSD/local/bin/python' type="string" offset="0"/>
+ <match value="#!/usr/PCBSD/local/bin/python" type="string" offset="0"/>
+ <match value="#! /usr/PCBSD/local/bin/python" type="string" offset="0"/>
+ <match value='eval \"exec /usr/PCBSD/local/bin/python' type="string" offset="0"/>
<match value='/bin/env python' type="string" offset="1:16"/>
</magic>
<glob pattern="*.py"/>
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/bin/rundetect.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/bin/rundetect.sh 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/bin/rundetect.sh 2009-05-29 14:12:31 UTC (rev 4005)
@@ -12,20 +12,20 @@
export LD_ELF_HINTS_PATH
# Set all our path variables
-PATH="/sbin:/bin:/usr/sbin:/usr/bin:/root/bin:/PCBSD/local/bin:/PCBSD/local/sbin:/PCBSD/local/kde4/bin"
+PATH="/sbin:/bin:/usr/sbin:/usr/bin:/root/bin:/usr/PCBSD/local/bin:/usr/PCBSD/local/sbin:/usr/PCBSD/local/kde4/bin"
export PATH
# Set the home directory for startx to run properly
HOME="/root" ; export HOME
# Set the log file location
-XLOG="/PCBSD/tmp/xsetup.log" ; export XLOG
+XLOG="/usr/PCBSD/tmp/xsetup.log" ; export XLOG
# Source the language version
-. /PCBSD/LANGS/PCBSDLANG 2>/dev/null
+. /usr/PCBSD/LANGS/PCBSDLANG 2>/dev/null
# Program Directory
-PROGDIR="/PCBSD/xorg-gui" ; export PROGDIR
+PROGDIR="/usr/PCBSD/xorg-gui" ; export PROGDIR
###############################################################################
# Start the script now
@@ -99,7 +99,7 @@
fi
rm -rf /root/.fluxbox
-cp -R /PCBSD/xorg-gui/conf/.fluxbox /root/.fluxbox
+cp -R /usr/PCBSD/xorg-gui/conf/.fluxbox /root/.fluxbox
cd /root/
@@ -115,10 +115,10 @@
# Remove any files from a previous attempt
-rm /PCBSD/xorg-gui/.canceled >/dev/null 2>/dev/null
-rm /PCBSD/xorg-gui/.selected >/dev/null 2>/dev/null
-rm /PCBSD/xorg-gui/.rerunxsetup >/dev/null 2>/dev/null
-rm /PCBSD/xorg-gui/.done >/dev/null 2>/dev/null
+rm /usr/PCBSD/xorg-gui/.canceled >/dev/null 2>/dev/null
+rm /usr/PCBSD/xorg-gui/.selected >/dev/null 2>/dev/null
+rm /usr/PCBSD/xorg-gui/.rerunxsetup >/dev/null 2>/dev/null
+rm /usr/PCBSD/xorg-gui/.done >/dev/null 2>/dev/null
# Set the attempt number to 0
@@ -141,42 +141,42 @@
if [ "${ATTEMPT}" = "0" ]
then
# Use the saved xorg.conf.basic file
- echo "Using saved /PCBSD/xorg-gui/conf/xorg.conf.basic from install..." >/dev/console
- cp /PCBSD/xorg-gui/conf/xorg.conf.basic /etc/X11/xorg.conf
+ echo "Using saved /usr/PCBSD/xorg-gui/conf/xorg.conf.basic from install..." >/dev/console
+ cp /usr/PCBSD/xorg-gui/conf/xorg.conf.basic /etc/X11/xorg.conf
elif [ "${ATTEMPT}" = "1" ]
then
# Try running the driver detection again
rm /etc/X11/xorg.conf
echo "Saved configuration failed... Running auto-detect..." >/dev/console
- /PCBSD/xorg-gui/cardDetect/x_config.sh
+ /usr/PCBSD/xorg-gui/cardDetect/x_config.sh
else
# Still failed, drop to VESA failsafe
echo "Auto-detected settings failed... Using failsafe VESA 1024x768 mode..." >/dev/console
rm /etc/X11/xorg.conf
- cp /PCBSD/xorg-gui/cardDetect/XF86Config.compat /etc/X11/xorg.conf
+ cp /usr/PCBSD/xorg-gui/cardDetect/XF86Config.compat /etc/X11/xorg.conf
fi
# Check if the previous attempt failed
- if [ -e "/PCBSD/xorg-gui/.failed" ]
+ if [ -e "/usr/PCBSD/xorg-gui/.failed" ]
then
- rm /PCBSD/xorg-gui/.failed
+ rm /usr/PCBSD/xorg-gui/.failed
##### Create the xinitrc file
echo '#!/bin/sh
# Set all our path variables
-PATH="/sbin:/bin:/usr/sbin:/usr/bin:/root/bin:/PCBSD/local/bin:/PCBSD/local/sbin:/PCBSD/local/kde4/bin"
+PATH="/sbin:/bin:/usr/sbin:/usr/bin:/root/bin:/usr/PCBSD/local/bin:/usr/PCBSD/local/sbin:/usr/PCBSD/local/kde4/bin"
export PATH
-touch /PCBSD/xorg-gui/.xstartupsuccess
-/PCBSD/local/bin/fluxbox &
+touch /usr/PCBSD/xorg-gui/.xstartupsuccess
+/usr/PCBSD/local/bin/fluxbox &
PID=$!
-/PCBSD/local/kde4/bin/kdialog --msgbox "The previous attempt failed, please check your settings and try again!"
-/PCBSD/xorg-gui/bin/XGUI
+/usr/PCBSD/local/kde4/bin/kdialog --msgbox "The previous attempt failed, please check your settings and try again!"
+/usr/PCBSD/xorg-gui/bin/XGUI
if [ "$?" = "1" ]
then
- /PCBSD/local/kde4/bin/kdialog --msgbox "PC-BSD will now load using the default resolution."
- echo "Canceled" > /PCBSD/xorg-gui/.canceled
+ /usr/PCBSD/local/kde4/bin/kdialog --msgbox "PC-BSD will now load using the default resolution."
+ echo "Canceled" > /usr/PCBSD/xorg-gui/.canceled
fi
kill -9 ${PID}
' > /root/.xinitrc
@@ -187,17 +187,17 @@
echo '#!/bin/sh
# Set all our path variables
-PATH="/sbin:/bin:/usr/sbin:/usr/bin:/root/bin:/PCBSD/local/bin:/PCBSD/local/sbin:/PCBSD/local/kde4/bin"
+PATH="/sbin:/bin:/usr/sbin:/usr/bin:/root/bin:/usr/PCBSD/local/bin:/usr/PCBSD/local/sbin:/usr/PCBSD/local/kde4/bin"
export PATH
-touch /PCBSD/xorg-gui/.xstartupsuccess
-/PCBSD/local/bin/fluxbox &
+touch /usr/PCBSD/xorg-gui/.xstartupsuccess
+/usr/PCBSD/local/bin/fluxbox &
PID=$!
-/PCBSD/xorg-gui/bin/XGUI
+/usr/PCBSD/xorg-gui/bin/XGUI
if [ "$?" = "1" ]
then
- /PCBSD/local/kde4/bin/kdialog --msgbox "PC-BSD will now load using the default resolution."
- echo "Canceled" > /PCBSD/xorg-gui/.canceled
+ /usr/PCBSD/local/kde4/bin/kdialog --msgbox "PC-BSD will now load using the default resolution."
+ echo "Canceled" > /usr/PCBSD/xorg-gui/.canceled
fi
kill -9 ${PID}
@@ -209,36 +209,36 @@
echo "Please wait... Starting X..." >/dev/console
sleep 1
# Start the X gui
- /PCBSD/local/bin/startx 2>>${XLOG}
+ /usr/PCBSD/local/bin/startx 2>>${XLOG}
#### Create the new XF86Config file with the user settings
echo "Generating new Xorg configuration file..." >/dev/console
- /PCBSD/xorg-gui/bin/setupconf.sh >>${XLOG} 2>>${XLOG}
+ /usr/PCBSD/xorg-gui/bin/setupconf.sh >>${XLOG} 2>>${XLOG}
# The user canceled the dialog, and chose to use the default
- if [ -e "/PCBSD/xorg-gui/.canceled" ]
+ if [ -e "/usr/PCBSD/xorg-gui/.canceled" ]
then
break
fi
# Check if a new version of xorg.conf is ready to be tested
- if [ -e "/PCBSD/xorg-gui/.xsettings.sh" ]
+ if [ -e "/usr/PCBSD/xorg-gui/.xsettings.sh" ]
then
- rm /PCBSD/xorg-gui/.selected >/dev/null 2>/dev/null
+ rm /usr/PCBSD/xorg-gui/.selected >/dev/null 2>/dev/null
#### Create the new XF86Config file with the user settings
echo "Generating new Xorg configuration file..." >/dev/console
- /PCBSD/xorg-gui/bin/setupconf.sh >>${XLOG} 2>>${XLOG}
+ /usr/PCBSD/xorg-gui/bin/setupconf.sh >>${XLOG} 2>>${XLOG}
##### Create the xinitrc file
echo '#!/bin/sh
-/PCBSD/local/bin/fluxbox &
+/usr/PCBSD/local/bin/fluxbox &
PID=$!
-/PCBSD/xorg-gui/bin/XGUI -test
+/usr/PCBSD/xorg-gui/bin/XGUI -test
if [ "${?}" = "0" ]
then
- echo "selected" > /PCBSD/xorg-gui/.selected
+ echo "selected" > /usr/PCBSD/xorg-gui/.selected
fi
kill -9 ${PID}
' > /root/.xinitrc
@@ -246,34 +246,34 @@
echo "Please wait... Starting X..." >/dev/console
sleep 1
- /PCBSD/local/bin/startx 2>>${XLOG}
+ /usr/PCBSD/local/bin/startx 2>>${XLOG}
fi
- if [ -e "/PCBSD/xorg-gui/.selected" ]
+ if [ -e "/usr/PCBSD/xorg-gui/.selected" ]
then
break
else
- echo "failed" > /PCBSD/xorg-gui/.failed
+ echo "failed" > /usr/PCBSD/xorg-gui/.failed
fi
# Check if the X startup was a success
- if [ ! -e "/PCBSD/xorg-gui/.xstartupsuccess" ]
+ if [ ! -e "/usr/PCBSD/xorg-gui/.xstartupsuccess" ]
then
ATTEMPT="`expr $ATTEMPT + 1`"
- rm /PCBSD/xorg-gui/.failed
+ rm /usr/PCBSD/xorg-gui/.failed
else
- rm /PCBSD/xorg-gui/.xstartupsuccess
+ rm /usr/PCBSD/xorg-gui/.xstartupsuccess
fi
# Removed any saved settings file
- rm /PCBSD/xorg-gui/.xsettings.sh
+ rm /usr/PCBSD/xorg-gui/.xsettings.sh
done
# Copy over the right ttys file now
-cp /PCBSD/xorg-gui/conf/ttys.normal /etc/ttys
+cp /usr/PCBSD/xorg-gui/conf/ttys.normal /etc/ttys
rm /root/.xinitrc >/dev/null 2>/dev/null
# Check if we need to save an existing .xinitrc file
@@ -289,8 +289,8 @@
mv /root/.fluxbox.xbak /root/.fluxbox
fi
-rm /PCBSD/xorg-gui/.rerunxsetup >/dev/null 2>/dev/null
-rm /PCBSD/xorg-gui/.skipauto >/dev/null 2>/dev/null
+rm /usr/PCBSD/xorg-gui/.rerunxsetup >/dev/null 2>/dev/null
+rm /usr/PCBSD/xorg-gui/.skipauto >/dev/null 2>/dev/null
echo "Preparing to start the desktop..." >/dev/console
sleep 1
kill -HUP 1
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/cardDetect/XF86Config.compat
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/cardDetect/XF86Config.compat 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/cardDetect/XF86Config.compat 2009-05-29 14:12:31 UTC (rev 4005)
@@ -16,31 +16,31 @@
EndSection
Section "Files"
- ModulePath "/PCBSD/local/lib/modules"
- ModulePath "/PCBSD/local/lib/xorg/modules"
- FontPath "/PCBSD/local/lib/X11/fonts/cyrillic/"
- FontPath "/PCBSD/local/lib/X11/fonts/TrueType/"
- FontPath "/PCBSD/local/lib/X11/fonts/illinoy/"
- FontPath "/PCBSD/local/lib/X11/fonts/webfonts/"
- FontPath "/PCBSD/local/lib/X11/fonts/misc/"
- FontPath "/PCBSD/local/lib/X11/fonts/TTF/"
- FontPath "/PCBSD/local/lib/X11/fonts/Speedo/"
- FontPath "/PCBSD/local/lib/X11/fonts/Type1/"
- FontPath "/PCBSD/local/lib/X11/fonts/CID/"
- FontPath "/PCBSD/local/lib/X11/fonts/75dpi/"
- FontPath "/PCBSD/local/lib/X11/fonts/100dpi/"
- FontPath "/PCBSD/local/lib/X11/fonts/dejavu/"
- FontPath "/PCBSD/local/lib/X11/fonts/cyrillic/"
- FontPath "/PCBSD/local/lib/X11/fonts/hebrew/"
- FontPath "/PCBSD/local/lib/X11/fonts/vietnamese/"
- FontPath "/PCBSD/local/lib/X11/fonts/indic/"
- FontPath "/PCBSD/local/lib/X11/fonts/ae_fonts1/AAHS"
- FontPath "/PCBSD/local/lib/X11/fonts/ae_fonts1/AGA"
- FontPath "/PCBSD/local/lib/X11/fonts/ae_fonts1/FS"
- FontPath "/PCBSD/local/lib/X11/fonts/ae_fonts1/Kasr"
- FontPath "/PCBSD/local/lib/X11/fonts/ae_fonts1/MCS"
- FontPath "/PCBSD/local/lib/X11/fonts/ae_fonts1/Shmookh"
- FontPath "/PCBSD/local/lib/X11/fonts/local/"
+ ModulePath "/usr/PCBSD/local/lib/modules"
+ ModulePath "/usr/PCBSD/local/lib/xorg/modules"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/cyrillic/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/TrueType/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/illinoy/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/webfonts/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/misc/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/TTF/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/Speedo/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/Type1/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/CID/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/75dpi/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/100dpi/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/dejavu/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/cyrillic/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/hebrew/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/vietnamese/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/indic/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/ae_fonts1/AAHS"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/ae_fonts1/AGA"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/ae_fonts1/FS"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/ae_fonts1/Kasr"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/ae_fonts1/MCS"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/ae_fonts1/Shmookh"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/local/"
EndSection
Section "Module"
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/cardDetect/XF86Config.default
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/cardDetect/XF86Config.default 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/cardDetect/XF86Config.default 2009-05-29 14:12:31 UTC (rev 4005)
@@ -16,31 +16,31 @@
EndSection
Section "Files"
- ModulePath "/PCBSD/local/lib/modules"
- ModulePath "/PCBSD/local/lib/xorg/modules"
- FontPath "/PCBSD/local/lib/X11/fonts/cyrillic/"
- FontPath "/PCBSD/local/lib/X11/fonts/TrueType/"
- FontPath "/PCBSD/local/lib/X11/fonts/illinoy/"
- FontPath "/PCBSD/local/lib/X11/fonts/webfonts/"
- FontPath "/PCBSD/local/lib/X11/fonts/misc/"
- FontPath "/PCBSD/local/lib/X11/fonts/TTF/"
- FontPath "/PCBSD/local/lib/X11/fonts/Speedo/"
- FontPath "/PCBSD/local/lib/X11/fonts/Type1/"
- FontPath "/PCBSD/local/lib/X11/fonts/CID/"
- FontPath "/PCBSD/local/lib/X11/fonts/75dpi/"
- FontPath "/PCBSD/local/lib/X11/fonts/100dpi/"
- FontPath "/PCBSD/local/lib/X11/fonts/dejavu/"
- FontPath "/PCBSD/local/lib/X11/fonts/cyrillic/"
- FontPath "/PCBSD/local/lib/X11/fonts/hebrew/"
- FontPath "/PCBSD/local/lib/X11/fonts/vietnamese/"
- FontPath "/PCBSD/local/lib/X11/fonts/indic/"
- FontPath "/PCBSD/local/lib/X11/fonts/ae_fonts1/AAHS"
- FontPath "/PCBSD/local/lib/X11/fonts/ae_fonts1/AGA"
- FontPath "/PCBSD/local/lib/X11/fonts/ae_fonts1/FS"
- FontPath "/PCBSD/local/lib/X11/fonts/ae_fonts1/Kasr"
- FontPath "/PCBSD/local/lib/X11/fonts/ae_fonts1/MCS"
- FontPath "/PCBSD/local/lib/X11/fonts/ae_fonts1/Shmookh"
- FontPath "/PCBSD/local/lib/X11/fonts/local/"
+ ModulePath "/usr/PCBSD/local/lib/modules"
+ ModulePath "/usr/PCBSD/local/lib/xorg/modules"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/cyrillic/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/TrueType/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/illinoy/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/webfonts/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/misc/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/TTF/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/Speedo/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/Type1/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/CID/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/75dpi/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/100dpi/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/dejavu/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/cyrillic/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/hebrew/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/vietnamese/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/indic/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/ae_fonts1/AAHS"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/ae_fonts1/AGA"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/ae_fonts1/FS"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/ae_fonts1/Kasr"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/ae_fonts1/MCS"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/ae_fonts1/Shmookh"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/local/"
EndSection
Section "Module"
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/cardDetect/x_config.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/cardDetect/x_config.sh 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/cardDetect/x_config.sh 2009-05-29 14:12:31 UTC (rev 4005)
@@ -7,8 +7,8 @@
XFREE_CONF="/etc/X11/xorg.conf"
XFREE_NEWCONF="/root/xorg.conf.new"
-XFREE_TMPCONF="/PCBSD/xorg-gui/cardDetect/XF86Config.default"
-XFREE_VMWARE="/PCBSD/xorg-gui/cardDetect/XF86Config.vmware"
+XFREE_TMPCONF="/usr/PCBSD/xorg-gui/cardDetect/XF86Config.default"
+XFREE_VMWARE="/usr/PCBSD/xorg-gui/cardDetect/XF86Config.vmware"
if [ -f ${XFREE_CONF} ]; then
echo "Found config file \"${XFREE_CONF}\" - skiping autoconfiguration."
@@ -22,7 +22,7 @@
cp ${XFREE_VMWARE} ${XFREE_NEWCONF}
else
# configuring X automatically
- /PCBSD/local/bin/X -configure >/dev/null 2>&1
+ /usr/PCBSD/local/bin/X -configure >/dev/null 2>&1
fi
X_MON=`/usr/bin/sed -n '/^Section "Monitor"$/,/^EndSection$/ p' $XFREE_NEWCONF`
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/conf/.fluxbox/init
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/conf/.fluxbox/init 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/conf/.fluxbox/init 2009-05-29 14:12:31 UTC (rev 4005)
@@ -40,7 +40,7 @@
session.screen0.tab.width: 64
session.screen0.tab.height: 16
session.screen0.workspacewarping: true
-session.screen0.rootCommand: xv -root -quit -max /PCBSD/local/share/wallpapers/pcbsd-default.jpg
+session.screen0.rootCommand: xv -root -quit -max /usr/PCBSD/local/share/wallpapers/pcbsd-default.jpg
session.screen0.menuMode: Delay
session.screen0.windowMenu:
session.screen0.resizeMode: Bottom
@@ -92,4 +92,4 @@
session.appsFile: ~/.fluxbox/apps
session.groupFile: ~/.fluxbox/groups
session.forcePseudoTransparency: false
-session.styleFile: /PCBSD/local/share/fluxbox/styles/Clean
+session.styleFile: /usr/PCBSD/local/share/fluxbox/styles/Clean
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/conf/xorg.conf.basic
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/conf/xorg.conf.basic 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/conf/xorg.conf.basic 2009-05-29 14:12:31 UTC (rev 4005)
@@ -11,20 +11,20 @@
EndSection
Section "Files"
- ModulePath "/PCBSD/X11R6/lib"
- ModulePath "/PCBSD/local/lib/xorg/modules"
- ModulePath "/PCBSD/X11R6/lib/xorg/modules"
- FontPath "/PCBSD/local/lib/X11/fonts/cyrillic/"
- FontPath "/PCBSD/local/lib/X11/fonts/TrueType/"
- FontPath "/PCBSD/local/lib/X11/fonts/webfonts/"
- FontPath "/PCBSD/local/lib/X11/fonts/misc/"
- FontPath "/PCBSD/X11R6/lib/X11/fonts/TTF/"
- FontPath "/PCBSD/local/lib/X11/fonts/Type1/"
- FontPath "/PCBSD/local/lib/X11/fonts/CID/"
- FontPath "/PCBSD/local/lib/X11/fonts/75dpi/"
- FontPath "/PCBSD/local/lib/X11/fonts/100dpi/"
- FontPath "/PCBSD/X11R6/lib/X11/fonts/dejavu/"
- FontPath "/PCBSD/X11R6/lib/X11/fonts/local/"
+ ModulePath "/usr/PCBSD/X11R6/lib"
+ ModulePath "/usr/PCBSD/local/lib/xorg/modules"
+ ModulePath "/usr/PCBSD/X11R6/lib/xorg/modules"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/cyrillic/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/TrueType/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/webfonts/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/misc/"
+ FontPath "/usr/PCBSD/X11R6/lib/X11/fonts/TTF/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/Type1/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/CID/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/75dpi/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/100dpi/"
+ FontPath "/usr/PCBSD/X11R6/lib/X11/fonts/dejavu/"
+ FontPath "/usr/PCBSD/X11R6/lib/X11/fonts/local/"
EndSection
Section "Module"
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/header/ati-3d-enable.xorg.conf
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/header/ati-3d-enable.xorg.conf 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/header/ati-3d-enable.xorg.conf 2009-05-29 14:12:31 UTC (rev 4005)
@@ -15,19 +15,19 @@
EndSection
Section "Files"
- ModulePath "/PCBSD/local/lib/xorg/modules"
+ ModulePath "/usr/PCBSD/local/lib/xorg/modules"
FontPath "/Programs/fonts/"
- FontPath "/PCBSD/local/lib/X11/fonts/cyrillic/"
- FontPath "/PCBSD/local/lib/X11/fonts/TrueType/"
- FontPath "/PCBSD/local/lib/X11/fonts/webfonts/"
- FontPath "/PCBSD/local/lib/X11/fonts/misc/"
- FontPath "/PCBSD/local/lib/X11/fonts/TTF/"
- FontPath "/PCBSD/local/lib/X11/fonts/Type1/"
- FontPath "/PCBSD/local/lib/X11/fonts/CID/"
- FontPath "/PCBSD/local/lib/X11/fonts/75dpi/"
- FontPath "/PCBSD/local/lib/X11/fonts/100dpi/"
- FontPath "/PCBSD/local/lib/X11/fonts/dejavu/"
- FontPath "/PCBSD/local/lib/X11/fonts/local/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/cyrillic/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/TrueType/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/webfonts/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/misc/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/TTF/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/Type1/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/CID/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/75dpi/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/100dpi/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/dejavu/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/local/"
EndSection
Section "Module"
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/header/ati.xorg.conf
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/header/ati.xorg.conf 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/header/ati.xorg.conf 2009-05-29 14:12:31 UTC (rev 4005)
@@ -14,19 +14,19 @@
EndSection
Section "Files"
- ModulePath "/PCBSD/local/lib/xorg/modules"
+ ModulePath "/usr/PCBSD/local/lib/xorg/modules"
FontPath "/Programs/fonts/"
- FontPath "/PCBSD/local/lib/X11/fonts/cyrillic/"
- FontPath "/PCBSD/local/lib/X11/fonts/TrueType/"
- FontPath "/PCBSD/local/lib/X11/fonts/webfonts/"
- FontPath "/PCBSD/local/lib/X11/fonts/misc/"
- FontPath "/PCBSD/local/lib/X11/fonts/TTF/"
- FontPath "/PCBSD/local/lib/X11/fonts/Type1/"
- FontPath "/PCBSD/local/lib/X11/fonts/CID/"
- FontPath "/PCBSD/local/lib/X11/fonts/75dpi/"
- FontPath "/PCBSD/local/lib/X11/fonts/100dpi/"
- FontPath "/PCBSD/local/lib/X11/fonts/dejavu/"
- FontPath "/PCBSD/local/lib/X11/fonts/local/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/cyrillic/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/TrueType/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/webfonts/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/misc/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/TTF/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/Type1/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/CID/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/75dpi/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/100dpi/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/dejavu/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/local/"
EndSection
Section "Module"
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/header/intel-3d-enable.xorg.conf
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/header/intel-3d-enable.xorg.conf 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/header/intel-3d-enable.xorg.conf 2009-05-29 14:12:31 UTC (rev 4005)
@@ -15,19 +15,19 @@
EndSection
Section "Files"
- ModulePath "/PCBSD/local/lib/xorg/modules"
+ ModulePath "/usr/PCBSD/local/lib/xorg/modules"
FontPath "/Programs/fonts/"
- FontPath "/PCBSD/local/lib/X11/fonts/cyrillic/"
- FontPath "/PCBSD/local/lib/X11/fonts/TrueType/"
- FontPath "/PCBSD/local/lib/X11/fonts/webfonts/"
- FontPath "/PCBSD/local/lib/X11/fonts/misc/"
- FontPath "/PCBSD/local/lib/X11/fonts/TTF/"
- FontPath "/PCBSD/local/lib/X11/fonts/Type1/"
- FontPath "/PCBSD/local/lib/X11/fonts/CID/"
- FontPath "/PCBSD/local/lib/X11/fonts/75dpi/"
- FontPath "/PCBSD/local/lib/X11/fonts/100dpi/"
- FontPath "/PCBSD/local/lib/X11/fonts/dejavu/"
- FontPath "/PCBSD/local/lib/X11/fonts/local/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/cyrillic/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/TrueType/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/webfonts/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/misc/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/TTF/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/Type1/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/CID/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/75dpi/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/100dpi/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/dejavu/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/local/"
EndSection
Section "Module"
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/header/intel.xorg.conf
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/header/intel.xorg.conf 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/header/intel.xorg.conf 2009-05-29 14:12:31 UTC (rev 4005)
@@ -14,19 +14,19 @@
EndSection
Section "Files"
- ModulePath "/PCBSD/local/lib/xorg/modules"
+ ModulePath "/usr/PCBSD/local/lib/xorg/modules"
FontPath "/Programs/fonts/"
- FontPath "/PCBSD/local/lib/X11/fonts/cyrillic/"
- FontPath "/PCBSD/local/lib/X11/fonts/TrueType/"
- FontPath "/PCBSD/local/lib/X11/fonts/webfonts/"
- FontPath "/PCBSD/local/lib/X11/fonts/misc/"
- FontPath "/PCBSD/local/lib/X11/fonts/TTF/"
- FontPath "/PCBSD/local/lib/X11/fonts/Type1/"
- FontPath "/PCBSD/local/lib/X11/fonts/CID/"
- FontPath "/PCBSD/local/lib/X11/fonts/75dpi/"
- FontPath "/PCBSD/local/lib/X11/fonts/100dpi/"
- FontPath "/PCBSD/local/lib/X11/fonts/dejavu/"
- FontPath "/PCBSD/local/lib/X11/fonts/local/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/cyrillic/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/TrueType/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/webfonts/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/misc/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/TTF/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/Type1/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/CID/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/75dpi/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/100dpi/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/dejavu/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/local/"
EndSection
Section "Module"
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/header/mga-3d-enable.xorg.conf
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/header/mga-3d-enable.xorg.conf 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/header/mga-3d-enable.xorg.conf 2009-05-29 14:12:31 UTC (rev 4005)
@@ -14,19 +14,19 @@
EndSection
Section "Files"
- ModulePath "/PCBSD/local/lib/xorg/modules"
+ ModulePath "/usr/PCBSD/local/lib/xorg/modules"
FontPath "/Programs/fonts/"
- FontPath "/PCBSD/local/lib/X11/fonts/cyrillic/"
- FontPath "/PCBSD/local/lib/X11/fonts/TrueType/"
- FontPath "/PCBSD/local/lib/X11/fonts/webfonts/"
- FontPath "/PCBSD/local/lib/X11/fonts/misc/"
- FontPath "/PCBSD/local/lib/X11/fonts/TTF/"
- FontPath "/PCBSD/local/lib/X11/fonts/Type1/"
- FontPath "/PCBSD/local/lib/X11/fonts/CID/"
- FontPath "/PCBSD/local/lib/X11/fonts/75dpi/"
- FontPath "/PCBSD/local/lib/X11/fonts/100dpi/"
- FontPath "/PCBSD/local/lib/X11/fonts/dejavu/"
- FontPath "/PCBSD/local/lib/X11/fonts/local/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/cyrillic/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/TrueType/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/webfonts/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/misc/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/TTF/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/Type1/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/CID/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/75dpi/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/100dpi/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/dejavu/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/local/"
EndSection
Section "Module"
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/header/nvidia.xorg.conf
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/header/nvidia.xorg.conf 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/header/nvidia.xorg.conf 2009-05-29 14:12:31 UTC (rev 4005)
@@ -13,19 +13,19 @@
EndSection
Section "Files"
- ModulePath "/PCBSD/local/lib/xorg/modules"
+ ModulePath "/usr/PCBSD/local/lib/xorg/modules"
FontPath "/Programs/fonts/"
- FontPath "/PCBSD/local/lib/X11/fonts/cyrillic/"
- FontPath "/PCBSD/local/lib/X11/fonts/TrueType/"
- FontPath "/PCBSD/local/lib/X11/fonts/webfonts/"
- FontPath "/PCBSD/local/lib/X11/fonts/misc/"
- FontPath "/PCBSD/local/lib/X11/fonts/TTF/"
- FontPath "/PCBSD/local/lib/X11/fonts/Type1/"
- FontPath "/PCBSD/local/lib/X11/fonts/CID/"
- FontPath "/PCBSD/local/lib/X11/fonts/75dpi/"
- FontPath "/PCBSD/local/lib/X11/fonts/100dpi/"
- FontPath "/PCBSD/local/lib/X11/fonts/dejavu/"
- FontPath "/PCBSD/local/lib/X11/fonts/local/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/cyrillic/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/TrueType/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/webfonts/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/misc/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/TTF/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/Type1/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/CID/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/75dpi/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/100dpi/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/dejavu/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/local/"
EndSection
Section "Module"
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/header/xorg.conf.generic
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/header/xorg.conf.generic 2009-05-29 13:52:53 UTC (rev 4004)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/header/xorg.conf.generic 2009-05-29 14:12:31 UTC (rev 4005)
@@ -14,19 +14,19 @@
EndSection
Section "Files"
- ModulePath "/PCBSD/local/lib/xorg/modules"
+ ModulePath "/usr/PCBSD/local/lib/xorg/modules"
FontPath "/Programs/fonts/"
- FontPath "/PCBSD/local/lib/X11/fonts/cyrillic/"
- FontPath "/PCBSD/local/lib/X11/fonts/TrueType/"
- FontPath "/PCBSD/local/lib/X11/fonts/webfonts/"
- FontPath "/PCBSD/local/lib/X11/fonts/misc/"
- FontPath "/PCBSD/local/lib/X11/fonts/TTF/"
- FontPath "/PCBSD/local/lib/X11/fonts/Type1/"
- FontPath "/PCBSD/local/lib/X11/fonts/CID/"
- FontPath "/PCBSD/local/lib/X11/fonts/75dpi/"
- FontPath "/PCBSD/local/lib/X11/fonts/100dpi/"
- FontPath "/PCBSD/local/lib/X11/fonts/dejavu/"
- FontPath "/PCBSD/local/lib/X11/fonts/local/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/cyrillic/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/TrueType/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/webfonts/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/misc/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/TTF/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/Type1/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/CID/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/75dpi/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/100dpi/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/dejavu/"
+ FontPath "/usr/PCBSD/local/lib/X11/fonts/local/"
EndSection
Section "Module"
More information about the Commits
mailing list