[PC-BSD Commits] r4009 - in pcbsd/trunk-current/system-overlay/usr/PCBSD: Components/kdeedu Components/kdesdk Components/kdetoys Components/kdewebdev Components/ports Components/source Scripts Scripts/Components Scripts/System Services/acpinotebook Services/cups Services/denyhosts Services/hplip SystemUpdater/bin 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/applications/kde4 local/kde4/share/applnk/.hidden local/kde4/share/apps/kdm/sessions local/kde4/share/config/kdm local/lib/nspluginwrapper/noarch local/libexec/cups/filter local/share/applications local/share/applnk/.hidden local/share/fluxbox local/share/mime/packages xorg-gui/bin xorg-gui/cardDetect xorg-gui/conf xorg-gui/conf/.fluxbox xorg-gui/settings xorg-gui/templates/header xorg-gui/templates/scripts

svn at pcbsd.org svn at pcbsd.org
Fri May 29 08:06:38 PDT 2009


Author: kris
Date: 2009-05-29 08:06:34 -0700 (Fri, 29 May 2009)
New Revision: 4009

Modified:
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdeedu/install-check.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdeedu/install.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdeedu/pkg-config.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdeedu/remove.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdesdk/install-check.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdesdk/install.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdesdk/pkg-config.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdesdk/remove.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdetoys/install-check.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdetoys/install.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdetoys/pkg-config.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdetoys/remove.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdewebdev/install-check.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdewebdev/install.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdewebdev/pkg-config.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdewebdev/remove.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/ports/pkg-config.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/source/pkg-config.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/CheckPBIUpdates.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/Components/install-component.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/System/fastest_cvsup
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/changeportdb.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/checkXloader.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/fbsd-update.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/installPatch.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/registerPatch.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/runpbi.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/system-stop.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/acpinotebook/disable.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/acpinotebook/enable.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/acpinotebook/isEnabled.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/acpinotebook/isRunning.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/acpinotebook/restart.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/acpinotebook/service-config.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/acpinotebook/start.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/acpinotebook/stop.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/cups/restart.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/cups/start.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/cups/stop.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/denyhosts/restart.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/denyhosts/start.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/denyhosts/stop.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/hplip/disable.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/hplip/enable.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/hplip/restart.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/hplip/run-toolbox.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/hplip/start.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/hplip/stop.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/SystemUpdater/bin/SystemUpdater.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/SystemUpdater/bin/readSysUpdates.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/SystemUpdater/bin/readSysUpdatesUser.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/bin/CrashHandler
   pcbsd/trunk-current/system-overlay/usr/PCBSD/bin/PBIUpdater
   pcbsd/trunk-current/system-overlay/usr/PCBSD/bin/PCBSDUpdater
   pcbsd/trunk-current/system-overlay/usr/PCBSD/bin/pdm
   pcbsd/trunk-current/system-overlay/usr/PCBSD/bin/rerunXsetup.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/conf/PCBSD.amd64
   pcbsd/trunk-current/system-overlay/usr/PCBSD/conf/PCBSD.i386
   pcbsd/trunk-current/system-overlay/usr/PCBSD/conf/pcbsdbase
   pcbsd/trunk-current/system-overlay/usr/PCBSD/local/bin/foomatic-rip
   pcbsd/trunk-current/system-overlay/usr/PCBSD/local/bin/lpr
   pcbsd/trunk-current/system-overlay/usr/PCBSD/local/bin/lprsetup.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/local/bin/unix-lpr.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/local/etc/cups/cupsd.conf
   pcbsd/trunk-current/system-overlay/usr/PCBSD/local/etc/denyhosts.conf
   pcbsd/trunk-current/system-overlay/usr/PCBSD/local/etc/foomatic/filter.conf
   pcbsd/trunk-current/system-overlay/usr/PCBSD/local/etc/hp/hplip.conf
   pcbsd/trunk-current/system-overlay/usr/PCBSD/local/etc/periodic/monthly/300.statistics
   pcbsd/trunk-current/system-overlay/usr/PCBSD/local/etc/rc.d/bsdstats.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/local/etc/rc.d/cupsd
   pcbsd/trunk-current/system-overlay/usr/PCBSD/local/etc/rc.d/hald
   pcbsd/trunk-current/system-overlay/usr/PCBSD/local/etc/rc.d/pcbsdinit
   pcbsd/trunk-current/system-overlay/usr/PCBSD/local/etc/rc.d/snddetect
   pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/applications/kde4/pcbsdmakeports.desktop
   pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/applications/kde4/pcbsdpbu.desktop
   pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/applications/kde4/pcbsdrunports.desktop
   pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/applications/kde4/pcbsdxsetup.desktop
   pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/applnk/.hidden/pbistart.desktop
   pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/apps/kdm/sessions/kde.desktop
   pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/README
   pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xreset
   pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xresources
   pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xservers
   pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xsession
   pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xstartup
   pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/backgroundrc
   pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/kdmrc
   pcbsd/trunk-current/system-overlay/usr/PCBSD/local/lib/nspluginwrapper/noarch/npviewer
   pcbsd/trunk-current/system-overlay/usr/PCBSD/local/libexec/cups/filter/foomatic-rip-hplip
   pcbsd/trunk-current/system-overlay/usr/PCBSD/local/share/applications/hplip.desktop
   pcbsd/trunk-current/system-overlay/usr/PCBSD/local/share/applnk/.hidden/pbistart.desktop
   pcbsd/trunk-current/system-overlay/usr/PCBSD/local/share/fluxbox/init
   pcbsd/trunk-current/system-overlay/usr/PCBSD/local/share/mime/packages/freedesktop.org.xml
   pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/bin/rundetect.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/bin/setupconf.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/cardDetect/XF86Config.compat
   pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/cardDetect/XF86Config.default
   pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/cardDetect/x_config.sh
   pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/conf/.fluxbox/init
   pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/conf/ttys.normal
   pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/conf/xorg.conf.basic
   pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/settings/alias.txt
   pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/settings/drivers.txt
   pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/templates/header/ati-3d-enable.xorg.conf
   pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/templates/header/ati.xorg.conf
   pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/templates/header/intel-3d-enable.xorg.conf
   pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/templates/header/intel.xorg.conf
   pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/templates/header/mga-3d-enable.xorg.conf
   pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/templates/header/nvidia.xorg.conf
   pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/templates/header/xorg.conf.generic
   pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/templates/scripts/README
   pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/templates/scripts/nvidia.sh
Log:

Also add changes for /usr/PCBSD/local to trunk-current



Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdeedu/install-check.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdeedu/install-check.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdeedu/install-check.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -1,7 +1,7 @@
 #!/bin/sh
 # This script checks if KDE games are installed 
 
-ls /PCBSD/var/db/kdeedu* >/dev/null 2>/dev/null
+ls /usr/PCBSD/var/db/pkg/kdeedu* >/dev/null 2>/dev/null
 if [ "$?" = "0" ]
 then
 exit 0

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdeedu/install.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdeedu/install.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdeedu/install.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -9,7 +9,7 @@
 
 # Start install
 #############################################################################
-PKG_DBDIR="/PCBSD/var/db" ; export PKG_DBDIR
-PORT_DBDIR="/PCBSD/var/db" ; export PORT_DBDIR
+PKG_DBDIR="/usr/PCBSD/var/db" ; export PKG_DBDIR
+PORT_DBDIR="/usr/PCBSD/var/db" ; export PORT_DBDIR
 
 pkg_add -f ${FILEDIR}/${PACKAGE}

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdeedu/pkg-config.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdeedu/pkg-config.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdeedu/pkg-config.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -1,5 +1,5 @@
 #!/bin/sh
-# This script is sourced by /PCBSD/Scripts/Components/install-component.sh
+# This script is sourced by /usr/PCBSD/Scripts/Components/install-component.sh
 
 # Set our variables
 #############################################################################

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdeedu/remove.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdeedu/remove.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdeedu/remove.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -1,7 +1,7 @@
 #!/bin/sh
 # This script removes the KDE Games package
