[PC-BSD Commits] r7570 - in pcbsd/current: mfsroot-overlay/root src-kde4/kcmSoftwareManagerLauncher src-kde4/kcmUserManagerLauncher src-kde4/pbi-thumbnailer src-qt4/pc-crashhandler src-qt4/pc-xgui/resources/bin

svn at pcbsd.org svn at pcbsd.org
Thu Sep 16 05:39:50 PDT 2010


Author: kris
Date: 2010-09-16 05:39:49 -0700 (Thu, 16 Sep 2010)
New Revision: 7570

Modified:
   pcbsd/current/mfsroot-overlay/root/.cshrc
   pcbsd/current/mfsroot-overlay/root/.profile
   pcbsd/current/mfsroot-overlay/root/.xinitrc
   pcbsd/current/mfsroot-overlay/root/PCBSDStartLive.sh
   pcbsd/current/src-kde4/kcmSoftwareManagerLauncher/kcm.cpp
   pcbsd/current/src-kde4/kcmSoftwareManagerLauncher/kcmSoftwareManagerLauncher.pro
   pcbsd/current/src-kde4/kcmUserManagerLauncher/kcm.cpp
   pcbsd/current/src-kde4/kcmUserManagerLauncher/kcmUserManagerLauncher.pro
   pcbsd/current/src-kde4/pbi-thumbnailer/pbi-thumbnailer.pro
   pcbsd/current/src-qt4/pc-crashhandler/pc-crashhandler.pro
   pcbsd/current/src-qt4/pc-xgui/resources/bin/rundetect.sh
Log:

Change references from '/usr/local/kde4' -> '/usr/local' to repect new KDE4 PREFIX



Modified: pcbsd/current/mfsroot-overlay/root/.cshrc
===================================================================
--- pcbsd/current/mfsroot-overlay/root/.cshrc	2010-09-16 12:28:31 UTC (rev 7569)
+++ pcbsd/current/mfsroot-overlay/root/.cshrc	2010-09-16 12:39:49 UTC (rev 7570)
@@ -14,7 +14,7 @@
 # A righteous umask
 umask 22
 
-set path = (/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin /usr/local/kde4/sbin /usr/local/kde4/bin /usr/X11R6/bin $HOME/bin)
+set path = (/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin /usr/X11R6/bin $HOME/bin)
 
 setenv	EDITOR	vi
 setenv	PAGER	more

Modified: pcbsd/current/mfsroot-overlay/root/.profile
===================================================================
--- pcbsd/current/mfsroot-overlay/root/.profile	2010-09-16 12:28:31 UTC (rev 7569)
+++ pcbsd/current/mfsroot-overlay/root/.profile	2010-09-16 12:39:49 UTC (rev 7570)
@@ -1,6 +1,6 @@
 # $FreeBSD: src/etc/root/dot.profile,v 1.20 1999/08/27 23:24:09 peter Exp $
 #
-PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/local/kde4/sbin:/usr/local/kde4/bin:/usr/X11R6/bin
+PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin
 export PATH
 HOME=/root
 export HOME

Modified: pcbsd/current/mfsroot-overlay/root/.xinitrc
===================================================================
--- pcbsd/current/mfsroot-overlay/root/.xinitrc	2010-09-16 12:28:31 UTC (rev 7569)
+++ pcbsd/current/mfsroot-overlay/root/.xinitrc	2010-09-16 12:39:49 UTC (rev 7570)
@@ -10,7 +10,7 @@
 /usr/local/bin/fluxbox &
 
 # Make sure we have our libs
-LD_LIBRARY_PATH="/usr/local/kde4/lib:/usr/local/lib/qt4" ; export LD_LIBRARY_PATH
+LD_LIBRARY_PATH="/usr/local/lib/qt4" ; export LD_LIBRARY_PATH
 
 # Turn off screensaver / blanking
 xset s off

Modified: pcbsd/current/mfsroot-overlay/root/PCBSDStartLive.sh
===================================================================
--- pcbsd/current/mfsroot-overlay/root/PCBSDStartLive.sh	2010-09-16 12:28:31 UTC (rev 7569)
+++ pcbsd/current/mfsroot-overlay/root/PCBSDStartLive.sh	2010-09-16 12:39:49 UTC (rev 7570)
@@ -7,7 +7,7 @@
 mv /root /liveroot/root
 ln -s /liveroot/root /root
 
-PATH="${PATH}:/usr/local/bin:/usr/local/kde4/bin"
+PATH="${PATH}:/usr/local/bin"
 export PATH
 
 # Now Copy over all our /etc files to make booting LIVE work
@@ -45,7 +45,7 @@
 # Turn off the numlock
 numlockx off
 
-/usr/local/kde4/bin/startkde4" >/root/.xinitrc
+/usr/local/bin/startkde4" >/root/.xinitrc
 
 # Set all NICS to DHCP
 echo "Detecting NICs..."

