[PC-BSD Commits] r4001 - in pcbsd/trunk/system-overlay: . etc root sbin usr/PCBSD

svn at pcbsd.org svn at pcbsd.org
Fri May 29 06:45:47 PDT 2009


Author: kris
Date: 2009-05-29 06:45:47 -0700 (Fri, 29 May 2009)
New Revision: 4001

Added:
   pcbsd/trunk/system-overlay/PCBSD/
Removed:
   pcbsd/trunk/system-overlay/usr/PCBSD/PCBSD/
Modified:
   pcbsd/trunk/system-overlay/etc/gettytab
   pcbsd/trunk/system-overlay/etc/login.conf
   pcbsd/trunk/system-overlay/etc/make.conf
   pcbsd/trunk/system-overlay/etc/manpath.config
   pcbsd/trunk/system-overlay/etc/periodic.conf.local
   pcbsd/trunk/system-overlay/etc/rc.conf.local
   pcbsd/trunk/system-overlay/etc/rc.local
   pcbsd/trunk/system-overlay/root/.cshrc
   pcbsd/trunk/system-overlay/root/.profile
   pcbsd/trunk/system-overlay/root/.xprofile
   pcbsd/trunk/system-overlay/sbin/mount_ntfs
Log:

Fix more LOCALBASE issues in SVN



Modified: pcbsd/trunk/system-overlay/etc/gettytab
===================================================================
--- pcbsd/trunk/system-overlay/etc/gettytab	2009-05-29 13:44:04 UTC (rev 4000)
+++ pcbsd/trunk/system-overlay/etc/gettytab	2009-05-29 13:45:47 UTC (rev 4001)
@@ -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/system-overlay/etc/login.conf
===================================================================
--- pcbsd/trunk/system-overlay/etc/login.conf	2009-05-29 13:44:04 UTC (rev 4000)
+++ pcbsd/trunk/system-overlay/etc/login.conf	2009-05-29 13:45:47 UTC (rev 4001)
@@ -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/system-overlay/etc/make.conf
===================================================================
--- pcbsd/trunk/system-overlay/etc/make.conf	2009-05-29 13:44:04 UTC (rev 4000)
+++ pcbsd/trunk/system-overlay/etc/make.conf	2009-05-29 13:45:47 UTC (rev 4001)
@@ -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/system-overlay/etc/manpath.config
===================================================================
--- pcbsd/trunk/system-overlay/etc/manpath.config	2009-05-29 13:44:04 UTC (rev 4000)
+++ pcbsd/trunk/system-overlay/etc/manpath.config	2009-05-29 13:45:47 UTC (rev 4001)
@@ -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/system-overlay/etc/periodic.conf.local
===================================================================
--- pcbsd/trunk/system-overlay/etc/periodic.conf.local	2009-05-29 13:44:04 UTC (rev 4000)
+++ pcbsd/trunk/system-overlay/etc/periodic.conf.local	2009-05-29 13:45:47 UTC (rev 4001)
@@ -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/system-overlay/etc/rc.conf.local
===================================================================
--- pcbsd/trunk/system-overlay/etc/rc.conf.local	2009-05-29 13:44:04 UTC (rev 4000)
+++ pcbsd/trunk/system-overlay/etc/rc.conf.local	2009-05-29 13:45:47 UTC (rev 4001)
@@ -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/system-overlay/etc/rc.local
===================================================================
--- pcbsd/trunk/system-overlay/etc/rc.local	2009-05-29 13:44:04 UTC (rev 4000)
+++ pcbsd/trunk/system-overlay/etc/rc.local	2009-05-29 13:45:47 UTC (rev 4001)
@@ -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/system-overlay/root/.cshrc
===================================================================
--- pcbsd/trunk/system-overlay/root/.cshrc	2009-05-29 13:44:04 UTC (rev 4000)
+++ pcbsd/trunk/system-overlay/root/.cshrc	2009-05-29 13:45:47 UTC (rev 4001)
@@ -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/system-overlay/root/.profile
===================================================================
--- pcbsd/trunk/system-overlay/root/.profile	2009-05-29 13:44:04 UTC (rev 4000)
+++ pcbsd/trunk/system-overlay/root/.profile	2009-05-29 13:45:47 UTC (rev 4001)
@@ -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/system-overlay/root/.xprofile
===================================================================
--- pcbsd/trunk/system-overlay/root/.xprofile	2009-05-29 13:44:04 UTC (rev 4000)
+++ pcbsd/trunk/system-overlay/root/.xprofile	2009-05-29 13:45:47 UTC (rev 4001)
@@ -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/system-overlay/sbin/mount_ntfs
===================================================================
--- pcbsd/trunk/system-overlay/sbin/mount_ntfs	2009-05-29 13:44:04 UTC (rev 4000)
+++ pcbsd/trunk/system-overlay/sbin/mount_ntfs	2009-05-29 13:45:47 UTC (rev 4001)
@@ -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



More information about the Commits mailing list