-PKG_DBDIR="/PCBSD/var/db" ; export PKG_DBDIR
-PORT_DBDIR="/PCBSD/var/db" ; export PORT_DBDIR
+PKG_DBDIR="/usr/PCBSD/var/db/pkg" ; export PKG_DBDIR
+PORT_DBDIR="/usr/PCBSD/var/db/pkg" ; export PORT_DBDIR
 
 pkg_delete -f kdeedu-\*
 if [ "$?" = "0" ]

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdesdk/install-check.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdesdk/install-check.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdesdk/install-check.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -1,7 +1,7 @@
 #!/bin/sh
 # This script checks if KDE sdk are installed 
 
-ls /PCBSD/var/db/kdesdk* >/dev/null 2>/dev/null
+ls /usr/PCBSD/var/db/pkg/kdesdk* >/dev/null 2>/dev/null
 if [ "$?" = "0" ]
 then
 exit 0

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdesdk/install.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdesdk/install.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdesdk/install.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -9,7 +9,7 @@
 
 # Start install
 #############################################################################
-PKG_DBDIR="/PCBSD/var/db" ; export PKG_DBDIR
-PORT_DBDIR="/PCBSD/var/db" ; export PORT_DBDIR
+PKG_DBDIR="/usr/PCBSD/var/db/pkg" ; export PKG_DBDIR
+PORT_DBDIR="/usr/PCBSD/var/db/pkg" ; export PORT_DBDIR
 
 pkg_add -f ${FILEDIR}/${PACKAGE}

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdesdk/pkg-config.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdesdk/pkg-config.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdesdk/pkg-config.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -1,5 +1,5 @@
 #!/bin/sh
-# This script is sourced by /PCBSD/Scripts/Components/install-component.sh
+# This script is sourced by /usr/PCBSD/Scripts/Components/install-component.sh
 
 # Set our variables
 #############################################################################

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdesdk/remove.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdesdk/remove.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdesdk/remove.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -1,7 +1,7 @@
 #!/bin/sh
 # This script removes the KDE SDK package
-PKG_DBDIR="/PCBSD/var/db" ; export PKG_DBDIR
-PORT_DBDIR="/PCBSD/var/db" ; export PORT_DBDIR
+PKG_DBDIR="/usr/PCBSD/var/db/pkg" ; export PKG_DBDIR
+PORT_DBDIR="/usr/PCBSD/var/db/pkg" ; export PORT_DBDIR
 
 pkg_delete -f kdesdk-\*
 pkg_delete -f kdevelop-\*

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdetoys/install-check.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdetoys/install-check.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdetoys/install-check.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -1,7 +1,7 @@
 #!/bin/sh
 # This script checks if KDE toys are installed 
 
-ls /PCBSD/var/db/kdetoys* >/dev/null 2>/dev/null
+ls /usr/PCBSD/var/db/pkg/kdetoys* >/dev/null 2>/dev/null
 if [ "$?" = "0" ]
 then
 exit 0

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdetoys/install.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdetoys/install.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdetoys/install.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -9,7 +9,7 @@
 
 # Start install
 #############################################################################
-PKG_DBDIR="/PCBSD/var/db" ; export PKG_DBDIR
-PORT_DBDIR="/PCBSD/var/db" ; export PORT_DBDIR
+PKG_DBDIR="/usr/PCBSD/var/db/pkg" ; export PKG_DBDIR
+PORT_DBDIR="/usr/PCBSD/var/db/pkg" ; export PORT_DBDIR
 
 pkg_add -f ${FILEDIR}/${PACKAGE}

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdetoys/pkg-config.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdetoys/pkg-config.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdetoys/pkg-config.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -1,5 +1,5 @@
 #!/bin/sh
-# This script is sourced by /PCBSD/Scripts/Components/install-component.sh
+# This script is sourced by /usr/PCBSD/Scripts/Components/install-component.sh
 
 # Set our variables
 #############################################################################

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdetoys/remove.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdetoys/remove.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdetoys/remove.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -1,7 +1,7 @@
 #!/bin/sh
 # This script removes the KDE toys package
-PKG_DBDIR="/PCBSD/var/db" ; export PKG_DBDIR
-PORT_DBDIR="/PCBSD/var/db" ; export PORT_DBDIR
+PKG_DBDIR="/usr/PCBSD/var/db/pkg" ; export PKG_DBDIR
+PORT_DBDIR="/usr/PCBSD/var/db/pkg" ; export PORT_DBDIR
 
 pkg_delete -f kdetoys-\*
 if [ "$?" = "0" ]

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdewebdev/install-check.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdewebdev/install-check.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdewebdev/install-check.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -1,7 +1,7 @@
 #!/bin/sh
 # This script checks if KDE toys are installed 
 
-ls /PCBSD/var/db/kdewebdev* >/dev/null 2>/dev/null
+ls /usr/PCBSD/var/db/pkg/kdewebdev* >/dev/null 2>/dev/null
 if [ "$?" = "0" ]
 then
 exit 0

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdewebdev/install.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdewebdev/install.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdewebdev/install.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -9,7 +9,7 @@
 
 # Start install
 #############################################################################
-PKG_DBDIR="/PCBSD/var/db" ; export PKG_DBDIR
-PORT_DBDIR="/PCBSD/var/db" ; export PORT_DBDIR
+PKG_DBDIR="/usr/PCBSD/var/db/pkg" ; export PKG_DBDIR
+PORT_DBDIR="/usr/PCBSD/var/db/pkg" ; export PORT_DBDIR
 
 pkg_add -f ${FILEDIR}/${PACKAGE}

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdewebdev/pkg-config.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdewebdev/pkg-config.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdewebdev/pkg-config.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -1,5 +1,5 @@
 #!/bin/sh
-# This script is sourced by /PCBSD/Scripts/Components/install-component.sh
+# This script is sourced by /usr/PCBSD/Scripts/Components/install-component.sh
 
 # Set our variables
 #############################################################################

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdewebdev/remove.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdewebdev/remove.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/kdewebdev/remove.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -1,8 +1,8 @@
 #!/bin/sh
 # This script removes the KDE web package
 
-PKG_DBDIR="/PCBSD/var/db" ; export PKG_DBDIR
-PORT_DBDIR="/PCBSD/var/db" ; export PORT_DBDIR
+PKG_DBDIR="/usr/PCBSD/var/db/pkg" ; export PKG_DBDIR
+PORT_DBDIR="/usr/PCBSD/var/db/pkg" ; export PORT_DBDIR
 
 pkg_delete -f kdewebdev-\*
 if [ "$?" = "0" ]

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/ports/pkg-config.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/ports/pkg-config.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/ports/pkg-config.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -1,5 +1,5 @@
 #!/bin/sh
-# This script is sourced by /PCBSD/Scripts/Components/install-component.sh
+# This script is sourced by /usr/PCBSD/Scripts/Components/install-component.sh
 
 # Set our variables
 #############################################################################

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/source/pkg-config.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/source/pkg-config.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Components/source/pkg-config.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -1,5 +1,5 @@
 #!/bin/sh
-# This script is sourced by /PCBSD/Scripts/Components/install-component.sh
+# This script is sourced by /usr/PCBSD/Scripts/Components/install-component.sh
 
 # Set our variables
 #############################################################################

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/CheckPBIUpdates.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/CheckPBIUpdates.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/CheckPBIUpdates.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -1,16 +1,16 @@
 #!/bin/sh
 # PBI Update Checker Script
-# Usage "/PCBSD/Scripts/CheckPBIUpdates.sh" <Progdir>
+# Usage "/usr/PCBSD/Scripts/CheckPBIUpdates.sh" <Progdir>
 # I.E: CheckPBIUpdates.sh TestProg1.0 will check the 
 # directory /Programs/TestProg1.0 for updates
 # Returns 1 if updates are available, 0 if PBI is up to date
 ###################################################################
 
 # The wget binary
-WGET="/PCBSD/bin/wget"
+WGET="/usr/PCBSD/bin/wget"
 
 # Where to save the tmp download file
-UPFILE="/PCBSD/tmp/PBIUpdateCheck";
+UPFILE="/usr/PCBSD/tmp/PBIUpdateCheck";
 
 ###############################################################
 

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/Components/install-component.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/Components/install-component.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/Components/install-component.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -7,14 +7,14 @@
 MEDIA="${2}"
 
 # Start by sourcing our config file for this component
