From: Sascha Wildner Date: Mon, 20 May 2013 18:53:17 +0000 (+0200) Subject: Switch to /usr/local/... paths in several files. X-Git-Tag: v3.7.0~1052 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/91e5aabbdccf4df944ffc8863d7f2d55afec266d Switch to /usr/local/... paths in several files. --- diff --git a/crypto/openssh/ssh_config b/crypto/openssh/ssh_config index 02a8b6c3c4..0ee9ce0e18 100644 --- a/crypto/openssh/ssh_config +++ b/crypto/openssh/ssh_config @@ -42,7 +42,7 @@ # EscapeChar ~ # VersionAddendum DragonFly-20121028 -# XAuthLocation /usr/pkg/bin/xauth +# XAuthLocation /usr/local/bin/xauth # Tunnel no # TunnelDevice any:any # PermitLocalCommand no diff --git a/crypto/openssh/sshd_config b/crypto/openssh/sshd_config index 5aca389de6..87d08a1fd2 100644 --- a/crypto/openssh/sshd_config +++ b/crypto/openssh/sshd_config @@ -120,7 +120,7 @@ UsePrivilegeSeparation sandbox # Default for new installations. #PermitTunnel no #ChrootDirectory none -#XAuthLocation /usr/pkg/bin/xauth +#XAuthLocation /usr/local/bin/xauth # no default banner path #Banner none diff --git a/etc/defaults/pfi.conf b/etc/defaults/pfi.conf index cdfaf3bdbc..c43d0a82cf 100644 --- a/etc/defaults/pfi.conf +++ b/etc/defaults/pfi.conf @@ -133,4 +133,4 @@ pfi_shutdown_command="shutdown -h now" # EXAMPLE 4: # Use a custom backend. # -# pfi_backend="/usr/pkg/sbin/my_custom_backend" +# pfi_backend="/usr/local/sbin/my_custom_backend" diff --git a/etc/etc.i386/ttys b/etc/etc.i386/ttys index c1f2833688..a5347c3c08 100644 --- a/etc/etc.i386/ttys +++ b/etc/etc.i386/ttys @@ -1,6 +1,5 @@ # # $FreeBSD: src/etc/etc.i386/ttys,v 1.8 2000/01/29 12:18:03 obrien Exp $ -# $DragonFly: src/etc/etc.i386/ttys,v 1.6 2006/08/29 07:41:46 swildner Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -40,7 +39,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/bin/xdm -nodaemon" xterm off secure +ttyv8 "/usr/local/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.x86_64/ttys b/etc/etc.x86_64/ttys index c1f2833688..a5347c3c08 100644 --- a/etc/etc.x86_64/ttys +++ b/etc/etc.x86_64/ttys @@ -1,6 +1,5 @@ # # $FreeBSD: src/etc/etc.i386/ttys,v 1.8 2000/01/29 12:18:03 obrien Exp $ -# $DragonFly: src/etc/etc.i386/ttys,v 1.6 2006/08/29 07:41:46 swildner Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -40,7 +39,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/bin/xdm -nodaemon" xterm off secure +ttyv8 "/usr/local/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/inetd.conf b/etc/inetd.conf index d04e9d996f..2255a0bb30 100644 --- a/etc/inetd.conf +++ b/etc/inetd.conf @@ -1,5 +1,4 @@ # $FreeBSD: src/etc/inetd.conf,v 1.44.2.17 2003/06/13 10:43:19 yar Exp $ -# $DragonFly: src/etc/inetd.conf,v 1.5 2008/07/06 23:50:19 thomas Exp $ # # Internet server configuration database # @@ -72,15 +71,15 @@ # # example entry for the optional pop3 server # -#pop3 stream tcp nowait root /usr/pkg/libexec/popper popper +#pop3 stream tcp nowait root /usr/local/libexec/popper popper # # example entry for the optional imap4 server # -#imap4 stream tcp nowait root /usr/pkg/libexec/imapd imapd +#imap4 stream tcp nowait root /usr/local/cyrus/bin/imapd imapd # # example entry for the optional nntp server # -#nntp stream tcp nowait news /usr/pkg/libexec/nntpd nntpd +#nntp stream tcp nowait news /usr/local/sbin/nntpd nntpd # # Return error for all "ident" requests # @@ -96,7 +95,7 @@ # # Example entry for an external ident server # -#auth stream tcp wait root /usr/pkg/sbin/identd identd -w -t120 +#auth stream tcp wait root /usr/local/sbin/identd identd -w -t120 # # Example entry for the optional qmail MTA # NOTE: This is no longer the correct way to handle incoming SMTP @@ -109,9 +108,9 @@ # (from the Samba documentation). Enable the third entry to enable the swat # samba configuration tool. # -#netbios-ssn stream tcp nowait root /usr/pkg/sbin/smbd smbd -#netbios-ns dgram udp wait root /usr/pkg/sbin/nmbd nmbd -#swat stream tcp nowait/400 root /usr/pkg/sbin/swat swat +#netbios-ssn stream tcp nowait root /usr/local/sbin/smbd smbd +#netbios-ns dgram udp wait root /usr/local/sbin/nmbd nmbd +#swat stream tcp nowait/400 root /usr/local/sbin/swat swat # # Enable the following entry to enable ftp-proxy to NAT ftp sessions with pf # N.B.: inetd binds to * in the default installation so you should add diff --git a/gnu/usr.bin/groff/font/devhtml/Makefile b/gnu/usr.bin/groff/font/devhtml/Makefile index 3e56267bdc..4dc82264aa 100644 --- a/gnu/usr.bin/groff/font/devhtml/Makefile +++ b/gnu/usr.bin/groff/font/devhtml/Makefile @@ -1,9 +1,8 @@ # $FreeBSD: src/gnu/usr.bin/groff/font/devhtml/Makefile,v 1.3 2005/10/20 10:57:52 ru Exp $ -# $DragonFly: src/gnu/usr.bin/groff/font/devhtml/Makefile,v 1.4 2008/03/02 23:02:01 swildner Exp $ DEV= html FONTS= R I B BI CR CI CB CBI S -GHOSTSCRIPT= /usr/pkg/bin/gs +GHOSTSCRIPT= /usr/local/bin/gs DESC_EXT= echo "image_generator ${GHOSTSCRIPT}" .include "../Makefile.tty"