From f5ea2874b3fe00d07b2b969d404f2c26ecf6c3a8 Mon Sep 17 00:00:00 2001 From: Alexander Polakov Date: Fri, 18 Sep 2009 21:14:57 +0400 Subject: [PATCH] Remove /usr/pkg/xorg from paths. pkgsrc no longer installs anything there --- etc/defaults/periodic.conf | 2 +- etc/defaults/rc.conf | 4 ++-- etc/etc.amd64/ttys | 2 +- etc/etc.i386/ttys | 2 +- etc/login.conf | 4 ++-- etc/root/dot.cshrc | 2 +- etc/root/dot.profile | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/etc/defaults/periodic.conf b/etc/defaults/periodic.conf index 882b422c7e..fca3fd12b7 100644 --- a/etc/defaults/periodic.conf +++ b/etc/defaults/periodic.conf @@ -21,7 +21,7 @@ periodic_conf_files="/etc/periodic.conf /etc/periodic.conf.local" # periodic script dirs -local_periodic="/usr/local/etc/periodic /usr/pkg/xorg/etc/periodic /usr/X11R6/etc/periodic" +local_periodic="/usr/local/etc/periodic /usr/pkg/etc/periodic /usr/X11R6/etc/periodic" # Daily options diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index ad0221abe4..370613a4f4 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -34,7 +34,7 @@ sensorsd_flags="" # additional flags for sensorsd(8). pccard_ifconfig="NO" # Specialized pccard ethernet configuration (or NO). pccard_ether_delay="5" # Delay before trying to start dhclient in pccard_ether removable_interfaces="" # Removable network interfaces for /etc/pccard_ether. -local_startup="/usr/pkg/etc/rc.d /usr/local/etc/rc.d /usr/pkg/xorg/etc/rc.d /usr/X11R6/etc/rc.d" +local_startup="/usr/pkg/etc/rc.d /usr/local/etc/rc.d /usr/X11R6/etc/rc.d" # startup script dirs. script_name_sep=" " # Change if your startup scripts' names contain spaces rc_conf_files="/etc/rc.conf /etc/rc.conf.local" @@ -411,7 +411,7 @@ sysvipc_enable="NO" # Load System V IPC primitives at startup (or NO). linux_enable="NO" # Linux binary compatibility loaded at startup (or NO). clear_tmp_enable="NO" # Clear /tmp at startup. ldconfig_insecure="NO" # Set to YES to disable ldconfig security checks -ldconfig_paths="/usr/lib /usr/lib/gcc* /usr/lib/compat /usr/pkg/lib /usr/pkg/xorg/lib /usr/local/lib" +ldconfig_paths="/usr/lib /usr/lib/gcc* /usr/lib/compat /usr/pkg/lib /usr/local/lib" # shared library search paths kern_securelevel="-1" # range: -1..3 ; `-1' is the most insecure update_motd="YES" # update version info in /etc/motd (or NO) diff --git a/etc/etc.amd64/ttys b/etc/etc.amd64/ttys index e15be96df9..c1f2833688 100644 --- a/etc/etc.amd64/ttys +++ b/etc/etc.amd64/ttys @@ -40,7 +40,7 @@ ttyv4 "/usr/libexec/getty Pc" cons25 on secure 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 "/usr/pkg/xorg/bin/xdm -nodaemon" xterm off secure +ttyv8 "/usr/pkg/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. ttyd0 "/usr/libexec/getty std.9600" dialup off secure diff --git a/etc/etc.i386/ttys b/etc/etc.i386/ttys index e15be96df9..c1f2833688 100644 --- a/etc/etc.i386/ttys +++ b/etc/etc.i386/ttys @@ -40,7 +40,7 @@ ttyv4 "/usr/libexec/getty Pc" cons25 on secure 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 "/usr/pkg/xorg/bin/xdm -nodaemon" xterm off secure +ttyv8 "/usr/pkg/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. ttyd0 "/usr/libexec/getty std.9600" dialup off secure diff --git a/etc/login.conf b/etc/login.conf index a4b8a746e5..794c7330ac 100644 --- a/etc/login.conf +++ b/etc/login.conf @@ -23,7 +23,7 @@ default:\ :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 /usr/local/sbin /usr/local/bin /usr/pkg/xorg/bin /usr/pkg/sbin /usr/pkg/bin ~/bin:\ + :path=/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin /usr/pkg/sbin /usr/pkg/bin ~/bin:\ :nologin=/var/run/nologin:\ :cputime=unlimited:\ :datasize=unlimited:\ @@ -138,7 +138,7 @@ russian|Russian Users Accounts:\ ## users of X (needs more resources!) ## #xuser:\ -# :manpath=/usr/share/man /usr/pkg/xorg/man /usr/local/man:\ +# :manpath=/usr/share/man /usr/pkg/man /usr/local/man:\ # :cputime=4h:\ # :datasize=12M:\ # :vmemoryuse=infinity:\ diff --git a/etc/root/dot.cshrc b/etc/root/dot.cshrc index 8d7ab0762f..702bf7ed3f 100644 --- a/etc/root/dot.cshrc +++ b/etc/root/dot.cshrc @@ -15,7 +15,7 @@ alias ll ls -lA # A righteous umask umask 22 -set path = (/sbin /bin /usr/sbin /usr/bin /usr/pkg/bin /usr/pkg/sbin /usr/games /usr/local/sbin /usr/local/bin /usr/pkg/xorg/bin /usr/X11R6/bin $HOME/bin) +set path = (/sbin /bin /usr/sbin /usr/bin /usr/pkg/bin /usr/pkg/sbin /usr/games /usr/local/sbin /usr/local/bin /usr/X11R6/bin $HOME/bin) setenv EDITOR vi setenv PAGER more diff --git a/etc/root/dot.profile b/etc/root/dot.profile index 87745e85b4..0daf271747 100644 --- a/etc/root/dot.profile +++ b/etc/root/dot.profile @@ -1,7 +1,7 @@ # $FreeBSD: src/etc/root/dot.profile,v 1.20 1999/08/27 23:24:09 peter Exp $ # $DragonFly: src/etc/root/dot.profile,v 1.3 2005/12/04 22:29:30 dillon Exp $ # -PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/pkg/sbin:/usr/pkg/bin:/usr/local/sbin:/usr/local/bin:/usr/pkg/xorg/bin:/usr/X11R6/bin +PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/pkg/sbin:/usr/pkg/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin export PATH HOME=/root export HOME -- 2.41.0