-. /PCBSD/Components/${COMPONENT}/pkg-config.sh
+. /usr/PCBSD/Components/${COMPONENT}/pkg-config.sh
 
 # Set our variables
 #############################################################################
 
 CDMNT="/tmp/pcbsdcdmnt"
 MNTLOC=""
-FILEDIR="/PCBSD/tmp"
+FILEDIR="/usr/PCBSD/tmp"
 
 # Network Variables
 ARCH="`uname -m`"
@@ -73,7 +73,7 @@
      umount -f ${CDMNT}
 
      # Now start the install
-     /PCBSD/Components/${COMPONENT}/install.sh ${FILEDIR}
+     /usr/PCBSD/Components/${COMPONENT}/install.sh ${FILEDIR}
 
      # Do any cleanup of the old packages now
      rm ${FILEDIR}/${PACKAGE} >/dev/null 2>/dev/null
@@ -139,7 +139,7 @@
   if [ "${FOUND}" = "1" ]
   then
      # Now start the install
-     /PCBSD/Components/${COMPONENT}/install.sh ${FILEDIR}
+     /usr/PCBSD/Components/${COMPONENT}/install.sh ${FILEDIR}
 
      # Do any cleanup of the old packages now
      rm ${FILEDIR}/${PACKAGE} >/dev/null 2>/dev/null

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/System/fastest_cvsup
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/System/fastest_cvsup	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/System/fastest_cvsup	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/Scripts/changeportdb.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/changeportdb.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/changeportdb.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -3,13 +3,13 @@
 # the default PCBSD localbase and its ports
 ############################################################################
 
-setenv PKG_DBDIR /PCBSD/var/db/pkg
-setenv PORT_DBDIR /PCBSD/var/db/pkg
+setenv PKG_DBDIR /usr/PCBSD/var/db/pkg
+setenv PORT_DBDIR /usr/PCBSD/var/db/pkg
 
 clear
 echo "Set the following variables:"
-echo " PKG_DBDIR=/PCBSD/var/db/pkg"
-echo " PORT_DBDIR=/PCBSD/var/db/pkg"
+echo " PKG_DBDIR=/usr/PCBSD/var/db/pkg"
+echo " PORT_DBDIR=/usr/PCBSD/var/db/pkg"
 echo " "
 echo "WARNING! Modifying PC-BSD base packages could render the system in-operable!"
 echo "You will need to edit /etc/make.conf and uncomment the LOCALBASE and LDCONFIG variables as well"

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/checkXloader.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/checkXloader.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/checkXloader.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -5,12 +5,12 @@
 FOUND="$?"
 if [ "$FOUND" = "0" ]
 then
-  cp /PCBSD/xorg-gui/conf/ttys.xsetup /etc/ttys
+  cp /usr/PCBSD/xorg-gui/conf/ttys.xsetup /etc/ttys
   exit 0
 fi
 
-if [ -e "/PCBSD/xorg-gui/.rerunxsetup" ]
+if [ -e "/usr/PCBSD/xorg-gui/.rerunxsetup" ]
 then
-  cp /PCBSD/xorg-gui/conf/ttys.xsetup /etc/ttys
+  cp /usr/PCBSD/xorg-gui/conf/ttys.xsetup /etc/ttys
   exit 0
 fi

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/fbsd-update.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/fbsd-update.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/fbsd-update.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -2,10 +2,10 @@
 # Script to check if a freebsd-update needs to be run at startup
 ##########################################################################
 
-if [ -e "/PCBSD/conf/freebsd-update-enable" ]
+if [ -e "/usr/PCBSD/conf/freebsd-update-enable" ]
 then
 
-freebsd-update fetch >/PCBSD/tmp/fbsd-update-log
-freebsd-update install >>/PCBSD/tmp/fbsd-update-log
+freebsd-update fetch >/usr/PCBSD/tmp/fbsd-update-log
+freebsd-update install >>/usr/PCBSD/tmp/fbsd-update-log
 
 fi

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/installPatch.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/installPatch.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/installPatch.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -1,13 +1,13 @@
 #!/bin/sh
 
 # Remove the tmpdir if it exists
-rm -rf /PCBSD/tmp/patchdir >/dev/null 2>/dev/null
+rm -rf /usr/PCBSD/tmp/patchdir >/dev/null 2>/dev/null
 
 # Change Directories
-mkdir /PCBSD/tmp/patchdir >/dev/null 2>/dev/null
+mkdir -p /usr/PCBSD/tmp/patchdir >/dev/null 2>/dev/null
 
 # Change Directories
-cd /PCBSD/tmp/patchdir
+cd /usr/PCBSD/tmp/patchdir
 
 # Untar the patch file
 tar xvjf $1 >/dev/null 2>/dev/null
@@ -18,13 +18,13 @@
 fi
 
 #  Make it executable
-chmod 755 /PCBSD/tmp/patchdir/PBUPatch.sh
+chmod 755 /usr/PCBSD/tmp/patchdir/PBUPatch.sh
 
 # Run the patch script file
-/PCBSD/tmp/patchdir/PBUPatch.sh >&1 2>&1
+/usr/PCBSD/tmp/patchdir/PBUPatch.sh >&1 2>&1
 
 
 # Delete the tmp dir
-rm -rf /PCBSD/tmp/patchdir
+rm -rf /usr/PCBSD/tmp/patchdir
 
 exit 0

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/registerPatch.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/registerPatch.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/registerPatch.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -1,15 +1,15 @@
 #!/bin/sh
 
 # Source the main INI file
-#. /PCBSD/conf/pcbsd.ini
+#. /usr/PCBSD/conf/pcbsd.ini
 
 PCBSDVER="`PBReg get /PC-BSD/Version`"
 
 # Make the patch Directory
-mkdir /PCBSD/Patches/${PCBSDVER}/${1}
+mkdir /usr/PCBSD/Patches/${PCBSDVER}/${1}
 
 # Move the .pbu file to that dir
-mv /PCBSD/tmp/${1}.pbu /PCBSD/Patches/${PCBSDVER}/${1}/
+mv /usr/PCBSD/tmp/${1}.pbu /usr/PCBSD/Patches/${PCBSDVER}/${1}/
 
 # Remove the tarball
 rm ${2}

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/runpbi.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/runpbi.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/runpbi.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. /PCBSD/LANGS/PCBSDLANG
+. /usr/PCBSD/LANGS/PCBSDLANG
 
 file "$1" | grep ELF 
 test="$?"

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/system-stop.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/system-stop.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Scripts/system-stop.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -3,8 +3,8 @@
 ##############################################################################
 
 # Update the linker.hints file
-/PCBSD/Scripts/UpdateHints.sh
+/usr/PCBSD/Scripts/UpdateHints.sh
 
 echo "Cleaning PBI Logs"
-/PCBSD/Scripts/cleanpbilog.sh
+/usr/PCBSD/Scripts/cleanpbilog.sh
 

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/acpinotebook/disable.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/acpinotebook/disable.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/acpinotebook/disable.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -2,7 +2,7 @@
 # This script enables the service at bootup
 # Return 0 on success, or 1 on failure.
 
-. /PCBSD/Services/acpinotebook/service-config.sh
+. /usr/PCBSD/Services/acpinotebook/service-config.sh
 
 if [ "$SELECTED_ACPI" != "" ];
 then

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/acpinotebook/enable.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/acpinotebook/enable.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/acpinotebook/enable.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -2,7 +2,7 @@
 # This script enables the service at bootup
 # Return 0 on success, or 1 on failure. 
 
-. /PCBSD/Services/acpinotebook/service-config.sh
+. /usr/PCBSD/Services/acpinotebook/service-config.sh
 
 if [ "$SELECTED_ACPI" != "" ];
 then

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/acpinotebook/isEnabled.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/acpinotebook/isEnabled.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/acpinotebook/isEnabled.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -2,7 +2,7 @@
 # This script enables the service at bootup
 # Return 0 on success, or 1 on failure.
 
