From ee48961f69795d85deef944236be3fb4ee65874f Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Mon, 20 May 2013 14:50:45 +0200 Subject: [PATCH] Give /usr/local/... precedence over /usr/pkg/... in various paths. --- Makefile | 2 +- Makefile.inc1 | 2 +- etc/defaults/rc.conf | 4 ++-- etc/login.conf | 3 +-- etc/rc.shutdown | 3 +-- etc/root/dot.cshrc | 2 +- etc/root/dot.profile | 2 +- gnu/usr.bin/man/manpath/manpath.config | 2 +- gnu/usr.bin/texinfo/info/Makefile | 4 ++-- gnu/usr.bin/texinfo/libgnu/configmake.h | 2 +- include/paths.h | 2 +- lib/libopie/config.h | 2 +- share/mk/sys.mk | 2 +- share/skel/dot.cshrc | 2 +- share/skel/dot.profile | 2 +- tools/gitrev.sh | 2 +- 16 files changed, 18 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index 0116002503..334bb24859 100644 --- a/Makefile +++ b/Makefile @@ -103,7 +103,7 @@ BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/} .ORDER: quickkernel installkernel .ORDER: quickkernel reinstallkernel -PATH= /sbin:/bin:/usr/sbin:/usr/bin:/usr/pkg/bin:/usr/local/bin +PATH= /sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/pkg/bin MAKE= PATH=${PATH} make -m ${.CURDIR}/share/mk -f Makefile.inc1 # diff --git a/Makefile.inc1 b/Makefile.inc1 index df8ef9e9ee..4c2d643f26 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -222,7 +222,7 @@ BTOOLSPATH= ${BTOOLSDEST}/usr/sbin:${BTOOLSDEST}/usr/bin:${BTOOLSDEST}/bin:${BTO # The strict temporary command path contains all binaries required # by the buildworld system after the cross-tools stage. # -STRICTTMPPATH= ${CTOOLSDEST}/usr/sbin:${CTOOLSDEST}/usr/bin:${CTOOLSDEST}/bin:${CTOOLSDEST}/usr/games:${BTOOLSDEST}/usr/sbin:${BTOOLSDEST}/usr/bin:${BTOOLSDEST}/bin:${BTOOLSDEST}/usr/games:/usr/pkg/bin:/usr/local/bin +STRICTTMPPATH= ${CTOOLSDEST}/usr/sbin:${CTOOLSDEST}/usr/bin:${CTOOLSDEST}/bin:${CTOOLSDEST}/usr/games:${BTOOLSDEST}/usr/sbin:${BTOOLSDEST}/usr/bin:${BTOOLSDEST}/bin:${BTOOLSDEST}/usr/games:/usr/local/bin:/usr/pkg/bin TMPDIR?= /tmp TMPPID!= echo $$$$ diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index 45e31329f2..7ef91a5a31 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -36,7 +36,7 @@ hotplugd_flags="" # additional flags for hotplugd(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" +local_startup="/usr/local/etc/rc.d /usr/pkg/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" @@ -378,7 +378,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/compat /usr/pkg/lib /usr/local/lib" +ldconfig_paths="/usr/lib /usr/lib/compat /usr/local/lib /usr/pkg/lib" # shared library search paths ldconfig_local_dirs="/usr/local/libdata/ldconfig" # Local directories with ldconfig configuration files. diff --git a/etc/login.conf b/etc/login.conf index 232a8899a6..e88f4cf80e 100644 --- a/etc/login.conf +++ b/etc/login.conf @@ -8,7 +8,6 @@ # default user environment settings. # # $FreeBSD: src/etc/login.conf,v 1.34.2.6 2002/07/02 20:06:18 dillon Exp $ -# $DragonFly: src/etc/login.conf,v 1.5 2006/08/12 16:47:18 dillon Exp $ # # Default settings effectively disable resource limits, see the @@ -138,7 +137,7 @@ russian|Russian Users Accounts:\ ## users of X (needs more resources!) ## #xuser:\ -# :manpath=/usr/share/man /usr/pkg/man /usr/local/man:\ +# :manpath=/usr/share/man /usr/local/man /usr/pkg/man:\ # :cputime=4h:\ # :datasize=12M:\ # :vmemoryuse=infinity:\ diff --git a/etc/rc.shutdown b/etc/rc.shutdown index 36b43d6017..3a4888ad81 100644 --- a/etc/rc.shutdown +++ b/etc/rc.shutdown @@ -25,7 +25,6 @@ # SUCH DAMAGE. # # $FreeBSD: src/etc/rc.shutdown,v 1.25 2003/07/08 02:52:14 mtm Exp $ -# $DragonFly: src/etc/rc.shutdown,v 1.5 2006/01/10 01:56:04 corecode Exp $ # # Closing actions for daemons run by init on shutdown, @@ -41,7 +40,7 @@ trap : 2 trap : 3 # shouldn't be needed HOME=/ -PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/pkg/sbin:/usr/local/sbin +PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/pkg/sbin export HOME PATH . /etc/rc.subr diff --git a/etc/root/dot.cshrc b/etc/root/dot.cshrc index ea70c38aae..6a0bbb3308 100644 --- a/etc/root/dot.cshrc +++ b/etc/root/dot.cshrc @@ -14,7 +14,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 $HOME/bin) +set path = (/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin /usr/pkg/bin /usr/pkg/sbin /usr/games $HOME/bin) setenv EDITOR vi setenv PAGER more diff --git a/etc/root/dot.profile b/etc/root/dot.profile index 4f9c3d9c76..faf0482fe6 100644 --- a/etc/root/dot.profile +++ b/etc/root/dot.profile @@ -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/pkg/sbin:/usr/pkg/bin:/usr/local/sbin:/usr/local/bin +PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/pkg/sbin:/usr/pkg/bin export PATH HOME=/root export HOME diff --git a/gnu/usr.bin/man/manpath/manpath.config b/gnu/usr.bin/man/manpath/manpath.config index 435a6983bc..03a60c706f 100644 --- a/gnu/usr.bin/man/manpath/manpath.config +++ b/gnu/usr.bin/man/manpath/manpath.config @@ -16,8 +16,8 @@ MANDATORY_MANPATH /usr/share/openssl/man # # check if the directory exists and if it does, add it to MANPATH # -OPTIONAL_MANPATH /usr/pkg/man OPTIONAL_MANPATH /usr/local/man +OPTIONAL_MANPATH /usr/pkg/man # # set up PATH to MANPATH mapping # diff --git a/gnu/usr.bin/texinfo/info/Makefile b/gnu/usr.bin/texinfo/info/Makefile index 00749e072d..09b8adb3f0 100644 --- a/gnu/usr.bin/texinfo/info/Makefile +++ b/gnu/usr.bin/texinfo/info/Makefile @@ -12,8 +12,8 @@ CFLAGS+= -DHAVE_CONFIG_H # Additional info dirs # -CFLAGS+=-DINFODIR=\"/usr/pkg/info\" -CFLAGS+=-DINFODIR2=\"/usr/local/info\" +CFLAGS+=-DINFODIR=\"/usr/local/info\" +CFLAGS+=-DINFODIR2=\"/usr/pkg/info\" SRCS= dir.c \ display.c \ diff --git a/gnu/usr.bin/texinfo/libgnu/configmake.h b/gnu/usr.bin/texinfo/libgnu/configmake.h index c50fea8520..ce06a0737e 100644 --- a/gnu/usr.bin/texinfo/libgnu/configmake.h +++ b/gnu/usr.bin/texinfo/libgnu/configmake.h @@ -12,7 +12,7 @@ #define INCLUDEDIR "/usr/include" #define OLDINCLUDEDIR "/usr/include" #define DOCDIR "/usr/share/doc/texinfo" -#define INFODIR "/usr/share/info:/usr/pkg/info:/usr/local/info:." +#define INFODIR "/usr/share/info:/usr/local/info:/usr/pkg/info:." #define HTMLDIR "/usr/share/doc/texinfo" #define DVIDIR "/usr/share/doc/texinfo" #define PDFDIR "/usr/share/doc/texinfo" diff --git a/include/paths.h b/include/paths.h index 4009a260d2..56b933b240 100644 --- a/include/paths.h +++ b/include/paths.h @@ -38,7 +38,7 @@ /* Default search path. */ #define _PATH_DEFPATH \ - "/bin:/sbin:/usr/bin:/usr/sbin:/usr/pkg/bin:/usr/pkg/sbin:/usr/local/bin:/usr/local/sbin" + "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/usr/pkg/bin:/usr/pkg/sbin" /* All standard utilities path. */ #define _PATH_STDPATH \ diff --git a/lib/libopie/config.h b/lib/libopie/config.h index c52e4831f2..8d1e4f29a6 100644 --- a/lib/libopie/config.h +++ b/lib/libopie/config.h @@ -54,7 +54,7 @@ /* #undef DOANONYMOUS */ /* The default value of the PATH environment variable */ -#define DEFAULT_PATH "/usr/bin:/bin:/usr/sbin:/sbin:/usr/pkg/bin:/usr/local/bin" +#define DEFAULT_PATH "/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/pkg/bin" /* Defined if the file /etc/default/login exists (and, presumably, should be looked at by login) */ diff --git a/share/mk/sys.mk b/share/mk/sys.mk index 1a26dc3f58..dd434eccbc 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -50,7 +50,7 @@ CC_LINK ?= ${CC} # The system cc frontend is not subject to the path, e.g. when buildworld # is doing cross compiles it may still need the native compiler for things. # -NXENV ?= CCVER=${HOST_CCVER} BINUTILSVER=${HOST_BINUTILSVER} OBJFORMAT_PATH=/ PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/pkg/bin:/usr/local/bin +NXENV ?= CCVER=${HOST_CCVER} BINUTILSVER=${HOST_BINUTILSVER} OBJFORMAT_PATH=/ PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/pkg/bin NXCC ?= ${NXENV} ${CC} NXCC_LINK ?= ${NXENV} ${CC_LINK} CFLAGS ?= -O -pipe diff --git a/share/skel/dot.cshrc b/share/skel/dot.cshrc index 6d20760b03..6c173b39d0 100644 --- a/share/skel/dot.cshrc +++ b/share/skel/dot.cshrc @@ -14,7 +14,7 @@ alias ll ls -lA # A righteous umask umask 22 -set path = (/sbin /bin /usr/sbin /usr/bin /usr/games /usr/pkg/sbin /usr/pkg/bin /usr/local/sbin /usr/local/bin $HOME/bin) +set path = (/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin /usr/pkg/sbin /usr/pkg/bin $HOME/bin) setenv EDITOR vi setenv PAGER more diff --git a/share/skel/dot.profile b/share/skel/dot.profile index e164dc2b1f..6dade0a00b 100644 --- a/share/skel/dot.profile +++ b/share/skel/dot.profile @@ -6,7 +6,7 @@ # # remove /usr/games if you want -PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/pkg/sbin:/usr/pkg/bin:/usr/local/sbin:/usr/local/bin:$HOME/bin; export PATH +PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin:/usr/pkg/sbin:/usr/pkg/bin:$HOME/bin; export PATH # Setting TERM is normally done through /etc/ttys. Do only override # if you're sure that you'll never log in via telnet or xterm or a diff --git a/tools/gitrev.sh b/tools/gitrev.sh index f3194cb5db..210d723e24 100755 --- a/tools/gitrev.sh +++ b/tools/gitrev.sh @@ -4,7 +4,7 @@ # limited. To reach git, we need to add the directories # git might be located in. Not a very nice solution, but # it works well enough. -PATH=$PATH:/usr/pkg/bin:/usr/local/bin +PATH=$PATH:/usr/local/bin:/usr/pkg/bin srcdir=${1:-$(dirname $0)} -- 2.41.0