[PC-BSD Commits] r4021 - in pcbsd: trunk/CrashHandler trunk/NetworkManager trunk/NetworkManagerAdmin trunk/NetworkTray trunk/PBIThumbnailCreator trunk/PBIdelete trunk/PBReg trunk/ServiceManager trunk/SoundDetect trunk/SoundError trunk/SystemUpdaterTray trunk/XGUISource trunk/ethernetconfig trunk/kcmPBMsource trunk/kcmPBSystem trunk/kcmPFManager trunk/pcbsdusermanager trunk/wificonfig trunk-current/CrashHandler trunk-current/PBIThumbnailCreator trunk-current/PBIdelete trunk-current/PBReg trunk-current/ServiceManager trunk-current/SoundDetect trunk-current/SoundError trunk-current/SystemUpdaterTray trunk-current/XGUISource trunk-current/kcmPBMsource trunk-current/kcmPBSystem trunk-current/kcmPFManager trunk-current/pcbsdusermanager trunk-current/system-overlay/etc trunk-current/system-overlay/root trunk-current/system-overlay/sbin trunk-current/system-overlay/usr/share/skel trunk-current/system-overlay/usr/share/skel/.config/akonadi trunk-current/system-overlay/usr/share/skel/.fluxbox trunk-current/system-overlay/usr/share/skel/.kde4/Autostart trunk-current/system-overlay/usr/share/skel/.kde4/share/config trunk-current/system-overlay/usr/share/skel/Desktop

svn at pcbsd.org svn at pcbsd.org
Mon Jun 1 11:40:53 PDT 2009


Author: kris
Date: 2009-06-01 11:40:52 -0700 (Mon, 01 Jun 2009)
New Revision: 4021

Removed:
   pcbsd/trunk-current/system-overlay/usr/share/skel/.kde4/share/config/konsole.notifyrc
Modified:
   pcbsd/trunk-current/CrashHandler/CrashHandler.pro
   pcbsd/trunk-current/PBIThumbnailCreator/CMakeLists.txt
   pcbsd/trunk-current/PBIdelete/PBIdelete.pro
   pcbsd/trunk-current/PBReg/PBReg.pro
   pcbsd/trunk-current/ServiceManager/servicemanager.pro
   pcbsd/trunk-current/SoundDetect/Makefile
   pcbsd/trunk-current/SoundError/SoundError.pro
   pcbsd/trunk-current/SystemUpdaterTray/SystemUpdaterTray.pro
   pcbsd/trunk-current/XGUISource/XGUI.pro
   pcbsd/trunk-current/kcmPBMsource/PBM.pro
   pcbsd/trunk-current/kcmPBSystem/PBSystem.pro
   pcbsd/trunk-current/kcmPFManager/pfmanager.pro
   pcbsd/trunk-current/pcbsdusermanager/pcbsdusermanager.pro
   pcbsd/trunk-current/system-overlay/etc/gettytab
   pcbsd/trunk-current/system-overlay/etc/login.conf
   pcbsd/trunk-current/system-overlay/etc/make.conf
   pcbsd/trunk-current/system-overlay/etc/manpath.config
   pcbsd/trunk-current/system-overlay/etc/periodic.conf.local
   pcbsd/trunk-current/system-overlay/etc/rc.conf.local
   pcbsd/trunk-current/system-overlay/etc/rc.local
   pcbsd/trunk-current/system-overlay/root/.cshrc
   pcbsd/trunk-current/system-overlay/root/.profile
   pcbsd/trunk-current/system-overlay/root/.xprofile
   pcbsd/trunk-current/system-overlay/sbin/mount_ntfs
   pcbsd/trunk-current/system-overlay/usr/share/skel/.config/akonadi/akonadiserverrc
   pcbsd/trunk-current/system-overlay/usr/share/skel/.fluxbox/menuconfig
   pcbsd/trunk-current/system-overlay/usr/share/skel/.gtkrc-2.0
   pcbsd/trunk-current/system-overlay/usr/share/skel/.kde4/Autostart/checksounderror.sh
   pcbsd/trunk-current/system-overlay/usr/share/skel/.kde4/Autostart/checkupdater.sh
   pcbsd/trunk-current/system-overlay/usr/share/skel/.kde4/share/config/kde.notifyrc
   pcbsd/trunk-current/system-overlay/usr/share/skel/.kde4/share/config/kickoffrc
   pcbsd/trunk-current/system-overlay/usr/share/skel/.kde4/share/config/ksambaplugin
   pcbsd/trunk-current/system-overlay/usr/share/skel/.xprofile
   pcbsd/trunk-current/system-overlay/usr/share/skel/Desktop/guide.desktop
   pcbsd/trunk-current/system-overlay/usr/share/skel/dot.cshrc
   pcbsd/trunk-current/system-overlay/usr/share/skel/dot.profile
   pcbsd/trunk/CrashHandler/CrashHandler.pro
   pcbsd/trunk/NetworkManager/NetworkManager.pro
   pcbsd/trunk/NetworkManagerAdmin/NetworkManagerAdmin.pro
   pcbsd/trunk/NetworkTray/NetworkTray.pro
   pcbsd/trunk/PBIThumbnailCreator/CMakeLists.txt
   pcbsd/trunk/PBIdelete/PBIdelete.pro
   pcbsd/trunk/PBReg/PBReg.pro
   pcbsd/trunk/ServiceManager/servicemanager.pro
   pcbsd/trunk/SoundDetect/Makefile
   pcbsd/trunk/SoundError/SoundError.pro
   pcbsd/trunk/SystemUpdaterTray/SystemUpdaterTray.pro
   pcbsd/trunk/XGUISource/XGUI.pro
   pcbsd/trunk/ethernetconfig/ethernetconfig.pro
   pcbsd/trunk/kcmPBMsource/PBM.pro
   pcbsd/trunk/kcmPBSystem/PBSystem.pro
   pcbsd/trunk/kcmPFManager/pfmanager.pro
   pcbsd/trunk/pcbsdusermanager/pcbsdusermanager.pro
   pcbsd/trunk/wificonfig/wificonfig.pro
Log:

Updated all our tools to use /usr/PCBSD properly now




Modified: pcbsd/trunk/CrashHandler/CrashHandler.pro
===================================================================
--- pcbsd/trunk/CrashHandler/CrashHandler.pro	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk/CrashHandler/CrashHandler.pro	2009-06-01 18:40:52 UTC (rev 4021)
@@ -4,7 +4,7 @@
 CONFIG	+= qt warn_on release
 
 TARGET=CrashHandler-bin
-DESTDIR=/PCBSD/bin/
+DESTDIR=/usr/PCBSD/bin/
 
 SOURCES	+= main.cpp crashhandler.cpp details.cpp
 
@@ -21,8 +21,8 @@
 
 TRANSLATIONS = CrashHandler_en.ts
 
-INCLUDEPATH     += /PCBSD/includes /PCBSD/local/kde4/include
+INCLUDEPATH     += /usr/PCBSD/includes /usr/PCBSD/local/kde4/include
 
-QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
+QMAKE_LIBDIR = /usr/PCBSD/local/kde4/lib /usr/PCBSD/local/lib/qt4 /usr/PCBSD/local/lib
 
 QT +=qt3support

Modified: pcbsd/trunk/NetworkManager/NetworkManager.pro
===================================================================
--- pcbsd/trunk/NetworkManager/NetworkManager.pro	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk/NetworkManager/NetworkManager.pro	2009-06-01 18:40:52 UTC (rev 4021)
@@ -3,9 +3,9 @@
 
 CONFIG	+= qt warn_on debug release
 
-INCLUDEPATH	+= /PCBSD/includes /PCBSD/local/kde4/include
+INCLUDEPATH	+= /usr/PCBSD/includes /usr/PCBSD/local/kde4/include
 
-LIBS += -L/PCBSD/local/kde4/lib -L/PCBSD/local/lib/ -lpcbsd -lkdecore -lkio -lkdeui -Ikdelibs
+LIBS += -L/usr/PCBSD/local/kde4/lib -L/usr/PCBSD/local/lib/ -lpcbsd -lkdecore -lkio -lkdeui -Ikdelibs
 
 HEADERS	+= kcm.h restartpopup.h networkman.h
 
@@ -17,10 +17,10 @@
 
 TARGET  = kcm_pcbsdnetwork
 
-DESTDIR = /PCBSD/local/kde4/lib/kde4/
+DESTDIR = /usr/PCBSD/local/kde4/lib/kde4/
 
 TRANSLATIONS = NetworkManager_en.ts
 
-QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
+QMAKE_LIBDIR = /usr/PCBSD/local/kde4/lib /usr/PCBSD/local/lib/qt4 /usr/PCBSD/local/lib
 
 QT += qt3support

Modified: pcbsd/trunk/NetworkManagerAdmin/NetworkManagerAdmin.pro
===================================================================
--- pcbsd/trunk/NetworkManagerAdmin/NetworkManagerAdmin.pro	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk/NetworkManagerAdmin/NetworkManagerAdmin.pro	2009-06-01 18:40:52 UTC (rev 4021)
@@ -3,9 +3,9 @@
 
 CONFIG	+= qt warn_on debug release
 
-INCLUDEPATH	+= /PCBSD/includes /PCBSD/local/kde4/include
+INCLUDEPATH	+= /usr/PCBSD/includes /usr/PCBSD/local/kde4/include
 
-LIBS += -L/PCBSD/local/kde4/lib -L/PCBSD/local/lib/ -lpcbsd -lkdecore -lkio -lkdeui -Ikdelibs
+LIBS += -L/usr/PCBSD/local/kde4/lib -L/usr/PCBSD/local/lib/ -lpcbsd -lkdecore -lkio -lkdeui -Ikdelibs
 
 HEADERS	+= netmanadmin.h
 
@@ -17,8 +17,8 @@
 
 TARGET  = NetworkManAdmin-bin
 
-DESTDIR = /PCBSD/networkmanager/bin/
+DESTDIR = /usr/PCBSD/networkmanager/bin/
 
 TRANSLATIONS = NetworkManagerAdmin_en.ts
 
-QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
+QMAKE_LIBDIR = /usr/PCBSD/local/kde4/lib /usr/PCBSD/local/lib/qt4 /usr/PCBSD/local/lib