-. /PCBSD/Services/acpinotebook/service-config.sh
+. /usr/PCBSD/Services/acpinotebook/service-config.sh
 
 if [ "$SELECTED_ACPI" != "" ];
 then

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/acpinotebook/isRunning.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/acpinotebook/isRunning.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/acpinotebook/isRunning.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -2,7 +2,7 @@
 # This script checks if a service is currently running
 # Return a "0" if the service is running, or a "1" if it is stopped
 
-. /PCBSD/Services/acpinotebook/service-config.sh
+. /usr/PCBSD/Services/acpinotebook/service-config.sh
 
 if [ "$SELECTED_ACPI" != "" ];
 then

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/acpinotebook/restart.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/acpinotebook/restart.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/acpinotebook/restart.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -2,7 +2,7 @@
 # This script restarts a currently running service
 # Return a "0" on success, or a "1" on failure
 
-. /PCBSD/Services/acpinotebook/stop.sh
-. /PCBSD/Services/acpinotebook/start.sh
+. /usr/PCBSD/Services/acpinotebook/stop.sh
+. /usr/PCBSD/Services/acpinotebook/start.sh
 
 return 0

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/acpinotebook/service-config.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/acpinotebook/service-config.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/acpinotebook/service-config.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. /PCBSD/Services/acpinotebook/selected-acpi.sh
+. /usr/PCBSD/Services/acpinotebook/selected-acpi.sh
 
 ALLOWED_ACPI="asus fujitsu ibm panasonic sony toshiba"
 
@@ -25,7 +25,7 @@
 
 SELECTED_ACPI=\"${SELECTED_ACPI}\"
 INITED_ACPI=\"TRUE\"
-" > /PCBSD/Services/acpinotebook/selected-acpi.sh
+" > /usr/PCBSD/Services/acpinotebook/selected-acpi.sh
 
 if [ "$SELECTED_ACPI" = "" ];
 then
@@ -34,7 +34,7 @@
 disableStart: YES
 disableStop: YES
 disableRestart: YES
-" >> /PCBSD/Services/acpinotebook/service.cfg
+" >> /usr/PCBSD/Services/acpinotebook/service.cfg
 fi
 
 fi

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/acpinotebook/start.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/acpinotebook/start.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/acpinotebook/start.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -2,7 +2,7 @@
 # This script starts a stopped service
 # Return 0 on success, or "1" on failure 
 
-. /PCBSD/Services/acpinotebook/service-config.sh
+. /usr/PCBSD/Services/acpinotebook/service-config.sh
 
 if [ "$SELECTED_ACPI" != "" ];
 then

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/acpinotebook/stop.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/acpinotebook/stop.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/acpinotebook/stop.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -2,7 +2,7 @@
 # This script starts a stopped service
 # Return 0 on success, or "1" on failure
 
-. /PCBSD/Services/acpinotebook/service-config.sh
+. /usr/PCBSD/Services/acpinotebook/service-config.sh
 
 if [ "$SELECTED_ACPI" != "" ];
 then

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/cups/restart.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/cups/restart.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/cups/restart.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/Services/cups/start.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/cups/start.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/cups/start.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/Services/cups/stop.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/cups/stop.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/cups/stop.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/Services/denyhosts/restart.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/denyhosts/restart.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/denyhosts/restart.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/Services/denyhosts/start.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/denyhosts/start.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/denyhosts/start.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/Services/denyhosts/stop.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/denyhosts/stop.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/denyhosts/stop.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/Services/hplip/disable.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/hplip/disable.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/hplip/disable.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -2,7 +2,7 @@
 # This script disables the service at bootup
 # Return 0 on success, or 1 on failure. 
 
-/PCBSD/Services/hplip/stop.sh
+/usr/PCBSD/Services/hplip/stop.sh
 
 kldload ulpt
 

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/hplip/enable.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/hplip/enable.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/hplip/enable.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -11,6 +11,6 @@
 cat /boot/loader.conf | grep -v "ulpt_load=" >/tmp/loader.new
 mv /tmp/loader.new /boot/loader.conf
 
-/PCBSD/Services/hplip/start.sh
+/usr/PCBSD/Services/hplip/start.sh
 
 return 0

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/hplip/restart.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/hplip/restart.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/hplip/restart.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/Services/hplip/run-toolbox.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/hplip/run-toolbox.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/hplip/run-toolbox.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/Services/hplip/start.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/hplip/start.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/hplip/start.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/Services/hplip/stop.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/hplip/stop.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/Services/hplip/stop.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/SystemUpdater/bin/SystemUpdater.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/SystemUpdater/bin/SystemUpdater.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/SystemUpdater/bin/SystemUpdater.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -6,7 +6,7 @@
 LANG="`grep ^Language= ~/.kde/share/config/kdeglobals | cut -d "=" -f2`"
 export LANG
 
-/PCBSD/SystemUpdater/bin/SystemUpdater
+/usr/PCBSD/SystemUpdater/bin/SystemUpdater
 
 sleep 8
 

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/SystemUpdater/bin/readSysUpdates.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/SystemUpdater/bin/readSysUpdates.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/SystemUpdater/bin/readSysUpdates.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -10,7 +10,7 @@
 fi
 
 # Set the program location
-PROGDIR="/PCBSD/SystemUpdater" ; export PROGDIR
+PROGDIR="/usr/PCBSD/SystemUpdater" ; export PROGDIR
 
 # Get the system version we are checking for updates to
 SYSVER="${1}" ; export SYSVER

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/SystemUpdater/bin/readSysUpdatesUser.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/SystemUpdater/bin/readSysUpdatesUser.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/SystemUpdater/bin/readSysUpdatesUser.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -11,7 +11,7 @@
 fi
 
 # Set the program location
-PROGDIR="/PCBSD/SystemUpdater" ; export PROGDIR
+PROGDIR="/usr/PCBSD/SystemUpdater" ; export PROGDIR
 
 # Get the system version we are checking for updates to
 SYSVER="${1}" ; export SYSVER

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/bin/CrashHandler
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/bin/CrashHandler	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/bin/CrashHandler	2009-05-29 15:06:34 UTC (rev 4009)
@@ -1,4 +1,4 @@
 #!/bin/sh
-. /PCBSD/LANGS/PCBSDLANG >/dev/null 2>/dev/null
-LD_LIBRARY_PATH="/usr/local/MyPrograms/.libs/"; export LD_LIBRARY_PATH
-/PCBSD/bin/CrashHandler-bin $@
+. /usr/PCBSD/LANGS/PCBSDLANG >/dev/null 2>/dev/null
+LD_LIBRARY_PATH="" ; export LD_LIBRARY_PATH
+/usr/PCBSD/bin/CrashHandler-bin $@

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/bin/PBIUpdater
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/bin/PBIUpdater	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/bin/PBIUpdater	2009-05-29 15:06:34 UTC (rev 4009)
@@ -1,3 +1,3 @@
 #!/bin/sh
-. /PCBSD/LANGS/PCBSDLANG >/dev/null 2>/dev/null
-/PCBSD/bin/PBIUpdater-bin
+. /usr/PCBSD/LANGS/PCBSDLANG >/dev/null 2>/dev/null
+/usr/PCBSD/bin/PBIUpdater-bin

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/bin/PCBSDUpdater
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/bin/PCBSDUpdater	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/bin/PCBSDUpdater	2009-05-29 15:06:34 UTC (rev 4009)
@@ -1,4 +1,4 @@
 #!/bin/sh
-. /PCBSD/LANGS/PCBSDLANG >/dev/null 2>/dev/null
+. /usr/PCBSD/LANGS/PCBSDLANG >/dev/null 2>/dev/null
 LD_LIBRARY_PATH="/usr/local/MyPrograms/.libs/"; export LD_LIBRARY_PATH
-/PCBSD/bin/PCBSDUpdater-bin $@
+/usr/PCBSD/bin/PCBSDUpdater-bin $@

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/bin/pdm
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/bin/pdm	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/bin/pdm	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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
@@ -64,14 +64,14 @@
 while
 i=1
 do