Modified: pcbsd/current/src-kde4/kcmSoftwareManagerLauncher/kcm.cpp
===================================================================
--- pcbsd/current/src-kde4/kcmSoftwareManagerLauncher/kcm.cpp	2010-09-16 12:28:31 UTC (rev 7569)
+++ pcbsd/current/src-kde4/kcmSoftwareManagerLauncher/kcm.cpp	2010-09-16 12:39:49 UTC (rev 7570)
@@ -21,7 +21,7 @@
 
   QString locale = KGlobal::locale()->language();
   QTranslator translator;
-  translator.load(QString("kcmSML_") + locale, "/usr/local/kde4/share/apps/pcbsd/i18n/");
+  translator.load(QString("kcmSML_") + locale, "/usr/local/share/apps/pcbsd/i18n/");
   KApplication::installTranslator(&translator);
 
   

Modified: pcbsd/current/src-kde4/kcmSoftwareManagerLauncher/kcmSoftwareManagerLauncher.pro
===================================================================
--- pcbsd/current/src-kde4/kcmSoftwareManagerLauncher/kcmSoftwareManagerLauncher.pro	2010-09-16 12:28:31 UTC (rev 7569)
+++ pcbsd/current/src-kde4/kcmSoftwareManagerLauncher/kcmSoftwareManagerLauncher.pro	2010-09-16 12:39:49 UTC (rev 7570)
@@ -3,7 +3,7 @@
 
 CONFIG	+= qt warn_on release
 
-LIBS += -L/usr/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs
+LIBS += -L/usr/local/lib -lkdecore -lkio -lkdeui -Ikdelibs
 
 HEADERS	+= kcm.h notroot.h
 
@@ -15,7 +15,7 @@
 
 TARGET  = kcm_pcbsdpbm
 
-DESTDIR = /usr/local/kde4/lib/kde4
+DESTDIR = /usr/local/lib/kde4
 
 TRANSLATIONS =  i18n/kcmSML_af.ts \
 		i18n/kcmSML_ar.ts \
@@ -81,14 +81,14 @@
 		i18n/kcmSML_zh_TW.ts \
 		i18n/kcmSML_zu.ts
 
-desktop.path=/usr/local/kde4/share/kde4/services/
+desktop.path=/usr/local/share/kde4/services/
 desktop.files=pcbsdpbm.desktop
 
-dotrans.path=/usr/local/kde4/share/apps/pcbsd/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/kde4/share/apps/pcbsd/i18n/
+dotrans.path=/usr/local/share/apps/pcbsd/i18n/
+dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/apps/pcbsd/i18n/
 
 INSTALLS += dotrans desktop
 
-INCLUDEPATH     += /usr/PCBSD/includes /usr/local/kde4/include
+INCLUDEPATH     += /usr/PCBSD/includes /usr/local/include
 
-QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
+QMAKE_LIBDIR = /usr/local/lib /usr/local/lib/qt4 /usr/local/lib

Modified: pcbsd/current/src-kde4/kcmUserManagerLauncher/kcm.cpp
===================================================================
--- pcbsd/current/src-kde4/kcmUserManagerLauncher/kcm.cpp	2010-09-16 12:28:31 UTC (rev 7569)
+++ pcbsd/current/src-kde4/kcmUserManagerLauncher/kcm.cpp	2010-09-16 12:39:49 UTC (rev 7570)
@@ -21,7 +21,7 @@
 
   QString locale = KGlobal::locale()->language();
   QTranslator translator;
-  translator.load(QString("kcmUML_") + locale, "/usr/local/kde4/share/apps/pcbsd/i18n/");
+  translator.load(QString("kcmUML_") + locale, "/usr/local/share/apps/pcbsd/i18n/");
   KApplication::installTranslator(&translator);
   
   buttons();

Modified: pcbsd/current/src-kde4/kcmUserManagerLauncher/kcmUserManagerLauncher.pro
===================================================================
--- pcbsd/current/src-kde4/kcmUserManagerLauncher/kcmUserManagerLauncher.pro	2010-09-16 12:28:31 UTC (rev 7569)
+++ pcbsd/current/src-kde4/kcmUserManagerLauncher/kcmUserManagerLauncher.pro	2010-09-16 12:39:49 UTC (rev 7570)
@@ -3,7 +3,7 @@
 
 CONFIG	+= qt warn_on release
 
-LIBS += -L/usr/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs
+LIBS += -L/usr/local/lib -lkdecore -lkio -lkdeui -Ikdelibs
 
 HEADERS	+= kcm.h notroot.h
 
@@ -15,9 +15,9 @@
 
 TARGET  = kcm_pcbsdusermanager
 
-DESTDIR = /usr/local/kde4/lib/kde4
+DESTDIR = /usr/local/lib/kde4
 
-INCLUDEPATH     += /usr/PCBSD/includes /usr/local/kde4/include
+INCLUDEPATH     += /usr/PCBSD/includes /usr/local/include
 
 TRANSLATIONS =  i18n/kcmUML_af.ts \
 		i18n/kcmUML_ar.ts \
@@ -83,15 +83,15 @@
 		i18n/kcmUML_zh_TW.ts \
 		i18n/kcmUML_zu.ts
 