Modified: pcbsd/trunk/NetworkTray/NetworkTray.pro
===================================================================
--- pcbsd/trunk/NetworkTray/NetworkTray.pro	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk/NetworkTray/NetworkTray.pro	2009-06-01 18:40:52 UTC (rev 4021)
@@ -3,18 +3,18 @@
 
 CONFIG	+= qt warn_on
 TARGET  = NetworkTray
-DESTDIR = /PCBSD/networkmanager/bin/
+DESTDIR = /usr/PCBSD/networkmanager/bin/
 
-INCLUDEPATH += /PCBSD/local/kde4/include
+INCLUDEPATH += /usr/PCBSD/local/kde4/include
 
-LIBS += -L/PCBSD/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs
+LIBS += -L/usr/PCBSD/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs
 
 HEADERS	+= NetworkTray.h
 
 SOURCES	+= main.cpp \
 	NetworkTray.cpp
 
-QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
+QMAKE_LIBDIR = /usr/PCBSD/local/kde4/lib /usr/PCBSD/local/lib/qt4 /usr/PCBSD/local/lib
 
 QT += qt3support
 

Modified: pcbsd/trunk/PBIThumbnailCreator/CMakeLists.txt
===================================================================
--- pcbsd/trunk/PBIThumbnailCreator/CMakeLists.txt	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk/PBIThumbnailCreator/CMakeLists.txt	2009-06-01 18:40:52 UTC (rev 4021)
@@ -1,10 +1,10 @@
 PROJECT (PBI_ThumbnailCreator)
-set(CMAKE_PREFIX_PATH /PCBSD/local/kde4)
+set(CMAKE_PREFIX_PATH /usr/PCBSD/local/kde4)
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
 cmake_minimum_required(VERSION 2.4.0)
 
 
-set(CMAKE_INSTALL_PREFIX:PATH "/PCBSD/local/kde4")
+set(CMAKE_INSTALL_PREFIX:PATH "/usr/PCBSD/local/kde4")
 find_package(Qt4 REQUIRED)
 find_package(KDE4 REQUIRED)
 include(FindAutomoc4)
@@ -18,7 +18,7 @@
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  ${KDE4_ENABLE_EXCEPTIONS}")
 
 link_directories(${KDE4_LIB_DIR})