-	if [ -e "/PCBSD/conf/.runxsetup" ]; then
+	if [ -e "/usr/PCBSD/conf/.runxsetup" ]; then
 		if [ ${xvesa} = "YES" ]; then
 			setup_xvesa
 		else
 		    	setup_xorg
 		fi
 	else
-		exec /PCBSD/local/kde4/bin/kdm "$@"
+		exec /usr/PCBSD/local/kde4/bin/kdm "$@"
 	fi
 
 sleep 2

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/bin/rerunXsetup.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/bin/rerunXsetup.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/bin/rerunXsetup.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -5,7 +5,7 @@
 then
 
 echo "
-touch /PCBSD/conf/.runxsetup
+touch /usr/PCBSD/conf/.runxsetup
 (sleep 5; killall -9 kdm-bin kdm kdeinit4 X) &" > /tmp/.killx
 chmod 755 /tmp/.killx
 

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/conf/PCBSD.amd64
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/conf/PCBSD.amd64	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/conf/PCBSD.amd64	2009-05-29 15:06:34 UTC (rev 4009)
@@ -30,7 +30,7 @@
 options 	PREEMPTION		# Enable kernel thread preemption
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
-options 	SCTP			# Stream Control Transmission Protocol
+options 	SCTP			# Stream Control Transmission Protocol 
 options 	FFS			# Berkeley Fast Filesystem
 options 	SOFTUPDATES		# Enable FFS soft updates support
 options 	UFS_ACL			# Support for access control lists
@@ -50,12 +50,11 @@
 options 	GEOM_LABEL		# Provides labelization
 options 	GEOM_JOURNAL		# Provides GJournal support
 options         GEOM_UZIP 		# UZIP Support
-options 	COMPAT_43TTY		# BSD 4.3 TTY compat (sgtty)
+options 	COMPAT_43TTY		# BSD 4.3 TTY compat [KEEP THIS!]
 options 	COMPAT_IA32		# Compatible with i386 binaries
 options 	COMPAT_FREEBSD4		# Compatible with FreeBSD4
 options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
 options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6
-options 	COMPAT_FREEBSD7		# Compatible with FreeBSD7
 options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
 options 	KTRACE			# ktrace(1) support
 options 	STACK			# stack(9) support
@@ -64,6 +63,7 @@
 options 	SYSVSEM			# SYSV-style semaphores
 options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
 options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
+options 	ADAPTIVE_GIANT		# Giant mutex is adaptive.
 options 	STOP_NMI		# Stop CPUS using NMI instead of IPI
 options 	AUDIT			# Security event auditing
 #options 	KDTRACE_FRAME		# Ensure frames are compiled in
@@ -134,8 +134,6 @@
 # RAID controllers interfaced to the SCSI subsystem
 device		amr		# AMI MegaRAID
 device		arcmsr		# Areca SATA II RAID
-#XXX it is not 64-bit clean, -scottl
-#device		asr		# DPT SmartRAID V, VI and Adaptec SCSI RAID
 device		ciss		# Compaq Smart RAID 5*
 device		dpt		# DPT Smartcache III, IV - See NOTES for options
 device		hptmv		# Highpoint RocketRAID 182x
@@ -178,6 +176,7 @@
 device		cardbus		# CardBus (32-bit) bus
 
 # Serial (COM) ports
+device		sio		# 8250, 16[45]50 based serial ports
 device		uart		# Generic UART driver
 
 # Parallel port
@@ -199,16 +198,15 @@
 device		igb		# Intel PRO/1000 PCIE Server Gigabit Family
 device		ixgb		# Intel PRO/10GbE Ethernet Card
 device		le		# AMD Am7900 LANCE and Am79C9xx PCnet
-device		ti		# Alteon Networks Tigon I/II gigabit Ethernet
 device		txp		# 3Com 3cR990 (``Typhoon'')
 device		vx		# 3Com 3c590, 3c595 (``Vortex'')
 
 # PCI Ethernet NICs that use the common MII bus controller code.
 # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
 device		miibus		# MII bus support
-device		ae		# Attansic/Atheros L2 FastEthernet
-device		age		# Attansic/Atheros L1 Gigabit Ethernet
 device		ale		# Atheros AR8121/AR8113/AR8114 Ethernet
+device		age		# Attansic/Atheros L1 Gigabit Ethernet
+device          ae              # Attansic/Atheros L2 Gigabit Ethernet 
 device		bce		# Broadcom BCM5706/BCM5708 Gigabit Ethernet
 device		bfe		# Broadcom BCM440x 10/100 Ethernet
 device		bge		# Broadcom BCM570xx Gigabit Ethernet
@@ -228,7 +226,6 @@
 device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
 device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
 device		ste		# Sundance ST201 (D-Link DFE-550TX)
-device		stge		# Sundance/Tamarack TC9021 gigabit Ethernet
 device		ti		# Alteon Networks Tigon I/II gigabit Ethernet
 device		tl		# Texas Instruments ThunderLAN
 device		tx		# SMC EtherPower II (83c170 ``EPIC'')
@@ -249,15 +246,15 @@
 
 # Wireless NIC cards
 device		wlan		# 802.11 support
-options 	IEEE80211_DEBUG	# enable debug msgs
-options 	IEEE80211_AMPDU_AGE # age frames in AMPDU reorder q's
 device		wlan_wep	# 802.11 WEP support
 device		wlan_ccmp	# 802.11 CCMP support
 device		wlan_tkip	# 802.11 TKIP support
 device		wlan_amrr	# AMRR transmit rate control algorithm
+device		wlan_scan_ap	# 802.11 AP mode scanning
+device		wlan_scan_sta	# 802.11 STA mode scanning
 device		an		# Aironet 4500/4800 802.11 wireless NICs.
 device		ath		# Atheros pci/cardbus NIC's
-device		ath_hal		# pci/cardbus chip support
+device		ath_hal		# Atheros HAL (Hardware Access Layer)
 options		AH_SUPPORT_AR5416	# enable AR5416 tx/rx descriptors
 device		ath_rate_sample	# SampleRate tx rate control for ath
 device		awi		# BayStack 660 and others
@@ -266,18 +263,20 @@
 device		iwi		# Intel Wireless Adapters
 device		ipw		# Intel Wireless Adapters
 device		wpi		# Intel WPI adapters
+device		firmware	# firmware assist module
 
 
 # Pseudo devices.
 device		loop		# Network loopback
 device		random		# Entropy device
 device		ether		# Ethernet support
+device		sl		# Kernel SLIP
+device		ppp		# Kernel PPP
 device		tun		# Packet tunnel.
-device		pty		# BSD-style compatibility pseudo ttys
+device		pty		# Pseudo-ttys (telnet etc)
 device		md		# Memory "disks"
 device		gif		# IPv6 and IPv4 tunneling
 device		faith		# IPv6-to-IPv4 relaying (translation)
-device		firmware	# firmware assist module
 
 # The `bpf' device enables the Berkeley Packet Filter.
 # Be aware of the administrative consequences of enabling this!
@@ -290,14 +289,15 @@
 device		ehci		# EHCI PCI->USB interface (USB 2.0)
 device		usb		# USB Bus (required)
 #device		udbp		# USB Double Bulk Pipe devices
+device		ugen		# Generic
 device		uhid		# "Human Interface Devices"
 device		ukbd		# Keyboard
-device		ulpt		# Printer
+#device		ulpt		# Printer
 device		umass		# Disks/Mass storage - Requires scbus and da
 device		ums		# Mouse
 device		ural		# Ralink Technology RT2500USB wireless NICs
-device		rum		# Ralink Technology RT2501USB wireless NICs
 device		urio		# Diamond Rio 500 MP3 player
+device		uscanner	# Scanners
 # USB Serial devices
 device		ucom		# Generic com ttys
 device		uark		# Technologies ARK3116 based serial adapters
@@ -316,7 +316,6 @@
 device		cue		# CATC USB Ethernet
 device		kue		# Kawasaki LSI USB Ethernet
 device		rue		# RealTek RTL8150 USB Ethernet