-desktop.path=/usr/local/kde4/share/kde4/services/
+desktop.path=/usr/local/share/kde4/services/
 desktop.files=pcbsdusermanager.desktop
 
-kcm.path=/usr/local/kde4/lib/kde4/
-kcm.extra=ln -fs libkcm_pcbsdusermanager.so.1.0.0 /usr/local/kde4/lib/kde4/kcm_pcbsdusermanager.so
+kcm.path=/usr/local/lib/kde4/
+kcm.extra=ln -fs libkcm_pcbsdusermanager.so.1.0.0 /usr/local/lib/kde4/kcm_pcbsdusermanager.so
 
-dotrans.path=/usr/local/kde4/share/apps/pcbsd/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/kde4/share/apps/pcbsd/i18n/
+dotrans.path=/usr/local/share/apps/pcbsd/i18n/
+dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/apps/pcbsd/i18n/
 
 INSTALLS += dotrans desktop kcm
 
-QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
+QMAKE_LIBDIR = /usr/local/lib /usr/local/lib/qt4 /usr/local/lib

Modified: pcbsd/current/src-kde4/pbi-thumbnailer/pbi-thumbnailer.pro
===================================================================
--- pcbsd/current/src-kde4/pbi-thumbnailer/pbi-thumbnailer.pro	2010-09-16 12:28:31 UTC (rev 7569)
+++ pcbsd/current/src-kde4/pbi-thumbnailer/pbi-thumbnailer.pro	2010-09-16 12:39:49 UTC (rev 7570)
@@ -3,7 +3,7 @@
 
 CONFIG	+= qt warn_on release
 
-LIBS += -L/usr/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs
+LIBS += -L/usr/local/lib -lkdecore -lkio -lkdeui -Ikdelibs
 
 HEADERS	+= pbicreator.h
 
@@ -11,13 +11,13 @@
 
 TARGET  = pbithumbnail
 
-DESTDIR = /usr/local/kde4/lib/kde4
+DESTDIR = /usr/local/lib/kde4
 
-INCLUDEPATH     += /usr/PCBSD/includes /usr/local/kde4/include
+INCLUDEPATH     += /usr/PCBSD/includes /usr/local/include
 
-desktop.path=/usr/local/kde4/share/kde4/services/
+desktop.path=/usr/local/share/kde4/services/
 desktop.files=pbithumbnail.desktop
 
 INSTALLS += desktop
 
-QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
+QMAKE_LIBDIR = /usr/local/lib /usr/local/lib/qt4 /usr/local/lib

Modified: pcbsd/current/src-qt4/pc-crashhandler/pc-crashhandler.pro
===================================================================
--- pcbsd/current/src-qt4/pc-crashhandler/pc-crashhandler.pro	2010-09-16 12:28:31 UTC (rev 7569)
+++ pcbsd/current/src-qt4/pc-crashhandler/pc-crashhandler.pro	2010-09-16 12:39:49 UTC (rev 7570)
@@ -87,4 +87,4 @@
 
 INCLUDEPATH     += /usr/local/include
 
-QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
+QMAKE_LIBDIR = /usr/local/lib/qt4 /usr/local/lib

Modified: pcbsd/current/src-qt4/pc-xgui/resources/bin/rundetect.sh
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/bin/rundetect.sh	2010-09-16 12:28:31 UTC (rev 7569)
+++ pcbsd/current/src-qt4/pc-xgui/resources/bin/rundetect.sh	2010-09-16 12:39:49 UTC (rev 7570)
@@ -8,7 +8,7 @@
 # Configuration Settings
 
 # Set all our path variables
-PATH="/sbin:/bin:/usr/sbin:/usr/bin:/root/bin:/usr/local/bin:/usr/local/sbin:/usr/local/kde4/bin"
+PATH="/sbin:/bin:/usr/sbin:/usr/bin:/root/bin:/usr/local/bin:/usr/local/sbin"
 export PATH
 
 # Set the home directory for startx to run properly
@@ -131,7 +131,7 @@
     echo '#!/bin/sh
 
 # Set all our path variables
-PATH="/sbin:/bin:/usr/sbin:/usr/bin:/root/bin:/usr/local/bin:/usr/local/sbin:/usr/local/kde4/bin"
+PATH="/sbin:/bin:/usr/sbin:/usr/bin:/root/bin:/usr/local/bin:/usr/local/sbin"
 export PATH
 
 if [ -e "/root/.xprofile" ]
@@ -156,7 +156,7 @@
     echo '#!/bin/sh
 
 # Set all our path variables
-PATH="/sbin:/bin:/usr/sbin:/usr/bin:/root/bin:/usr/local/bin:/usr/local/sbin:/usr/local/kde4/bin"
+PATH="/sbin:/bin:/usr/sbin:/usr/bin:/root/bin:/usr/local/bin:/usr/local/sbin"
 export PATH
 
 if [ -e "/root/.xprofile" ]



More information about the Commits mailing list