-include_directories(${KDE4_INCLUDE_DIR} ${QT_INCLUDE_DIR} /PCBSD/local/include ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${KDE4_INCLUDE_DIR} ${QT_INCLUDE_DIR} /usr/PCBSD/local/include ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
 set (pbithumbnail_SRCS
  pbicreator.cpp
@@ -32,5 +32,5 @@
 
 ### INSTALL ###
 
-INSTALL_TARGETS(../../../PCBSD/local/kde4/lib/kde4 pbithumbnail)
-install(FILES pbithumbnail.desktop DESTINATION /PCBSD/local/kde4/share/kde4/services)
+INSTALL(TARGETS pbithumbnail DESTINATION ${KDE4_LIB_INSTALL_DIR}/kde4 )
+install(FILES pbithumbnail.desktop DESTINATION /usr/PCBSD/local/kde4/share/kde4/services)

Modified: pcbsd/trunk/PBIdelete/PBIdelete.pro
===================================================================
--- pcbsd/trunk/PBIdelete/PBIdelete.pro	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk/PBIdelete/PBIdelete.pro	2009-06-01 18:40:52 UTC (rev 4021)
@@ -3,7 +3,7 @@
 
 CONFIG	+= qt warn_on release
 TARGET  = PBIdelete
-DESTDIR = /PCBSD/bin/
+DESTDIR = /usr/PCBSD/bin/
 
 SOURCES	+= main.cpp
 
@@ -12,7 +12,7 @@
 
 QT +=qt3support
 
-INCLUDEPATH     += /PCBSD/includes /PCBSD/local/kde4/include
+INCLUDEPATH     += /usr/PCBSD/includes /usr/PCBSD/local/kde4/include
 
-QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
+QMAKE_LIBDIR = /usr/PCBSD/local/kde4/lib /usr/PCBSD/local/lib/qt4 /usr/PCBSD/local/lib
 

Modified: pcbsd/trunk/PBReg/PBReg.pro
===================================================================
--- pcbsd/trunk/PBReg/PBReg.pro	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk/PBReg/PBReg.pro	2009-06-01 18:40:52 UTC (rev 4021)
@@ -3,7 +3,7 @@
 
 CONFIG	+= qt warn_on release
 TARGET  = PBReg
-DESTDIR = /PCBSD/bin/
+DESTDIR = /usr/PCBSD/bin/
 
 SOURCES	+= main.cpp
 
@@ -11,7 +11,7 @@
 
 QT +=qt3support
 
-INCLUDEPATH     += /PCBSD/includes /PCBSD/local/kde4/include
+INCLUDEPATH     += /usr/PCBSD/includes /usr/PCBSD/local/kde4/include
 
-QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
+QMAKE_LIBDIR = /usr/PCBSD/local/kde4/lib /usr/PCBSD/local/lib/qt4 /usr/PCBSD/local/lib
 

Modified: pcbsd/trunk/ServiceManager/servicemanager.pro
===================================================================
--- pcbsd/trunk/ServiceManager/servicemanager.pro	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk/ServiceManager/servicemanager.pro	2009-06-01 18:40:52 UTC (rev 4021)
@@ -3,14 +3,14 @@
 
 CONFIG	+= qt warn_on release
 
-INCLUDEPATH += /PCBSD/local/kde4/include
+INCLUDEPATH += /usr/PCBSD/local/kde4/include
 
-LIBS += -L/PCBSD/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs
+LIBS += -L/usr/PCBSD/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs
 
 
 TARGET  = kcm_pcbsdservices
 
-DESTDIR = /PCBSD/local/kde4/lib/kde4/
+DESTDIR = /usr/PCBSD/local/kde4/lib/kde4/
 
 
 HEADERS	+= kcm.h notroot.h servicemanager.h
@@ -24,4 +24,4 @@
 
 QT += qt3support
 
-QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
+QMAKE_LIBDIR = /usr/PCBSD/local/kde4/lib /usr/PCBSD/local/lib/qt4 /usr/PCBSD/local/lib

Modified: pcbsd/trunk/SoundDetect/Makefile
===================================================================
--- pcbsd/trunk/SoundDetect/Makefile	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk/SoundDetect/Makefile	2009-06-01 18:40:52 UTC (rev 4021)
@@ -3,8 +3,8 @@
 
 OBJECTS= sound_detect.o parse_sound.o 
 CC=/usr/bin/gcc
-INCLUDES=-I/PCBSD/local/include -I/PCBSD/local/include/libxml2  -I/PCBSD/local/include/curl
-LIB=-L/PCBSD/local/lib -lxml2  -L/PCBSD/local/lib -lcurl
+INCLUDES=-I/usr/PCBSD/local/include -I/usr/PCBSD/local/include/libxml2  -I/usr/PCBSD/local/include/curl
+LIB=-L/usr/PCBSD/local/lib -lxml2  -L/usr/PCBSD/local/lib -lcurl
 
 sound_detect : $(OBJECTS)
 	 $(CC) $(OBJECTS)   $(LIB) -o $(.TARGET)  

Modified: pcbsd/trunk/SoundError/SoundError.pro
===================================================================
--- pcbsd/trunk/SoundError/SoundError.pro	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk/SoundError/SoundError.pro	2009-06-01 18:40:52 UTC (rev 4021)
@@ -1,13 +1,13 @@
 TEMPLATE	= app
 LANGUAGE	= C++
 
-LIBS	+= -L/PCBSD/local/kde4/lib -lkdeui -lkdecore -lkio
+LIBS	+= -L/usr/PCBSD/local/kde4/lib -lkdeui -lkdecore -lkio
 
 CONFIG	+= qt warn_on release
 
 TARGET=SoundError
 
-DESTDIR=/PCBSD/bin/
+DESTDIR=/usr/PCBSD/bin/
 
 SOURCES	+= main.cpp snddialog.cpp
 
@@ -19,7 +19,7 @@
 
 TRANSLATIONS = SoundError_en.ts
 
-INCLUDEPATH     += /PCBSD/includes /PCBSD/local/kde4/include
+INCLUDEPATH     += /usr/PCBSD/includes /usr/PCBSD/local/kde4/include
 
-QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
+QMAKE_LIBDIR = /usr/PCBSD/local/kde4/lib /usr/PCBSD/local/lib/qt4 /usr/PCBSD/local/lib
 

Modified: pcbsd/trunk/SystemUpdaterTray/SystemUpdaterTray.pro
===================================================================
--- pcbsd/trunk/SystemUpdaterTray/SystemUpdaterTray.pro	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk/SystemUpdaterTray/SystemUpdaterTray.pro	2009-06-01 18:40:52 UTC (rev 4021)
@@ -13,13 +13,13 @@
 
 RESOURCES += SystemUpdaterTray.qrc
 
-INCLUDEPATH += /PCBSD/local/kde4/include /usr/local/kde4/include
+INCLUDEPATH += /usr/PCBSD/local/kde4/include /usr/local/kde4/include
 
-LIBS += -L/PCBSD/local/kde4/lib -L/usr/local/kde4/lib
+LIBS += -L/usr/PCBSD/local/kde4/lib -L/usr/local/kde4/lib
 
-QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
+QMAKE_LIBDIR = /usr/PCBSD/local/kde4/lib /usr/PCBSD/local/lib/qt4 /usr/PCBSD/local/lib /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
 
 TARGET  = SystemUpdaterTray
-DESTDIR = /PCBSD/SystemUpdater/bin/
+DESTDIR = /usr/PCBSD/SystemUpdater/bin/
 
 QT += qt3support

Modified: pcbsd/trunk/XGUISource/XGUI.pro
===================================================================
--- pcbsd/trunk/XGUISource/XGUI.pro	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk/XGUISource/XGUI.pro	2009-06-01 18:40:52 UTC (rev 4021)
@@ -5,9 +5,9 @@
 
 TRANSLATIONS = xgui_en.ts
 
-LIBS += -L/PCBSD/local/kde4/lib -L/PCBSD/local/lib/qt4 -lkdecore -lkio -lkdeui -Ikdelibs
+LIBS += -L/usr/PCBSD/local/kde4/lib -L/usr/PCBSD/local/lib/qt4 -lkdecore -lkio -lkdeui -Ikdelibs
 
-QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4
+QMAKE_LIBDIR = /usr/PCBSD/local/kde4/lib /usr/PCBSD/local/lib/qt4
 
 SOURCES	+= main.cpp xgui.cpp dialogconfirm.cpp
 
@@ -18,12 +18,12 @@
 
 RESOURCES += XGUI.qrc
 
-INCLUDEPATH += /PCBSD/local/kde4/include
+INCLUDEPATH += /usr/PCBSD/local/kde4/include
 
 
 TARGET  = XGUI
 
-DESTDIR = /PCBSD/xorg-gui/bin/
+DESTDIR = /usr/PCBSD/xorg-gui/bin/
 
 QT +=qt3support
 

Modified: pcbsd/trunk/ethernetconfig/ethernetconfig.pro
===================================================================
--- pcbsd/trunk/ethernetconfig/ethernetconfig.pro	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk/ethernetconfig/ethernetconfig.pro	2009-06-01 18:40:52 UTC (rev 4021)
@@ -3,7 +3,7 @@
 
 CONFIG	+= qt warn_on release
 
-LIBS	+= -L/PCBSD/local/kde4/lib -lkdeui -lkdecore -lkio -lpcbsd
+LIBS	+= -L/usr/PCBSD/local/kde4/lib -lkdeui -lkdecore -lkio -lpcbsd
 
 HEADERS += ethernetconfig.h 
 
@@ -18,11 +18,11 @@
 
 TARGET  = ethernetconfig
 
-DESTDIR = /PCBSD/networkmanager/bin/
+DESTDIR = /usr/PCBSD/networkmanager/bin/
 
 QT += qt3support
 
-INCLUDEPATH     += /PCBSD/includes /PCBSD/local/kde4/include
+INCLUDEPATH     += /usr/PCBSD/includes /usr/PCBSD/local/kde4/include
 
-QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
+QMAKE_LIBDIR = /usr/PCBSD/local/kde4/lib /usr/PCBSD/local/lib/qt4 /usr/PCBSD/local/lib
 

Modified: pcbsd/trunk/kcmPBMsource/PBM.pro
===================================================================
--- pcbsd/trunk/kcmPBMsource/PBM.pro	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk/kcmPBMsource/PBM.pro	2009-06-01 18:40:52 UTC (rev 4021)
@@ -3,7 +3,7 @@
 
 CONFIG	+= qt warn_on release
 
-LIBS += -L/PCBSD/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs
+LIBS += -L/usr/PCBSD/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs
 
 HEADERS	+= kcm.h notroot.h pbm.h updaterDialog.h
 
@@ -20,13 +20,13 @@
 
 TARGET  = kcm_pcbsdpbm
 
-DESTDIR = /PCBSD/local/kde4/lib/kde4
+DESTDIR = /usr/PCBSD/local/kde4/lib/kde4
 
 TRANSLATIONS = PBM_en_US.ts 
 
 QT +=  qt3support webkit
 
-INCLUDEPATH     += /PCBSD/includes /PCBSD/local/kde4/include
+INCLUDEPATH     += /usr/PCBSD/includes /usr/PCBSD/local/kde4/include
 
-QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
+QMAKE_LIBDIR = /usr/PCBSD/local/kde4/lib /usr/PCBSD/local/lib/qt4 /usr/PCBSD/local/lib
 

Modified: pcbsd/trunk/kcmPBSystem/PBSystem.pro
===================================================================
--- pcbsd/trunk/kcmPBSystem/PBSystem.pro	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk/kcmPBSystem/PBSystem.pro	2009-06-01 18:40:52 UTC (rev 4021)
@@ -3,9 +3,9 @@
 
 CONFIG	+= qt warn_on release
 
-LIBS	+= -Ikdelibs -L/PCBSD/local/kde4/lib -lkdecore -lkio -lkdeui -lpcbsd
+LIBS	+= -Ikdelibs -L/usr/PCBSD/local/kde4/lib -lkdecore -lkio -lkdeui -lpcbsd
 
-INCLUDEPATH	+= /PCBSD/includes /PCBSD/local/kde4/include
+INCLUDEPATH	+= /usr/PCBSD/includes /usr/PCBSD/local/kde4/include
 
 HEADERS	+= kcm.h notroot.h cvsupprogress.h fastestcvsup.h pbsystemtab.h portsnapprogress.h
 
@@ -21,10 +21,10 @@
 
 TARGET  = kcm_pcbsdsystem
 
-DESTDIR = /PCBSD/local/kde4/lib/kde4/
+DESTDIR = /usr/PCBSD/local/kde4/lib/kde4/
 
 TRANSLATIONS = PBSystem_en.ts PBSystem_af.ts PBSystem_ar.ts PBSystem_az.ts PBSystem_bg.ts PBSystem_bn.ts PBSystem_bs.ts PBSystem_ca.ts PBSystem_cs.ts PBSystem_cy.ts PBSystem_da.ts PBSystem_de.ts PBSystem_el.ts PBSystem_es.ts PBSystem_et.ts PBSystem_eu.ts PBSystem_fa.ts PBSystem_fi.ts PBSystem_fr.ts PBSystem_gl.ts PBSystem_he.ts PBSystem_hi.ts PBSystem_hr.ts PBSystem_hu.ts PBSystem_id.ts PBSystem_is.ts PBSystem_it.ts PBSystem_ja.ts PBSystem_ka.ts PBSystem_ko.ts PBSystem_lt.ts PBSystem_lv.ts PBSystem_mk.ts PBSystem_mn.ts PBSystem_ms.ts PBSystem_mt.ts PBSystem_nb.ts PBSystem_nl.ts PBSystem_pa.ts PBSystem_pl.ts PBSystem_pt.ts PBSystem_pt_BR.ts PBSystem_ro.ts PBSystem_ru.ts PBSystem_sk.ts PBSystem_sl.ts PBSystem_sr.ts PBSystem_sv.ts PBSystem_ta.ts PBSystem_tg.ts PBSystem_th.ts PBSystem_tr.ts PBSystem_uk.ts PBSystem_uz.ts PBSystem_vi.ts PBSystem_zh_CN.ts PBSystem_zh_HK.ts PBSystem_zh_TW.ts PBSystem_zu.ts
 
-QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
+QMAKE_LIBDIR = /usr/PCBSD/local/kde4/lib /usr/PCBSD/local/lib/qt4 /usr/PCBSD/local/lib
 
 QT += qt3support

Modified: pcbsd/trunk/kcmPFManager/pfmanager.pro
===================================================================
--- pcbsd/trunk/kcmPFManager/pfmanager.pro	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk/kcmPFManager/pfmanager.pro	2009-06-01 18:40:52 UTC (rev 4021)
@@ -5,9 +5,9 @@
 
 INCLUDEPATH	+= . config
 
-INCLUDEPATH += /PCBSD/local/kde4/include
+INCLUDEPATH += /usr/PCBSD/local/kde4/include
 
-LIBS += -L/PCBSD/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs
+LIBS += -L/usr/PCBSD/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs
 
 
 HEADERS	+= kcm.hpp \
@@ -39,25 +39,25 @@
 RESOURCES += pfmanager.qrc
 
 
-TARGET = /PCBSD/local/kde4/lib/kde4/kcm_pfmanager
+TARGET = /usr/PCBSD/local/kde4/lib/kde4/kcm_pfmanager
 DEPENDPATH += config
 
 TRANSLATIONS = PFManager_en.ts \
                PFManager_de.ts
 
-desktop.path=/PCBSD/local/kde4/share/applications/kde4/
+desktop.path=/usr/PCBSD/local/kde4/share/applications/kde4/
 desktop.files=kcm_pfmanager.desktop
 
-kcm.path=/PCBSD/local/kde4/lib/kde4/
+kcm.path=/usr/PCBSD/local/kde4/lib/kde4/
 kcm.files=kcm_pfmanager.la
-kcm.extra=cp -f libkcm_pfmanager.so.1.0.0 /PCBSD/local/kde4/lib/kde4/kcm_pfmanager.so
+kcm.extra=cp -f libkcm_pfmanager.so.1.0.0 /usr/PCBSD/local/kde4/lib/kde4/kcm_pfmanager.so
 
-lang.path=/PCBSD/LANGS/
+lang.path=/usr/PCBSD/LANGS/
 lang.files=PFManager_en.ts PFManager_de.ts
 
 INSTALLS += lang desktop kcm
 
-QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
+QMAKE_LIBDIR = /usr/PCBSD/local/kde4/lib /usr/PCBSD/local/lib/qt4 /usr/PCBSD/local/lib
 
 
 QT += qt3support

Modified: pcbsd/trunk/pcbsdusermanager/pcbsdusermanager.pro
===================================================================
--- pcbsd/trunk/pcbsdusermanager/pcbsdusermanager.pro	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk/pcbsdusermanager/pcbsdusermanager.pro	2009-06-01 18:40:52 UTC (rev 4021)
@@ -4,7 +4,7 @@
 CONFIG  += dll
 
 
-LIBS += -L/PCBSD/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs -lcrypt
+LIBS += -L/usr/PCBSD/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs -lcrypt
 
 SOURCES += notroot.cpp \
 	group.cpp \
@@ -37,21 +37,21 @@
 
 RESOURCES += pcbsdusermanager.qrc
 
-INCLUDEPATH += /PCBSD/local/kde4/include /PCBSD/local/include/qt4
+INCLUDEPATH += /usr/PCBSD/local/kde4/include /usr/PCBSD/local/include/qt4
 
-TARGET = /PCBSD/local/kde4/lib/kde4/kcm_pcbsdusermanager
+TARGET = /usr/PCBSD/local/kde4/lib/kde4/kcm_pcbsdusermanager
 
 TRANSLATIONS = pcbsdusermanager_en.ts
 
-desktop.path=/PCBSD/local/kde4/share/applications/kde4/
+desktop.path=/usr/PCBSD/local/kde4/share/applications/kde4/
 desktop.files=kcm_pcbsdusermanager.desktop
 
-kcm.path=/PCBSD/local/kde4/lib/kde4/
+kcm.path=/usr/PCBSD/local/kde4/lib/kde4/
 kcm.files=kcm_pcbsdusermanager.la
-kcm.extra=cp -f libkcm_pcbsdusermanager.so.1.0.0 /PCBSD/local/kde4/lib/kde4/kcm_pcbsdusermanager.so
+kcm.extra=cp -f libkcm_pcbsdusermanager.so.1.0.0 /usr/PCBSD/local/kde4/lib/kde4/kcm_pcbsdusermanager.so
 
 INSTALLS += desktop kcm
 
-QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
+QMAKE_LIBDIR = /usr/PCBSD/local/kde4/lib /usr/PCBSD/local/lib/qt4 /usr/PCBSD/local/lib
 
 QT += qt3support

Modified: pcbsd/trunk/wificonfig/wificonfig.pro
===================================================================
--- pcbsd/trunk/wificonfig/wificonfig.pro	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk/wificonfig/wificonfig.pro	2009-06-01 18:40:52 UTC (rev 4021)
@@ -3,9 +3,9 @@
 
 CONFIG	+= qt warn_on release
 
-LIBS	+= -L/PCBSD/local/kde4/lib -lkdeui -lkdecore -lkio -lpcbsd
+LIBS	+= -L/usr/PCBSD/local/kde4/lib -lkdeui -lkdecore -lkio -lpcbsd
 
-INCLUDEPATH	+= /PCBSD/includes /PCBSD/local/kde4/include
+INCLUDEPATH	+= /usr/PCBSD/includes /usr/PCBSD/local/kde4/include
 
 HEADERS += dialogwpaenterprise.h \
 	   dialogwpapersonal.h \
@@ -35,8 +35,8 @@
 
 TARGET  = wificonfig
 
-QMAKE_LIBDIR	= /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
+QMAKE_LIBDIR	= /usr/PCBSD/local/kde4/lib /usr/PCBSD/local/lib/qt4 /usr/PCBSD/local/lib
 
-DESTDIR = /PCBSD/networkmanager/bin/
+DESTDIR = /usr/PCBSD/networkmanager/bin/
 
 QT += qt3support

Modified: pcbsd/trunk-current/CrashHandler/CrashHandler.pro
===================================================================
--- pcbsd/trunk-current/CrashHandler/CrashHandler.pro	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/CrashHandler/CrashHandler.pro	2009-06-01 18:40:52 UTC (rev 4021)
@@ -4,7 +4,7 @@
 CONFIG	+= qt warn_on release
 
 TARGET=CrashHandler-bin
-DESTDIR=/PCBSD/bin/
+DESTDIR=/usr/PCBSD/bin/
 
 SOURCES	+= main.cpp crashhandler.cpp details.cpp
 
@@ -21,8 +21,8 @@
 
 TRANSLATIONS = CrashHandler_en.ts
 
-INCLUDEPATH     += /PCBSD/includes /PCBSD/local/kde4/include
+INCLUDEPATH     += /usr/PCBSD/includes /usr/PCBSD/local/kde4/include
 
-QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
+QMAKE_LIBDIR = /usr/PCBSD/local/kde4/lib /usr/PCBSD/local/lib/qt4 /usr/PCBSD/local/lib
 
 QT +=qt3support

Modified: pcbsd/trunk-current/PBIThumbnailCreator/CMakeLists.txt
===================================================================
--- pcbsd/trunk-current/PBIThumbnailCreator/CMakeLists.txt	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/PBIThumbnailCreator/CMakeLists.txt	2009-06-01 18:40:52 UTC (rev 4021)
@@ -1,10 +1,10 @@
 PROJECT (PBI_ThumbnailCreator)
-set(CMAKE_PREFIX_PATH /PCBSD/local/kde4)
+set(CMAKE_PREFIX_PATH /usr/PCBSD/local/kde4)
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
 cmake_minimum_required(VERSION 2.4.0)
 
 
-set(CMAKE_INSTALL_PREFIX:PATH "/PCBSD/local/kde4")
+set(CMAKE_INSTALL_PREFIX:PATH "/usr/PCBSD/local/kde4")
 find_package(Qt4 REQUIRED)
 find_package(KDE4 REQUIRED)
 include(FindAutomoc4)
@@ -18,7 +18,7 @@
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  ${KDE4_ENABLE_EXCEPTIONS}")
 
 link_directories(${KDE4_LIB_DIR})
-include_directories(${KDE4_INCLUDE_DIR} ${QT_INCLUDE_DIR} /PCBSD/local/include ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${KDE4_INCLUDE_DIR} ${QT_INCLUDE_DIR} /usr/PCBSD/local/include ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
 set (pbithumbnail_SRCS
  pbicreator.cpp
@@ -32,5 +32,5 @@
 
 ### INSTALL ###
 
-INSTALL_TARGETS(../../../PCBSD/local/kde4/lib/kde4 pbithumbnail)
-install(FILES pbithumbnail.desktop DESTINATION /PCBSD/local/kde4/share/kde4/services)
+INSTALL(TARGETS pbithumbnail DESTINATION ${KDE4_LIB_INSTALL_DIR}/kde4 )
+install(FILES pbithumbnail.desktop DESTINATION /usr/PCBSD/local/kde4/share/kde4/services)

Modified: pcbsd/trunk-current/PBIdelete/PBIdelete.pro
===================================================================
--- pcbsd/trunk-current/PBIdelete/PBIdelete.pro	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/PBIdelete/PBIdelete.pro	2009-06-01 18:40:52 UTC (rev 4021)
@@ -3,7 +3,7 @@
 
 CONFIG	+= qt warn_on release
 TARGET  = PBIdelete
-DESTDIR = /PCBSD/bin/
+DESTDIR = /usr/PCBSD/bin/
 
 SOURCES	+= main.cpp
 
@@ -12,7 +12,7 @@
 
 QT +=qt3support
 
-INCLUDEPATH     += /PCBSD/includes /PCBSD/local/kde4/include
+INCLUDEPATH     += /usr/PCBSD/includes /usr/PCBSD/local/kde4/include
 
-QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
+QMAKE_LIBDIR = /usr/PCBSD/local/kde4/lib /usr/PCBSD/local/lib/qt4 /usr/PCBSD/local/lib
 

Modified: pcbsd/trunk-current/PBReg/PBReg.pro
===================================================================
--- pcbsd/trunk-current/PBReg/PBReg.pro	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/PBReg/PBReg.pro	2009-06-01 18:40:52 UTC (rev 4021)
@@ -3,7 +3,7 @@
 
 CONFIG	+= qt warn_on release
 TARGET  = PBReg
-DESTDIR = /PCBSD/bin/
+DESTDIR = /usr/PCBSD/bin/
 
 SOURCES	+= main.cpp
 
@@ -11,7 +11,7 @@
 
 QT +=qt3support
 
-INCLUDEPATH     += /PCBSD/includes /PCBSD/local/kde4/include
+INCLUDEPATH     += /usr/PCBSD/includes /usr/PCBSD/local/kde4/include
 
-QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
+QMAKE_LIBDIR = /usr/PCBSD/local/kde4/lib /usr/PCBSD/local/lib/qt4 /usr/PCBSD/local/lib
 

Modified: pcbsd/trunk-current/ServiceManager/servicemanager.pro
===================================================================
--- pcbsd/trunk-current/ServiceManager/servicemanager.pro	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/ServiceManager/servicemanager.pro	2009-06-01 18:40:52 UTC (rev 4021)
@@ -3,14 +3,14 @@
 
 CONFIG	+= qt warn_on release
 
-INCLUDEPATH += /PCBSD/local/kde4/include
+INCLUDEPATH += /usr/PCBSD/local/kde4/include
 
-LIBS += -L/PCBSD/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs
+LIBS += -L/usr/PCBSD/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs
 
 
 TARGET  = kcm_pcbsdservices
 
-DESTDIR = /PCBSD/local/kde4/lib/kde4/
+DESTDIR = /usr/PCBSD/local/kde4/lib/kde4/
 
 
 HEADERS	+= kcm.h notroot.h servicemanager.h
@@ -24,4 +24,4 @@
 
 QT += qt3support
 
-QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
+QMAKE_LIBDIR = /usr/PCBSD/local/kde4/lib /usr/PCBSD/local/lib/qt4 /usr/PCBSD/local/lib

Modified: pcbsd/trunk-current/SoundDetect/Makefile
===================================================================
--- pcbsd/trunk-current/SoundDetect/Makefile	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/SoundDetect/Makefile	2009-06-01 18:40:52 UTC (rev 4021)
@@ -3,8 +3,8 @@
 
 OBJECTS= sound_detect.o parse_sound.o 
 CC=/usr/bin/gcc
-INCLUDES=-I/PCBSD/local/include -I/PCBSD/local/include/libxml2  -I/PCBSD/local/include/curl
-LIB=-L/PCBSD/local/lib -lxml2  -L/PCBSD/local/lib -lcurl
+INCLUDES=-I/usr/PCBSD/local/include -I/usr/PCBSD/local/include/libxml2  -I/usr/PCBSD/local/include/curl
+LIB=-L/usr/PCBSD/local/lib -lxml2  -L/usr/PCBSD/local/lib -lcurl
 
 sound_detect : $(OBJECTS)
 	 $(CC) $(OBJECTS)   $(LIB) -o $(.TARGET)  

Modified: pcbsd/trunk-current/SoundError/SoundError.pro
===================================================================
--- pcbsd/trunk-current/SoundError/SoundError.pro	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/SoundError/SoundError.pro	2009-06-01 18:40:52 UTC (rev 4021)
@@ -1,13 +1,13 @@
 TEMPLATE	= app
 LANGUAGE	= C++
 
-LIBS	+= -L/PCBSD/local/kde4/lib -lkdeui -lkdecore -lkio
+LIBS	+= -L/usr/PCBSD/local/kde4/lib -lkdeui -lkdecore -lkio
 
 CONFIG	+= qt warn_on release
 
 TARGET=SoundError
 
-DESTDIR=/PCBSD/bin/
+DESTDIR=/usr/PCBSD/bin/
 
 SOURCES	+= main.cpp snddialog.cpp
 
@@ -19,7 +19,7 @@
 
 TRANSLATIONS = SoundError_en.ts
 
-INCLUDEPATH     += /PCBSD/includes /PCBSD/local/kde4/include
+INCLUDEPATH     += /usr/PCBSD/includes /usr/PCBSD/local/kde4/include
 
-QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
+QMAKE_LIBDIR = /usr/PCBSD/local/kde4/lib /usr/PCBSD/local/lib/qt4 /usr/PCBSD/local/lib
 

Modified: pcbsd/trunk-current/SystemUpdaterTray/SystemUpdaterTray.pro
===================================================================
--- pcbsd/trunk-current/SystemUpdaterTray/SystemUpdaterTray.pro	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/SystemUpdaterTray/SystemUpdaterTray.pro	2009-06-01 18:40:52 UTC (rev 4021)
@@ -13,13 +13,13 @@
 
 RESOURCES += SystemUpdaterTray.qrc
 
-INCLUDEPATH += /PCBSD/local/kde4/include /usr/local/kde4/include
+INCLUDEPATH += /usr/PCBSD/local/kde4/include /usr/local/kde4/include
 
-LIBS += -L/PCBSD/local/kde4/lib -L/usr/local/kde4/lib
+LIBS += -L/usr/PCBSD/local/kde4/lib -L/usr/local/kde4/lib
 
-QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
+QMAKE_LIBDIR = /usr/PCBSD/local/kde4/lib /usr/PCBSD/local/lib/qt4 /usr/PCBSD/local/lib /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
 
 TARGET  = SystemUpdaterTray
-DESTDIR = /PCBSD/SystemUpdater/bin/
+DESTDIR = /usr/PCBSD/SystemUpdater/bin/
 
 QT += qt3support

Modified: pcbsd/trunk-current/XGUISource/XGUI.pro
===================================================================
--- pcbsd/trunk-current/XGUISource/XGUI.pro	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/XGUISource/XGUI.pro	2009-06-01 18:40:52 UTC (rev 4021)
@@ -5,9 +5,9 @@
 
 TRANSLATIONS = xgui_en.ts
 
-LIBS += -L/PCBSD/local/kde4/lib -L/PCBSD/local/lib/qt4 -lkdecore -lkio -lkdeui -Ikdelibs
+LIBS += -L/usr/PCBSD/local/kde4/lib -L/usr/PCBSD/local/lib/qt4 -lkdecore -lkio -lkdeui -Ikdelibs
 
-QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4
+QMAKE_LIBDIR = /usr/PCBSD/local/kde4/lib /usr/PCBSD/local/lib/qt4
 
 SOURCES	+= main.cpp xgui.cpp dialogconfirm.cpp
 
@@ -18,12 +18,12 @@
 
 RESOURCES += XGUI.qrc
 
-INCLUDEPATH += /PCBSD/local/kde4/include
+INCLUDEPATH += /usr/PCBSD/local/kde4/include
 
 
 TARGET  = XGUI
 
-DESTDIR = /PCBSD/xorg-gui/bin/
+DESTDIR = /usr/PCBSD/xorg-gui/bin/
 
 QT +=qt3support
 

Modified: pcbsd/trunk-current/kcmPBMsource/PBM.pro
===================================================================
--- pcbsd/trunk-current/kcmPBMsource/PBM.pro	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/kcmPBMsource/PBM.pro	2009-06-01 18:40:52 UTC (rev 4021)
@@ -3,7 +3,7 @@
 
 CONFIG	+= qt warn_on release
 
-LIBS += -L/PCBSD/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs
+LIBS += -L/usr/PCBSD/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs
 
 HEADERS	+= kcm.h notroot.h pbm.h updaterDialog.h
 
@@ -20,13 +20,13 @@
 
 TARGET  = kcm_pcbsdpbm
 
-DESTDIR = /PCBSD/local/kde4/lib/kde4
+DESTDIR = /usr/PCBSD/local/kde4/lib/kde4
 
 TRANSLATIONS = PBM_en_US.ts 
 
 QT +=  qt3support webkit
 
-INCLUDEPATH     += /PCBSD/includes /PCBSD/local/kde4/include
+INCLUDEPATH     += /usr/PCBSD/includes /usr/PCBSD/local/kde4/include
 
-QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
+QMAKE_LIBDIR = /usr/PCBSD/local/kde4/lib /usr/PCBSD/local/lib/qt4 /usr/PCBSD/local/lib
 

Modified: pcbsd/trunk-current/kcmPBSystem/PBSystem.pro
===================================================================
--- pcbsd/trunk-current/kcmPBSystem/PBSystem.pro	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/kcmPBSystem/PBSystem.pro	2009-06-01 18:40:52 UTC (rev 4021)
@@ -3,9 +3,9 @@
 
 CONFIG	+= qt warn_on release
 
-LIBS	+= -Ikdelibs -L/PCBSD/local/kde4/lib -lkdecore -lkio -lkdeui -lpcbsd
+LIBS	+= -Ikdelibs -L/usr/PCBSD/local/kde4/lib -lkdecore -lkio -lkdeui -lpcbsd
 
-INCLUDEPATH	+= /PCBSD/includes /PCBSD/local/kde4/include
+INCLUDEPATH	+= /usr/PCBSD/includes /usr/PCBSD/local/kde4/include
 
 HEADERS	+= kcm.h notroot.h cvsupprogress.h fastestcvsup.h pbsystemtab.h portsnapprogress.h
 
@@ -21,10 +21,10 @@
 
 TARGET  = kcm_pcbsdsystem
 
-DESTDIR = /PCBSD/local/kde4/lib/kde4/
+DESTDIR = /usr/PCBSD/local/kde4/lib/kde4/
 
 TRANSLATIONS = PBSystem_en.ts PBSystem_af.ts PBSystem_ar.ts PBSystem_az.ts PBSystem_bg.ts PBSystem_bn.ts PBSystem_bs.ts PBSystem_ca.ts PBSystem_cs.ts PBSystem_cy.ts PBSystem_da.ts PBSystem_de.ts PBSystem_el.ts PBSystem_es.ts PBSystem_et.ts PBSystem_eu.ts PBSystem_fa.ts PBSystem_fi.ts PBSystem_fr.ts PBSystem_gl.ts PBSystem_he.ts PBSystem_hi.ts PBSystem_hr.ts PBSystem_hu.ts PBSystem_id.ts PBSystem_is.ts PBSystem_it.ts PBSystem_ja.ts PBSystem_ka.ts PBSystem_ko.ts PBSystem_lt.ts PBSystem_lv.ts PBSystem_mk.ts PBSystem_mn.ts PBSystem_ms.ts PBSystem_mt.ts PBSystem_nb.ts PBSystem_nl.ts PBSystem_pa.ts PBSystem_pl.ts PBSystem_pt.ts PBSystem_pt_BR.ts PBSystem_ro.ts PBSystem_ru.ts PBSystem_sk.ts PBSystem_sl.ts PBSystem_sr.ts PBSystem_sv.ts PBSystem_ta.ts PBSystem_tg.ts PBSystem_th.ts PBSystem_tr.ts PBSystem_uk.ts PBSystem_uz.ts PBSystem_vi.ts PBSystem_zh_CN.ts PBSystem_zh_HK.ts PBSystem_zh_TW.ts PBSystem_zu.ts
 
-QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
+QMAKE_LIBDIR = /usr/PCBSD/local/kde4/lib /usr/PCBSD/local/lib/qt4 /usr/PCBSD/local/lib
 
 QT += qt3support

Modified: pcbsd/trunk-current/kcmPFManager/pfmanager.pro
===================================================================
--- pcbsd/trunk-current/kcmPFManager/pfmanager.pro	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/kcmPFManager/pfmanager.pro	2009-06-01 18:40:52 UTC (rev 4021)
@@ -5,9 +5,9 @@
 
 INCLUDEPATH	+= . config
 
-INCLUDEPATH += /PCBSD/local/kde4/include
+INCLUDEPATH += /usr/PCBSD/local/kde4/include
 
-LIBS += -L/PCBSD/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs
+LIBS += -L/usr/PCBSD/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs
 
 
 HEADERS	+= kcm.hpp \
@@ -39,25 +39,25 @@
 RESOURCES += pfmanager.qrc
 
 
-TARGET = /PCBSD/local/kde4/lib/kde4/kcm_pfmanager
+TARGET = /usr/PCBSD/local/kde4/lib/kde4/kcm_pfmanager
 DEPENDPATH += config
 
 TRANSLATIONS = PFManager_en.ts \
                PFManager_de.ts
 
-desktop.path=/PCBSD/local/kde4/share/applications/kde4/
+desktop.path=/usr/PCBSD/local/kde4/share/applications/kde4/
 desktop.files=kcm_pfmanager.desktop
 
-kcm.path=/PCBSD/local/kde4/lib/kde4/
+kcm.path=/usr/PCBSD/local/kde4/lib/kde4/
 kcm.files=kcm_pfmanager.la
-kcm.extra=cp -f libkcm_pfmanager.so.1.0.0 /PCBSD/local/kde4/lib/kde4/kcm_pfmanager.so
+kcm.extra=cp -f libkcm_pfmanager.so.1.0.0 /usr/PCBSD/local/kde4/lib/kde4/kcm_pfmanager.so
 
-lang.path=/PCBSD/LANGS/
+lang.path=/usr/PCBSD/LANGS/
 lang.files=PFManager_en.ts PFManager_de.ts
 
 INSTALLS += lang desktop kcm
 
-QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
+QMAKE_LIBDIR = /usr/PCBSD/local/kde4/lib /usr/PCBSD/local/lib/qt4 /usr/PCBSD/local/lib
 
 
 QT += qt3support

Modified: pcbsd/trunk-current/pcbsdusermanager/pcbsdusermanager.pro
===================================================================
--- pcbsd/trunk-current/pcbsdusermanager/pcbsdusermanager.pro	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/pcbsdusermanager/pcbsdusermanager.pro	2009-06-01 18:40:52 UTC (rev 4021)
@@ -4,7 +4,7 @@
 CONFIG  += dll
 
 
-LIBS += -L/PCBSD/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs -lcrypt
+LIBS += -L/usr/PCBSD/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs -lcrypt
 
 SOURCES += notroot.cpp \
 	group.cpp \
@@ -37,21 +37,21 @@
 
 RESOURCES += pcbsdusermanager.qrc
 
-INCLUDEPATH += /PCBSD/local/kde4/include /PCBSD/local/include/qt4
+INCLUDEPATH += /usr/PCBSD/local/kde4/include /usr/PCBSD/local/include/qt4
 
-TARGET = /PCBSD/local/kde4/lib/kde4/kcm_pcbsdusermanager
+TARGET = /usr/PCBSD/local/kde4/lib/kde4/kcm_pcbsdusermanager
 
 TRANSLATIONS = pcbsdusermanager_en.ts
 
-desktop.path=/PCBSD/local/kde4/share/applications/kde4/
+desktop.path=/usr/PCBSD/local/kde4/share/applications/kde4/
 desktop.files=kcm_pcbsdusermanager.desktop
 
-kcm.path=/PCBSD/local/kde4/lib/kde4/
+kcm.path=/usr/PCBSD/local/kde4/lib/kde4/
 kcm.files=kcm_pcbsdusermanager.la
-kcm.extra=cp -f libkcm_pcbsdusermanager.so.1.0.0 /PCBSD/local/kde4/lib/kde4/kcm_pcbsdusermanager.so
+kcm.extra=cp -f libkcm_pcbsdusermanager.so.1.0.0 /usr/PCBSD/local/kde4/lib/kde4/kcm_pcbsdusermanager.so
 
 INSTALLS += desktop kcm
 
-QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
+QMAKE_LIBDIR = /usr/PCBSD/local/kde4/lib /usr/PCBSD/local/lib/qt4 /usr/PCBSD/local/lib
 
 QT += qt3support

Modified: pcbsd/trunk-current/system-overlay/etc/gettytab
===================================================================
--- pcbsd/trunk-current/system-overlay/etc/gettytab	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/system-overlay/etc/gettytab	2009-06-01 18:40:52 UTC (rev 4021)
@@ -39,7 +39,7 @@
 	:cb:ce:ck:lc:fd#1000:im=\r\n%s/%m (%h) (%t)\r\n\r\n:sp#1200:\
 	:if=/etc/issue:
 
-xsetup:al=root:lo=/PCBSD/xorg-gui/bin/rundetect.sh:tc=Pc:
+xsetup:al=root:lo=/usr/PCBSD/xorg-gui/bin/rundetect.sh:tc=Pc:
 
 #
 # Fixed speed entries

Modified: pcbsd/trunk-current/system-overlay/etc/login.conf
===================================================================
--- pcbsd/trunk-current/system-overlay/etc/login.conf	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/system-overlay/etc/login.conf	2009-06-01 18:40:52 UTC (rev 4021)
@@ -27,7 +27,7 @@
 	:copyright=/etc/COPYRIGHT:\
 	:welcome=/etc/motd:\
 	:setenv=MAIL=/var/mail/$,BLOCKSIZE=K,FTP_PASSIVE_MODE=YES:\
-	:path=/sbin /bin /usr/sbin /usr/bin /usr/games /PCBSD/local/bin /PCBSD/local/sbin /usr/local/sbin /usr/local/bin ~/bin:\
+	:path=/sbin /bin /usr/sbin /usr/bin /usr/games /usr/PCBSD/local/bin /usr/PCBSD/local/sbin /usr/local/sbin /usr/local/bin ~/bin:\
 	:nologin=/var/run/nologin:\
 	:cputime=unlimited:\
 	:datasize=unlimited:\

Modified: pcbsd/trunk-current/system-overlay/etc/make.conf
===================================================================
--- pcbsd/trunk-current/system-overlay/etc/make.conf	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/system-overlay/etc/make.conf	2009-06-01 18:40:52 UTC (rev 4021)
@@ -1,9 +1,9 @@
 # Uncomment this if you want to do port builds with no interaction
 #BATCH=yes
 
-# These options change if you want to tweak the ports in /PCBSD/local
-# WARNING! By modifying ports in the /PCBSD/local base, you may cause problems
+# These options change if you want to tweak the ports in /usr/PCBSD/local
+# WARNING! By modifying ports in the /usr/PCBSD/local base, you may cause problems
 # with online-updates, which aren't aware of your local modifications
-#X11BASE=/PCBSD/local
-#LOCALBASE=/PCBSD/local
+#X11BASE=/usr/PCBSD/local
+#LOCALBASE=/usr/PCBSD/local
 #LDCONFIG=/sbin/ldconfig -f /var/run/ld-pcbsd-elf.so.hints

Modified: pcbsd/trunk-current/system-overlay/etc/manpath.config
===================================================================
--- pcbsd/trunk-current/system-overlay/etc/manpath.config	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/system-overlay/etc/manpath.config	2009-06-01 18:40:52 UTC (rev 4021)
@@ -18,7 +18,7 @@
 #
 OPTIONAL_MANPATH	/usr/local/man
 OPTIONAL_MANPATH	/Programs/man
-OPTIONAL_MANPATH	/PCBSD/local/man
+OPTIONAL_MANPATH	/usr/PCBSD/local/man
 # (disabled by xorg-libraries port) OPTIONAL_MANPATH	/usr/X11R6/man
 #
 # set up PATH to MANPATH mapping
@@ -27,12 +27,12 @@
 MANPATH_MAP	/usr/bin		/usr/share/man
 MANPATH_MAP	/usr/local/bin		/usr/local/man
 MANPATH_MAP	/Programs/bin		/Programs/man
-MANPATH_MAP	/PCBSD/local/bin	/PCBSD/local/man
+MANPATH_MAP	/usr/PCBSD/local/bin	/usr/PCBSD/local/man
 # (disabled by xorg-libraries port) MANPATH_MAP	/usr/X11R6/bin		/usr/X11R6/man
 #
 # set man locales, if needed
 #
 #MANLOCALES     ru_RU.KOI8-R
 # added by use.perl 2008-09-06 21:39:43
-OPTIONAL_MANPATH	/PCBSD/local/lib/perl5/5.8.8/man
-OPTIONAL_MANPATH	/PCBSD/local/lib/perl5/5.8.8/perl/man
+OPTIONAL_MANPATH	/usr/PCBSD/local/lib/perl5/5.8.8/man
+OPTIONAL_MANPATH	/usr/PCBSD/local/lib/perl5/5.8.8/perl/man

Modified: pcbsd/trunk-current/system-overlay/etc/periodic.conf.local
===================================================================
--- pcbsd/trunk-current/system-overlay/etc/periodic.conf.local	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/system-overlay/etc/periodic.conf.local	2009-06-01 18:40:52 UTC (rev 4021)
@@ -1,2 +1,2 @@
 # periodic script dirs
-local_periodic="/PCBSD/local/etc/periodic /usr/local/etc/periodic"
+local_periodic="/usr/PCBSD/local/etc/periodic /usr/local/etc/periodic"

Modified: pcbsd/trunk-current/system-overlay/etc/rc.conf.local
===================================================================
--- pcbsd/trunk-current/system-overlay/etc/rc.conf.local	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/system-overlay/etc/rc.conf.local	2009-06-01 18:40:52 UTC (rev 4021)
@@ -1,9 +1,9 @@
 # Don't change these unless you know what your doing
-ldconfig_pcbsd_paths="/usr/lib/compat /PCBSD/local/lib /PCBSD/local/lib/compat/pkg"
-ldconfig_pcbsd_paths_aout="/usr/lib/compat/aout /PCBSD/local/lib/aout"
-ldconfig_pcbsd_dirs="/PCBSD/local/libdata/ldconfig"
-ldconfig_pcbsd32_dirs="/PCBSD/local/libdata/ldconfig32"
+ldconfig_pcbsd_paths="/usr/lib/compat /usr/PCBSD/local/lib /usr/PCBSD/local/lib/compat/pkg"
+ldconfig_pcbsd_paths_aout="/usr/lib/compat/aout /usr/PCBSD/local/lib/aout"
+ldconfig_pcbsd_dirs="/usr/PCBSD/local/libdata/ldconfig"
+ldconfig_pcbsd32_dirs="/usr/PCBSD/local/libdata/ldconfig32"
 
 
 # rc.d directories
-local_startup="/PCBSD/local/etc/rc.d /Programs/rc.d" # startup script dirs.
+local_startup="/usr/PCBSD/local/etc/rc.d /Programs/rc.d" # startup script dirs.

Modified: pcbsd/trunk-current/system-overlay/etc/rc.local
===================================================================
--- pcbsd/trunk-current/system-overlay/etc/rc.local	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/system-overlay/etc/rc.local	2009-06-01 18:40:52 UTC (rev 4021)
@@ -1,7 +1,7 @@
 # Custom rc.local file - PCBSD 
 
 # Start the swap monitor daemon
-( /PCBSD/Scripts/swapmonitor.sh -daemon ) & 
+( /usr/PCBSD/Scripts/swapmonitor.sh -daemon ) & 
 
 # Check if the user requested to re-run the X tool
-/PCBSD/Scripts/checkXloader.sh
+/usr/PCBSD/Scripts/checkXloader.sh

Modified: pcbsd/trunk-current/system-overlay/root/.cshrc
===================================================================
--- pcbsd/trunk-current/system-overlay/root/.cshrc	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/system-overlay/root/.cshrc	2009-06-01 18:40:52 UTC (rev 4021)
@@ -15,7 +15,7 @@
 # A righteous umask
 umask 22
 
-set path = (/sbin /bin /usr/sbin /usr/bin /usr/games /Programs/bin /PCBSD/local/bin /PCBSD/local/sbin /PCBSD/local/kde4/bin /usr/local/sbin /usr/local/bin /usr/local/kde4/bin $HOME/bin)
+set path = (/sbin /bin /usr/sbin /usr/bin /usr/games /Programs/bin /usr/PCBSD/local/bin /usr/PCBSD/local/sbin /usr/PCBSD/local/kde4/bin /usr/local/sbin /usr/local/bin /usr/local/kde4/bin $HOME/bin)
 
 setenv	CLICOLOR true
 setenv	EDITOR	vi
@@ -37,11 +37,11 @@
 	endif
 endif
 
-# Set our LD_ELF_HINTS_PATH variable so that /PCBSD/local works
+# Set our LD_ELF_HINTS_PATH variable so that /usr/PCBSD/local works
 setenv LD_ELF_HINTS_PATH /var/run/ld-pcbsd-elf.so.hints
 
 # Setup the XDG_DATA_DIRS variable
-setenv XDG_DATA_DIRS "/usr/share:/usr/local/share:/usr/local/share/gnome:/PCBSD/local/share:/PCBSD/local/kde4/share:/Programs/share:/usr/local/kde4/share"
+setenv XDG_DATA_DIRS "/usr/share:/usr/local/share:/usr/local/share/gnome:/usr/PCBSD/local/share:/usr/PCBSD/local/kde4/share:/Programs/share:/usr/local/kde4/share"
 
 # Setup the XDG_CONFIG_DIRS variable
-setenv XDG_CONFIG_DIRS "/etc/xdg:/PCBSD/local/etc/xdg:/PCBSD/local/kde4/etc/xdg:/usr/local/etc/xdg:/usr/local/kde4/etc/xdg:/usr/local/etc/xdg/xfce4"
+setenv XDG_CONFIG_DIRS "/etc/xdg:/usr/PCBSD/local/etc/xdg:/usr/PCBSD/local/kde4/etc/xdg:/usr/local/etc/xdg:/usr/local/kde4/etc/xdg:/usr/local/etc/xdg/xfce4"

Modified: pcbsd/trunk-current/system-overlay/root/.profile
===================================================================
--- pcbsd/trunk-current/system-overlay/root/.profile	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/system-overlay/root/.profile	2009-06-01 18:40:52 UTC (rev 4021)
@@ -5,19 +5,19 @@
 # see also sh(1), environ(7).
 #
 
-# Set our LD_ELF_HINTS_PATH variable so that /PCBSD/local works
+# Set our LD_ELF_HINTS_PATH variable so that /usr/PCBSD/local works
 LD_ELF_HINTS_PATH="/var/run/ld-pcbsd-elf.so.hints"
 export LD_ELF_HINTS_PATH
 
 # remove /usr/games and /usr/X11R6/bin if you want
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/Programs/bin:$HOME/bin:/PCBSD/local/bin:/PCBSD/local/sbin:/PCBSD/local/kde4/bin:/usr/local/sbin:/usr/local/bin:/usr/local/kde4/bin; export PATH
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/Programs/bin:$HOME/bin:/usr/PCBSD/local/bin:/usr/PCBSD/local/sbin:/usr/PCBSD/local/kde4/bin:/usr/local/sbin:/usr/local/bin:/usr/local/kde4/bin; export PATH
 
 # Setup the XDG_DATA_DIRS variable
-XDG_DATA_DIRS="/PCBSD/local/share:/PCBSD/local/kde4/share:/usr/local/kde4/share:/usr/share:/usr/local/share:/usr/local/share/gnome"
+XDG_DATA_DIRS="/usr/PCBSD/local/share:/usr/PCBSD/local/kde4/share:/usr/local/kde4/share:/usr/share:/usr/local/share:/usr/local/share/gnome"
 export XDG_DATA_DIRS
 
 # Setup the XDG_CONFIG_DIRS variable
-XDG_CONFIG_DIRS="/PCBSD/local/etc/xdg:/PCBSD/local/kde4/etc/xdg:/usr/local/kde4/etc/xdg:/etc/xdg:/usr/local/etc/xdg:/usr/local/etc/xdg/xfce4"
+XDG_CONFIG_DIRS="/usr/PCBSD/local/etc/xdg:/usr/PCBSD/local/kde4/etc/xdg:/usr/local/kde4/etc/xdg:/etc/xdg:/usr/local/etc/xdg:/usr/local/etc/xdg/xfce4"
 export XDG_CONFIG_DIRS
 
 # Setting TERM is normally done through /etc/ttys.  Do only override

Modified: pcbsd/trunk-current/system-overlay/root/.xprofile
===================================================================
--- pcbsd/trunk-current/system-overlay/root/.xprofile	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/system-overlay/root/.xprofile	2009-06-01 18:40:52 UTC (rev 4021)
@@ -1,14 +1,14 @@
-# Set our LD_ELF_HINTS_PATH variable so that /PCBSD/local works
+# Set our LD_ELF_HINTS_PATH variable so that /usr/PCBSD/local works
 LD_ELF_HINTS_PATH="/var/run/ld-pcbsd-elf.so.hints"
 export LD_ELF_HINTS_PATH
 
 # Setup some extra PATH variables
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/Programs/bin:$HOME/bin:/PCBSD/local/bin:/PCBSD/local/kde4/bin:/usr/local/sbin:/usr/local/bin:/usr/local/kde4/bin; export PATH
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/Programs/bin:$HOME/bin:/usr/PCBSD/local/bin:/usr/PCBSD/local/kde4/bin:/usr/local/sbin:/usr/local/bin:/usr/local/kde4/bin; export PATH
 
 # Setup the XDG_DATA_DIRS variable
-XDG_DATA_DIRS="/PCBSD/local/share:/PCBSD/local/kde4/share:/Programs/share:/usr/local/kde4/share:/usr/share:/usr/local/share:/usr/local/share/gnome"
+XDG_DATA_DIRS="/usr/PCBSD/local/share:/usr/PCBSD/local/kde4/share:/Programs/share:/usr/local/kde4/share:/usr/share:/usr/local/share:/usr/local/share/gnome"
 export XDG_DATA_DIRS
 
 # Setup the XDG_CONFIG_DIRS variable
-XDG_CONFIG_DIRS="/PCBSD/local/etc/xdg:/PCBSD/local/kde4/etc/xdg:/usr/local/kde4/etc/xdg:/etc/xdg:/usr/local/etc/xdg:/usr/local/etc/xdg/xfce4"
+XDG_CONFIG_DIRS="/usr/PCBSD/local/etc/xdg:/usr/PCBSD/local/kde4/etc/xdg:/usr/local/kde4/etc/xdg:/etc/xdg:/usr/local/etc/xdg:/usr/local/etc/xdg/xfce4"
 export XDG_CONFIG_DIRS

Modified: pcbsd/trunk-current/system-overlay/sbin/mount_ntfs
===================================================================
--- pcbsd/trunk-current/system-overlay/sbin/mount_ntfs	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/system-overlay/sbin/mount_ntfs	2009-06-01 18:40:52 UTC (rev 4021)
@@ -120,7 +120,7 @@
 kldstat | grep -q fuse 2>/dev/null
 if [ "$?" != "0" ]
 then
-  kldload /PCBSD/local/modules/fuse.ko
+  kldload /usr/PCBSD/local/modules/fuse.ko
 fi
 
 # Run the FUSE helper command now, with the options in the right order

Modified: pcbsd/trunk-current/system-overlay/usr/share/skel/.config/akonadi/akonadiserverrc
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/share/skel/.config/akonadi/akonadiserverrc	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/system-overlay/usr/share/skel/.config/akonadi/akonadiserverrc	2009-06-01 18:40:52 UTC (rev 4021)
@@ -1,6 +1,6 @@
 [QMYSQL]
 StartServer=true
-ServerPath=/PCBSD/local/bin/mysqld_safe
+ServerPath=/usr/PCBSD/local/bin/mysqld_safe
 Name=akonadi
 Host=
 User=

Modified: pcbsd/trunk-current/system-overlay/usr/share/skel/.fluxbox/menuconfig
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/share/skel/.fluxbox/menuconfig	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/system-overlay/usr/share/skel/.fluxbox/menuconfig	2009-06-01 18:40:52 UTC (rev 4021)
@@ -29,19 +29,19 @@
 # FBRUNOPTIONS='-font 10x20 -fg grey -bg black -title run'
 
 # --- PREFIX'es
-# These are prefixes; So if fluxbox is installed in /PCBSD/local/bin/fluxbox
-# your prefix is: /PCBSD/local
+# These are prefixes; So if fluxbox is installed in /usr/PCBSD/local/bin/fluxbox
+# your prefix is: /usr/PCBSD/local
 
-# fluxbox-generate already looks in /PCBSD/local so
+# fluxbox-generate already looks in /usr/PCBSD/local so
 # there should be no need to specify them.
 #
-# PREFIX=/PCBSD/local
-# GNOME_PREFIX=/PCBSD/local
-# KDE_PREFIX=/PCBSD/local
+# PREFIX=/usr/PCBSD/local
+# GNOME_PREFIX=/usr/PCBSD/local
+# KDE_PREFIX=/usr/PCBSD/local
 
 
 # Separate the list of background dirs with colons ':'
-# BACKGROUND_DIRS="/home/james/.fluxbox/backgrounds/:/PCBSD/local/share/fluxbox/backgrounds/:/PCBSD/local/share/wallpapers"
+# BACKGROUND_DIRS="/home/james/.fluxbox/backgrounds/:/usr/PCBSD/local/share/fluxbox/backgrounds/:/usr/PCBSD/local/share/wallpapers"
 
 
 # --- Boolean variables.

Modified: pcbsd/trunk-current/system-overlay/usr/share/skel/.gtkrc-2.0
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/share/skel/.gtkrc-2.0	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/system-overlay/usr/share/skel/.gtkrc-2.0	2009-06-01 18:40:52 UTC (rev 4021)
@@ -1,7 +1,7 @@
 # This file was written by KDE
 # You can edit it in the KDE control center, under "GTK Styles and Fonts"
 
-include "/PCBSD/local/share/themes/QtCurve/gtk-2.0/gtkrc"
+include "/usr/PCBSD/local/share/themes/QtCurve/gtk-2.0/gtkrc"
 
 style "user-font"
 {

Modified: pcbsd/trunk-current/system-overlay/usr/share/skel/.kde4/Autostart/checksounderror.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/share/skel/.kde4/Autostart/checksounderror.sh	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/system-overlay/usr/share/skel/.kde4/Autostart/checksounderror.sh	2009-06-01 18:40:52 UTC (rev 4021)
@@ -18,6 +18,6 @@
   if [ "${IGNORE}" != "Y" -a "${OSSCORE}" != "0" ]
   then
     # Start the SoundError program to warn the user of missing sound module
-    /PCBSD/bin/SoundError
+    /usr/PCBSD/bin/SoundError
   fi
 fi

Modified: pcbsd/trunk-current/system-overlay/usr/share/skel/.kde4/Autostart/checkupdater.sh
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/share/skel/.kde4/Autostart/checkupdater.sh	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/system-overlay/usr/share/skel/.kde4/Autostart/checkupdater.sh	2009-06-01 18:40:52 UTC (rev 4021)
@@ -4,6 +4,6 @@
 test="`pbreg get /PC-BSD/SystemUpdater/runAtStartup`"
 if [ "$test" = "true" ]
 then
-  /PCBSD/SystemUpdater/bin/SystemUpdaterTray
+  /usr/PCBSD/SystemUpdater/bin/SystemUpdaterTray
 fi
 

Modified: pcbsd/trunk-current/system-overlay/usr/share/skel/.kde4/share/config/kde.notifyrc
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/share/skel/.kde4/share/config/kde.notifyrc	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/system-overlay/usr/share/skel/.kde4/share/config/kde.notifyrc	2009-06-01 18:40:52 UTC (rev 4021)
@@ -38,7 +38,7 @@
 Execute=
 KTTS=
 Logfile=
-Sound=file:///PCBSD/local/kde4/share/sounds/pcbsd-shutdown.mp3
+Sound=file:///usr/PCBSD/local/kde4/share/sounds/pcbsd-shutdown.mp3
 
 [Event/fatalerror]
 Action=Sound|Popup
@@ -80,7 +80,7 @@
 Execute=
 KTTS=
 Logfile=
-Sound=file:///PCBSD/local/kde4/share/sounds/pcbsd-startup.mp3
+Sound=file:///usr/PCBSD/local/kde4/share/sounds/pcbsd-startup.mp3
 
 [Event/warning]
 Action=Sound|Popup

Modified: pcbsd/trunk-current/system-overlay/usr/share/skel/.kde4/share/config/kickoffrc
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/share/skel/.kde4/share/config/kickoffrc	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/system-overlay/usr/share/skel/.kde4/share/config/kickoffrc	2009-06-01 18:40:52 UTC (rev 4021)
@@ -1,5 +1,5 @@
 [Favorites]
-FavoriteURLs=/PCBSD/local/kde4/share/applications/kde4/konqbrowser.desktop,/PCBSD/local/kde4/share/applications/kde4/systemsettings.desktop,/PCBSD/local/kde4/share/applications/kde4/dolphin.desktop
+FavoriteURLs=/usr/PCBSD/local/kde4/share/applications/kde4/konqbrowser.desktop,/usr/PCBSD/local/kde4/share/applications/kde4/systemsettings.desktop,/usr/PCBSD/local/kde4/share/applications/kde4/dolphin.desktop
 
 [RecentlyUsed]
 Applications=

Modified: pcbsd/trunk-current/system-overlay/usr/share/skel/.kde4/share/config/ksambaplugin
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/share/skel/.kde4/share/config/ksambaplugin	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/system-overlay/usr/share/skel/.kde4/share/config/ksambaplugin	2009-06-01 18:40:52 UTC (rev 4021)
@@ -1,2 +1,2 @@
 [KSambaKonqiPlugin]
-smb.conf=/PCBSD/local/etc/smb.conf
+smb.conf=/usr/PCBSD/local/etc/smb.conf

Modified: pcbsd/trunk-current/system-overlay/usr/share/skel/.xprofile
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/share/skel/.xprofile	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/system-overlay/usr/share/skel/.xprofile	2009-06-01 18:40:52 UTC (rev 4021)
@@ -1,14 +1,14 @@
-# Set our LD_ELF_HINTS_PATH variable so that /PCBSD/local works
+# Set our LD_ELF_HINTS_PATH variable so that /usr/PCBSD/local works
 LD_ELF_HINTS_PATH="/var/run/ld-pcbsd-elf.so.hints"
 export LD_ELF_HINTS_PATH
 
 # Setup some extra PATH variables
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/Programs/bin:$HOME/bin:/PCBSD/local/bin:/PCBSD/local/kde4/bin:/usr/local/sbin:/usr/local/bin:/usr/local/kde4/bin; export PATH
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/Programs/bin:$HOME/bin:/usr/PCBSD/local/bin:/usr/PCBSD/local/kde4/bin:/usr/local/sbin:/usr/local/bin:/usr/local/kde4/bin; export PATH
 
 # Setup the XDG_DATA_DIRS variable
-XDG_DATA_DIRS="/PCBSD/local/share:/PCBSD/local/kde4/share:/Programs/share:/usr/local/kde4/share:/usr/share:/usr/local/share:/usr/local/share/gnome"
+XDG_DATA_DIRS="/usr/PCBSD/local/share:/usr/PCBSD/local/kde4/share:/Programs/share:/usr/local/kde4/share:/usr/share:/usr/local/share:/usr/local/share/gnome"
 export XDG_DATA_DIRS
 
 # Setup the XDG_CONFIG_DIRS variable
-XDG_CONFIG_DIRS="/PCBSD/local/etc/xdg:/PCBSD/local/kde4/etc/xdg:/usr/local/kde4/etc/xdg:/etc/xdg:/usr/local/etc/xdg:/usr/local/etc/xdg/xfce4"
+XDG_CONFIG_DIRS="/usr/PCBSD/local/etc/xdg:/usr/PCBSD/local/kde4/etc/xdg:/usr/local/kde4/etc/xdg:/etc/xdg:/usr/local/etc/xdg:/usr/local/etc/xdg/xfce4"
 export XDG_CONFIG_DIRS

Modified: pcbsd/trunk-current/system-overlay/usr/share/skel/Desktop/guide.desktop
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/share/skel/Desktop/guide.desktop	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/system-overlay/usr/share/skel/Desktop/guide.desktop	2009-06-01 18:40:52 UTC (rev 4021)
@@ -3,4 +3,4 @@
 Icon=help-browser
 Name=Quick Guide
 Type=Link
-URL=/PCBSD/docs/guide/index.html
+URL=/usr/PCBSD/docs/guide/index.html

Modified: pcbsd/trunk-current/system-overlay/usr/share/skel/dot.cshrc
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/share/skel/dot.cshrc	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/system-overlay/usr/share/skel/dot.cshrc	2009-06-01 18:40:52 UTC (rev 4021)
@@ -15,7 +15,7 @@
 # A righteous umask
 umask 22
 
-set path = (/sbin /bin /usr/sbin /usr/bin /usr/games /Programs/bin /PCBSD/local/bin /PCBSD/local/sbin /PCBSD/local/kde4/bin /usr/local/sbin /usr/local/bin /usr/local/kde4/bin $HOME/bin)
+set path = (/sbin /bin /usr/sbin /usr/bin /usr/games /Programs/bin /usr/PCBSD/local/bin /usr/PCBSD/local/sbin /usr/PCBSD/local/kde4/bin /usr/local/sbin /usr/local/bin /usr/local/kde4/bin $HOME/bin)
 
 setenv	CLICOLOR true
 setenv	EDITOR	vi
@@ -41,11 +41,11 @@
 	endif
 endif
 
-# Set our LD_ELF_HINTS_PATH variable so that /PCBSD/local works
+# Set our LD_ELF_HINTS_PATH variable so that /usr/PCBSD/local works
 setenv LD_ELF_HINTS_PATH /var/run/ld-pcbsd-elf.so.hints
 
 # Setup the XDG_DATA_DIRS variable
-setenv XDG_DATA_DIRS "/usr/share:/usr/local/share:/usr/local/share/gnome:/PCBSD/local/share:/PCBSD/local/kde4/share:/Programs/share:/usr/local/kde4/share"
+setenv XDG_DATA_DIRS "/usr/share:/usr/local/share:/usr/local/share/gnome:/usr/PCBSD/local/share:/usr/PCBSD/local/kde4/share:/Programs/share:/usr/local/kde4/share"
 
 # Setup the XDG_CONFIG_DIRS variable
-setenv XDG_CONFIG_DIRS "/etc/xdg:/PCBSD/local/etc/xdg:/PCBSD/local/kde4/etc/xdg:/usr/local/etc/xdg:/usr/local/kde4/etc/xdg:/usr/local/etc/xdg/xfce4"
+setenv XDG_CONFIG_DIRS "/etc/xdg:/usr/PCBSD/local/etc/xdg:/usr/PCBSD/local/kde4/etc/xdg:/usr/local/etc/xdg:/usr/local/kde4/etc/xdg:/usr/local/etc/xdg/xfce4"

Modified: pcbsd/trunk-current/system-overlay/usr/share/skel/dot.profile
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/share/skel/dot.profile	2009-06-01 17:50:07 UTC (rev 4020)
+++ pcbsd/trunk-current/system-overlay/usr/share/skel/dot.profile	2009-06-01 18:40:52 UTC (rev 4021)
@@ -5,19 +5,19 @@
 # see also sh(1), environ(7).
 #
 
-# Set our LD_ELF_HINTS_PATH variable so that /PCBSD/local works
+# Set our LD_ELF_HINTS_PATH variable so that /usr/PCBSD/local works
 LD_ELF_HINTS_PATH="/var/run/ld-pcbsd-elf.so.hints"
 export LD_ELF_HINTS_PATH
 
 # remove /usr/games and /usr/X11R6/bin if you want
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/Programs/bin:$HOME/bin:/PCBSD/local/bin:/PCBSD/local/sbin:/PCBSD/local/kde4/bin:/usr/local/sbin:/usr/local/bin:/usr/local/kde4/bin; export PATH
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/Programs/bin:$HOME/bin:/usr/PCBSD/local/bin:/usr/PCBSD/local/sbin:/usr/PCBSD/local/kde4/bin:/usr/local/sbin:/usr/local/bin:/usr/local/kde4/bin; export PATH
 
 # Setup the XDG_DATA_DIRS variable
-XDG_DATA_DIRS="/PCBSD/local/share:/PCBSD/local/kde4/share:/usr/local/kde4/share:/usr/share:/usr/local/share:/usr/local/share/gnome"
+XDG_DATA_DIRS="/usr/PCBSD/local/share:/usr/PCBSD/local/kde4/share:/usr/local/kde4/share:/usr/share:/usr/local/share:/usr/local/share/gnome"
 export XDG_DATA_DIRS
 
 # Setup the XDG_CONFIG_DIRS variable
-XDG_CONFIG_DIRS="/PCBSD/local/etc/xdg:/PCBSD/local/kde4/etc/xdg:/usr/local/kde4/etc/xdg:/etc/xdg:/usr/local/etc/xdg:/usr/local/etc/xdg/xfce4"
+XDG_CONFIG_DIRS="/usr/PCBSD/local/etc/xdg:/usr/PCBSD/local/kde4/etc/xdg:/usr/local/kde4/etc/xdg:/etc/xdg:/usr/local/etc/xdg:/usr/local/etc/xdg/xfce4"
 export XDG_CONFIG_DIRS
 
 # Setting TERM is normally done through /etc/ttys.  Do only override



More information about the Commits mailing list