-device		udav		# Davicom DM9601E USB
 
 # FireWire support
 device		firewire	# FireWire bus code

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/conf/PCBSD.i386
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/conf/PCBSD.i386	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/conf/PCBSD.i386	2009-05-29 15:06:34 UTC (rev 4009)
@@ -57,12 +57,11 @@
 options 	PSEUDOFS		# Pseudo-filesystem framework
 options 	GEOM_PART_GPT		# GUID Partition Tables.
 options 	GEOM_LABEL		# Provides labelization
+options 	COMPAT_43TTY		# BSD 4.3 TTY compat [KEEP THIS!]
 options		GEOM_UZIP		# Read-only compressed disks
-options 	COMPAT_43TTY		# BSD 4.3 TTY compat (sgtty)
 options 	COMPAT_FREEBSD4		# Compatible with FreeBSD4
 options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
 options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6
-options 	COMPAT_FREEBSD7		# Compatible with FreeBSD7
 options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
 options 	KTRACE			# ktrace(1) support
 options 	STACK			# stack(9) support
@@ -71,8 +70,8 @@
 options 	SYSVSEM			# SYSV-style semaphores
 options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
 options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
+options 	ADAPTIVE_GIANT		# Giant mutex is adaptive.
 options 	STOP_NMI		# Stop CPUS using NMI instead of IPI
-options  	HWPMC_HOOKS		# Necessary kernel hooks for hwpmc(4)
 options 	AUDIT			# Security event auditing
 
 # To make an SMP kernel, the next two lines are needed
@@ -84,7 +83,6 @@
 
 
 # Bus support.
-device		acpi
 device		eisa
 device		pci
 
@@ -187,6 +185,7 @@
 device		cardbus		# CardBus (32-bit) bus
 
 # Serial (COM) ports
+device		sio		# 8250, 16[45]50 based serial ports
 device		uart		# Generic UART driver
 
 # Parallel port
@@ -208,15 +207,14 @@
 device		igb		# Intel PRO/1000 PCIE Server Gigabit Family
 device		ixgb		# Intel PRO/10GbE Ethernet Card
 device		le		# AMD Am7900 LANCE and Am79C9xx PCnet
-device		ti		# Alteon Networks Tigon I/II gigabit Ethernet
 device		txp		# 3Com 3cR990 (``Typhoon'')
 device		vx		# 3Com 3c590, 3c595 (``Vortex'')
 
 # PCI Ethernet NICs that use the common MII bus controller code.
 # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
 device		miibus		# MII bus support
-device		ae		# Attansic/Atheros L2 FastEthernet
 device		age		# Attansic/Atheros L1 Gigabit Ethernet
+device          ae              # Attansic/Atheros L2 Gigabit Ethernet 
 device		ale		# Atheros AR8121/AR8113/AR8114 Ethernet
 device		bce		# Broadcom BCM5706/BCM5708 Gigabit Ethernet
 device		bfe		# Broadcom BCM440x 10/100 Ethernet
@@ -238,6 +236,7 @@
 device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
 device		ste		# Sundance ST201 (D-Link DFE-550TX)
 device		stge		# Sundance/Tamarack TC9021 gigabit Ethernet
+device		ti		# Alteon Networks Tigon I/II gigabit Ethernet
 device		tl		# Texas Instruments ThunderLAN
 device		tx		# SMC EtherPower II (83c170 ``EPIC'')
 device		vge		# VIA VT612x gigabit Ethernet
@@ -258,35 +257,38 @@
 
 # Wireless NIC cards
 device		wlan		# 802.11 support
-options 	IEEE80211_DEBUG	# enable debug msgs
-options 	IEEE80211_AMPDU_AGE # age frames in AMPDU reorder q's
 device		wlan_wep	# 802.11 WEP support
 device		wlan_ccmp	# 802.11 CCMP support
 device		wlan_tkip	# 802.11 TKIP support
 device		wlan_amrr	# AMRR transmit rate control algorithm
+device		wlan_scan_ap	# 802.11 AP mode scanning
+device		wlan_scan_sta	# 802.11 STA mode scanning
 device		an		# Aironet 4500/4800 802.11 wireless NICs.
 device		ath		# Atheros pci/cardbus NIC's
-device		ath_hal		# pci/cardbus chip support
+device		ath_hal		# Atheros HAL (Hardware Access Layer)
 options		AH_SUPPORT_AR5416	# enable AR5416 tx/rx descriptors
 device		ath_rate_sample	# SampleRate tx rate control for ath
+device		awi		# BayStack 660 and others
 device		ral		# Ralink Technology RT2500 wireless NICs.
 device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
 #device		wl		# Older non 802.11 Wavelan wireless NIC.
 device		iwi		# Intel Wireless Adapters
 device		ipw		# Intel Wireless Adapters
 device		wpi		# Intel WPI adapters
+device		firmware	# firmware assist module
 
 
 # Pseudo devices.
 device		loop		# Network loopback
 device		random		# Entropy device
 device		ether		# Ethernet support
+device		sl		# Kernel SLIP
+device		ppp		# Kernel PPP
 device		tun		# Packet tunnel.
-device		pty		# BSD-style compatibility pseudo ttys
+device		pty		# Pseudo-ttys (telnet etc)
 device		md		# Memory "disks"
 device		gif		# IPv6 and IPv4 tunneling
 device		faith		# IPv6-to-IPv4 relaying (translation)
-device		firmware	# firmware assist module
 
 # The `bpf' device enables the Berkeley Packet Filter.
 # Be aware of the administrative consequences of enabling this!
@@ -299,18 +301,18 @@
 device		ehci		# EHCI PCI->USB interface (USB 2.0)
 device		usb		# USB Bus (required)
 #device		udbp		# USB Double Bulk Pipe devices
+device		ugen		# Generic
 device		uhid		# "Human Interface Devices"
 device		ukbd		# Keyboard
-device		ulpt		# Printer
+#device		ulpt		# Printer
 device		umass		# Disks/Mass storage - Requires scbus and da
 device		ums		# Mouse
 device		ural		# Ralink Technology RT2500USB wireless NICs
 device		rum		# Ralink Technology RT2501USB wireless NICs
-device		zyd		# ZyDAS zb1211/zb1211b wireless NICs
 device		urio		# Diamond Rio 500 MP3 player
+device		uscanner	# Scanners
 # USB Serial devices
 device		ucom		# Generic com ttys
-device		u3g		# USB-based 3G modems (Option, Huawei, Sierra)
 device		uark		# Technologies ARK3116 based serial adapters
 device		ubsa		# Belkin F5U103 and compatible serial adapters
 device		ubser		# BWCT console serial adapters
@@ -327,7 +329,6 @@
 device		cue		# CATC USB Ethernet
 device		kue		# Kawasaki LSI USB Ethernet
 device		rue		# RealTek RTL8150 USB Ethernet
-device		udav		# Davicom DM9601E USB
 
 # FireWire support
 device		firewire	# FireWire bus code

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/conf/pcbsdbase
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/conf/pcbsdbase	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/conf/pcbsdbase	2009-05-29 15:06:34 UTC (rev 4009)
@@ -1 +1 @@
-/PCBSD/local
+/usr/PCBSD/local

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/local/bin/foomatic-rip
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/local/bin/foomatic-rip	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/local/bin/foomatic-rip	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/local/bin/lpr
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/local/bin/lpr	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/local/bin/lpr	2009-05-29 15:06:34 UTC (rev 4009)
@@ -1,2 +1,2 @@
 #!/bin/sh
-/PCBSD/local/bin/gtklp "$@"
+/usr/PCBSD/local/bin/gtklp "$@"

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/local/bin/lprsetup.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/local/bin/lprsetup.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/local/bin/lprsetup.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/local/bin/unix-lpr.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/local/bin/unix-lpr.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/local/bin/unix-lpr.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/local/etc/cups/cupsd.conf
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/local/etc/cups/cupsd.conf	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/local/etc/cups/cupsd.conf	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/local/etc/denyhosts.conf
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/local/etc/denyhosts.conf	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/local/etc/denyhosts.conf	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/local/etc/foomatic/filter.conf
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/local/etc/foomatic/filter.conf	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/local/etc/foomatic/filter.conf	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/local/etc/hp/hplip.conf
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/local/etc/hp/hplip.conf	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/local/etc/hp/hplip.conf	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/local/etc/periodic/monthly/300.statistics
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/local/etc/periodic/monthly/300.statistics	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/local/etc/periodic/monthly/300.statistics	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/local/etc/rc.d/bsdstats.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/local/etc/rc.d/bsdstats.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/local/etc/rc.d/bsdstats.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/local/etc/rc.d/cupsd
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/local/etc/rc.d/cupsd	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/local/etc/rc.d/cupsd	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/local/etc/rc.d/hald
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/local/etc/rc.d/hald	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/local/etc/rc.d/hald	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/local/etc/rc.d/pcbsdinit
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/local/etc/rc.d/pcbsdinit	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/local/etc/rc.d/pcbsdinit	2009-05-29 15:06:34 UTC (rev 4009)
@@ -18,12 +18,12 @@
 
 pcbsd_start()
 {
-	/PCBSD/Scripts/system-start.sh
+	/usr/PCBSD/Scripts/system-start.sh
 }
 
 pcbsd_stop()
 {
-	/PCBSD/Scripts/system-stop.sh
+	/usr/PCBSD/Scripts/system-stop.sh
 }
 
 run_rc_command "$1"

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/local/etc/rc.d/snddetect
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/local/etc/rc.d/snddetect	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/local/etc/rc.d/snddetect	2009-05-29 15:06:34 UTC (rev 4009)
@@ -23,7 +23,7 @@
         then
            rm /tmp/unknownSound
         fi
-	/PCBSD/soundDetect/sound_detect
+	/usr/PCBSD/soundDetect/sound_detect
 }
 
 snddetect_stop()

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/applications/kde4/pcbsdmakeports.desktop
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/applications/kde4/pcbsdmakeports.desktop	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/applications/kde4/pcbsdmakeports.desktop	2009-05-29 15:06:34 UTC (rev 4009)
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
-Exec=/PCBSD/Scripts/runports.sh
-Icon=/PCBSD/images/runports.png
+Exec=/usr/PCBSD/Scripts/runports.sh
+Icon=/usr/PCBSD/images/runports.png
 Type=Application
 Name=Run Ports (root)
 

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/applications/kde4/pcbsdpbu.desktop
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/applications/kde4/pcbsdpbu.desktop	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/applications/kde4/pcbsdpbu.desktop	2009-05-29 15:06:34 UTC (rev 4009)
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Exec=/PCBSD/SystemUpdater/bin/SystemUpdaterTray
+Exec=/usr/PCBSD/SystemUpdater/bin/SystemUpdaterTray
 Icon=preferences-desktop-notification
 Type=Application
 Name=Online Update Notifier

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/applications/kde4/pcbsdrunports.desktop
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/applications/kde4/pcbsdrunports.desktop	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/applications/kde4/pcbsdrunports.desktop	2009-05-29 15:06:34 UTC (rev 4009)
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
-Exec=/PCBSD/Scripts/runports.sh
-Icon=/PCBSD/images/runports.png
+Exec=/usr/PCBSD/Scripts/runports.sh
+Icon=/usr/PCBSD/images/runports.png
 Type=Application
 Name=Run Ports (user)
 

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/applications/kde4/pcbsdxsetup.desktop
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/applications/kde4/pcbsdxsetup.desktop	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/applications/kde4/pcbsdxsetup.desktop	2009-05-29 15:06:34 UTC (rev 4009)
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Exec=/PCBSD/bin/rerunXsetup.sh
+Exec=/usr/PCBSD/bin/rerunXsetup.sh
 Icon=preferences-desktop
 Type=Application
 GenericName=Display Setup Wizard

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/applnk/.hidden/pbistart.desktop
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/applnk/.hidden/pbistart.desktop	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/applnk/.hidden/pbistart.desktop	2009-05-29 15:06:34 UTC (rev 4009)
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=/PCBSD/Scripts/runpbi.sh
+Exec=/usr/PCBSD/Scripts/runpbi.sh
 Icon=/Programs/.config/application.png
 AllowAsDefault=true
 MimeType=application/pbi

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/apps/kdm/sessions/kde.desktop
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/apps/kdm/sessions/kde.desktop	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/apps/kdm/sessions/kde.desktop	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/README
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/README	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/README	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xreset
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xreset	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xreset	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xresources
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xresources	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xresources	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xservers
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xservers	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xservers	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xsession
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xsession	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xsession	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xstartup
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xstartup	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/Xstartup	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/backgroundrc
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/backgroundrc	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/backgroundrc	2009-05-29 15:06:34 UTC (rev 4009)
@@ -13,6 +13,6 @@
 Program=
 ReverseBlending=false
 UseSHM=false
-Wallpaper=/PBCSD/local/share/wallpapers/pcbsd-default.png
+Wallpaper=/usr/PCBSD/local/kde4/share/wallpapers/Galileo/contents/images/1600x1200.png
 WallpaperList=
 WallpaperMode=Scaled

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/kdmrc
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/kdmrc	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/local/kde4/share/config/kdm/kdmrc	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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/oxygen
+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-current/system-overlay/usr/PCBSD/local/lib/nspluginwrapper/noarch/npviewer
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/local/lib/nspluginwrapper/noarch/npviewer	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/local/lib/nspluginwrapper/noarch/npviewer	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/local/libexec/cups/filter/foomatic-rip-hplip
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/local/libexec/cups/filter/foomatic-rip-hplip	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/local/libexec/cups/filter/foomatic-rip-hplip	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/local/share/applications/hplip.desktop
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/local/share/applications/hplip.desktop	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/local/share/applications/hplip.desktop	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/local/share/applnk/.hidden/pbistart.desktop
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/local/share/applnk/.hidden/pbistart.desktop	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/local/share/applnk/.hidden/pbistart.desktop	2009-05-29 15:06:34 UTC (rev 4009)
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=/PCBSD/Scripts/runpbi.sh
+Exec=/usr/PCBSD/Scripts/runpbi.sh
 Icon=/Programs/.config/application.png
 AllowAsDefault=true
 MimeType=application/pbi

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/local/share/fluxbox/init
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/local/share/fluxbox/init	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/local/share/fluxbox/init	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/local/share/mime/packages/freedesktop.org.xml
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/local/share/mime/packages/freedesktop.org.xml	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/local/share/mime/packages/freedesktop.org.xml	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/xorg-gui/bin/rundetect.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/bin/rundetect.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/bin/rundetect.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/xorg-gui/bin/setupconf.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/bin/setupconf.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/bin/setupconf.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -1,32 +1,32 @@
 #!/bin/sh
 
 # Source the settings file
-chmod 755 /PCBSD/xorg-gui/.xsettings.sh
-. /PCBSD/xorg-gui/.xsettings.sh
+chmod 755 /usr/PCBSD/xorg-gui/.xsettings.sh
+. /usr/PCBSD/xorg-gui/.xsettings.sh
 
 # Set our port / pkg database dirs
-PKG_DBDIR="/PCBSD/var/db" ; export PKG_DBDIR
-PORT_DBDIR="/PCBSD/var/db" ; export PORT_DBDIR
+PKG_DBDIR="/usr/PCBSD/var/db/pkg" ; export PKG_DBDIR
+PORT_DBDIR="/usr/PCBSD/var/db/pkg" ; export PORT_DBDIR
 
-TMPFILE="/PCBSD/xorg-gui/.xorg.conf.tmp"
+TMPFILE="/usr/PCBSD/xorg-gui/.xorg.conf.tmp"
 
 # Get the real driver name and save the value from xorg-gui
 SELDRIVER="${DRIVER}" ; export SELDRIVER
-grep "^${DRIVER}:" /PCBSD/xorg-gui/settings/alias.txt >/dev/null 2>/dev/null
+grep "^${DRIVER}:" /usr/PCBSD/xorg-gui/settings/alias.txt >/dev/null 2>/dev/null
 if [ "$?" = "0" ]
 then
-  DRIVER=`cat /PCBSD/xorg-gui/settings/alias.txt | grep "^${DRIVER}:" | cut -d ":" -f 2`
+  DRIVER=`cat /usr/PCBSD/xorg-gui/settings/alias.txt | grep "^${DRIVER}:" | cut -d ":" -f 2`
   export DRIVER
 else
   echo "Warning: Selected driver not found in alias.txt file..."
 fi
 
 # Check if the driver has a special header to use in place of the generic one
-if [ -e "/PCBSD/xorg-gui/templates/header/${DRIVER}.xorg.conf" ]
+if [ -e "/usr/PCBSD/xorg-gui/templates/header/${DRIVER}.xorg.conf" ]
 then
-  cp "/PCBSD/xorg-gui/templates/header/${DRIVER}.xorg.conf" $TMPFILE 
+  cp "/usr/PCBSD/xorg-gui/templates/header/${DRIVER}.xorg.conf" $TMPFILE 
 else
-  cp /PCBSD/xorg-gui/templates/header/xorg.conf.generic $TMPFILE 
+  cp /usr/PCBSD/xorg-gui/templates/header/xorg.conf.generic $TMPFILE 
 fi
 
 
@@ -112,7 +112,7 @@
 # Setup resolution modeline with GTF
 XRES="`echo $RES | cut -d 'x' -f 1`"
 YRES="`echo $RES | cut -d 'x' -f 2`"
-#/PCBSD/xorg-gui/bin/gtf $XRES $YRES $REFRESH >> $TMPFILE
+#/usr/PCBSD/xorg-gui/bin/gtf $XRES $YRES $REFRESH >> $TMPFILE
 
 echo 'EndSection
 
@@ -180,7 +180,7 @@
 
 
 # Copy over the defined template options for the specific driver
-cat /PCBSD/xorg-gui/templates/driver/${DRIVER}.template >>$TMPFILE
+cat /usr/PCBSD/xorg-gui/templates/driver/${DRIVER}.template >>$TMPFILE
 
 # Check if we have a cardbus variable
 if [ -e "/tmp/.cardbus" ]
@@ -304,9 +304,9 @@
 
 
 # See if this driver needs any post-setup operations to run
-if [ -e "/PCBSD/xorg-gui/templates/scripts/${DRIVER}.sh" ]
+if [ -e "/usr/PCBSD/xorg-gui/templates/scripts/${DRIVER}.sh" ]
 then
   # We found the file, so run it
-  sh "/PCBSD/xorg-gui/templates/scripts/${DRIVER}.sh" "${SELDRIVER}"
+  sh "/usr/PCBSD/xorg-gui/templates/scripts/${DRIVER}.sh" "${SELDRIVER}"
 fi
 

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/cardDetect/XF86Config.compat
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/cardDetect/XF86Config.compat	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/cardDetect/XF86Config.compat	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/xorg-gui/cardDetect/XF86Config.default
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/cardDetect/XF86Config.default	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/cardDetect/XF86Config.default	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/xorg-gui/cardDetect/x_config.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/cardDetect/x_config.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/cardDetect/x_config.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/xorg-gui/conf/.fluxbox/init
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/conf/.fluxbox/init	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/conf/.fluxbox/init	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/xorg-gui/conf/ttys.normal
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/conf/ttys.normal	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/conf/ttys.normal	2009-05-29 15:06:34 UTC (rev 4009)
@@ -41,7 +41,7 @@
 ttyv5   "/usr/libexec/getty Pc"         cons25  on  secure
 ttyv6   "/usr/libexec/getty Pc"         cons25  on  secure
 ttyv7   "/usr/libexec/getty Pc"         cons25  on  secure
-ttyv8   "/PCBSD/bin/pdm"                xterm   on  secure
+ttyv8   "/usr/PCBSD/bin/pdm"                xterm   on  secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.
 ttyd0	"/usr/libexec/getty std.9600"	dialup	off secure

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/conf/xorg.conf.basic
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/conf/xorg.conf.basic	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/conf/xorg.conf.basic	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/xorg-gui/settings/alias.txt
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/settings/alias.txt	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/settings/alias.txt	2009-05-29 15:06:34 UTC (rev 4009)
@@ -21,7 +21,7 @@
 nv:nv
 nvidia-173.14.17:nvidia
 nvidia-96.43.11:nvidia
-nvidia-180.44:nvidia
+nvidia-180.51:nvidia
 r128:r128
 radeonhd:radeonhd
 rendition:rendition

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/settings/drivers.txt
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/settings/drivers.txt	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/settings/drivers.txt	2009-05-29 15:06:34 UTC (rev 4009)
@@ -21,7 +21,7 @@
 nv
 nvidia-173.14.17
 nvidia-96.43.11
-nvidia-180.44
+nvidia-180.51
 r128
 radeonhd
 rendition

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/templates/header/ati-3d-enable.xorg.conf
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/templates/header/ati-3d-enable.xorg.conf	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/templates/header/ati-3d-enable.xorg.conf	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/xorg-gui/templates/header/ati.xorg.conf
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/templates/header/ati.xorg.conf	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/templates/header/ati.xorg.conf	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/xorg-gui/templates/header/intel-3d-enable.xorg.conf
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/templates/header/intel-3d-enable.xorg.conf	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/templates/header/intel-3d-enable.xorg.conf	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/xorg-gui/templates/header/intel.xorg.conf
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/templates/header/intel.xorg.conf	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/templates/header/intel.xorg.conf	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/xorg-gui/templates/header/mga-3d-enable.xorg.conf
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/templates/header/mga-3d-enable.xorg.conf	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/templates/header/mga-3d-enable.xorg.conf	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/xorg-gui/templates/header/nvidia.xorg.conf
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/templates/header/nvidia.xorg.conf	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/templates/header/nvidia.xorg.conf	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/xorg-gui/templates/header/xorg.conf.generic
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/templates/header/xorg.conf.generic	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/templates/header/xorg.conf.generic	2009-05-29 15:06:34 UTC (rev 4009)
@@ -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-current/system-overlay/usr/PCBSD/xorg-gui/templates/scripts/README
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/templates/scripts/README	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/templates/scripts/README	2009-05-29 15:06:34 UTC (rev 4009)
@@ -4,4 +4,4 @@
 This may include loading drivers, tweaking configs, etc. 
 
 The script name should match the corresponding entery in the drivers.txt and
-alias.txt files in /PCBSD/xorg-gui/settings/ directory. 
+alias.txt files in /usr/PCBSD/xorg-gui/settings/ directory. 

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/templates/scripts/nvidia.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/templates/scripts/nvidia.sh	2009-05-29 15:05:30 UTC (rev 4008)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/xorg-gui/templates/scripts/nvidia.sh	2009-05-29 15:06:34 UTC (rev 4009)
@@ -4,8 +4,8 @@
 # The selected driver version is set at $1
 DRIVERVER="${1}"
 
-PKG_DBDIR="/PCBSD/var/db"; export PKG_DBDIR
-PORT_DBDIR="/PCBSD/var/db"; export PKG_DBDIR
+PKG_DBDIR="/usr/PCBSD/var/db/pkg"; export PKG_DBDIR
+PORT_DBDIR="/usr/PCBSD/var/db/pkg"; export PKG_DBDIR
 
 
 #Check if the driver is already loaded
@@ -21,8 +21,8 @@
 
 # Add the nvidia driver to the system
 PKGNAME="`echo ${DRIVERVER} | sed -e 's|nvidia-|nvidia-driver-|'`"
-pkg_add -f /PCBSD/packages/${PKGNAME}*.tbz
-pkg_add -f /PCBSD/packages/nvidia-settings*.tbz
+pkg_add -f /usr/PCBSD/packages/${PKGNAME}*.tbz
+pkg_add -f /usr/PCBSD/packages/nvidia-settings*.tbz
 
 #Check if the driver is already loaded
 kldstat | grep nvidia >/dev/null 2>/dev/null



More information about the Commits mailing list