From owner-svn-src-all@FreeBSD.ORG Mon Jan 9 00:48:20 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 69126106564A; Mon, 9 Jan 2012 00:48:20 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 50C358FC08; Mon, 9 Jan 2012 00:48:20 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q090mKiH015081; Mon, 9 Jan 2012 00:48:20 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q090mKB6015074; Mon, 9 Jan 2012 00:48:20 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201201090048.q090mKB6015074@svn.freebsd.org> From: Eitan Adler Date: Mon, 9 Jan 2012 00:48:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r229831 - in head: lib/libopie share/examples/diskless share/examples/ppp share/examples/printing tools/tools/nanobsd/pcengines/Files/root usr.sbin/pkg_install/add X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jan 2012 00:48:20 -0000 Author: eadler (ports committer) Date: Mon Jan 9 00:48:19 2012 New Revision: 229831 URL: http://svn.freebsd.org/changeset/base/229831 Log: X11BASE has been deprecated for a long time and will die soon Approved by: x11 (eadler) Approved by: brucec MFC after: 1 week Modified: head/lib/libopie/config.h head/share/examples/diskless/README.TEMPLATING head/share/examples/ppp/ppp.linkdown.sample head/share/examples/printing/hpvf head/tools/tools/nanobsd/pcengines/Files/root/.cshrc head/usr.sbin/pkg_install/add/main.c Modified: head/lib/libopie/config.h ============================================================================== --- head/lib/libopie/config.h Sun Jan 8 23:30:23 2012 (r229830) +++ head/lib/libopie/config.h Mon Jan 9 00:48:19 2012 (r229831) @@ -54,7 +54,7 @@ /* #undef DOANONYMOUS */ /* The default value of the PATH environment variable */ -#define DEFAULT_PATH "/usr/bin:/bin:/usr/sbin:/sbin:/usr/X11R6/bin" +#define DEFAULT_PATH "/usr/bin:/bin:/usr/sbin:/sbin" /* Defined if the file /etc/default/login exists (and, presumably, should be looked at by login) */ Modified: head/share/examples/diskless/README.TEMPLATING ============================================================================== --- head/share/examples/diskless/README.TEMPLATING Sun Jan 8 23:30:23 2012 (r229830) +++ head/share/examples/diskless/README.TEMPLATING Mon Jan 9 00:48:19 2012 (r229831) @@ -94,8 +94,8 @@ be useful to set up clients and server f /usr/ports ( note 5 ) /usr/src ( note 5 ) /usr/local/crack ( note 5 ) - /usr/X11R6/lib/X11/xdm/xdm-errors ( note 6 ) - /usr/X11R6/lib/X11/xdm/xdm-pid ( note 6 ) + /usr/local/lib/X11/xdm/xdm-errors ( note 6 ) + /usr/local/lib/X11/xdm/xdm-pid ( note 6 ) /usr/local/etc/ssh_host_key ( note 6 ) /usr/local/etc/ssh_host_key.pub ( note 6 ) /usr/local/etc/ssh_random_seed ( note 6 ) @@ -120,7 +120,7 @@ be useful to set up clients and server f do not want to template such directories. note 6: Note that you can solve the problem of xdm and sshd creating - files in /usr. With xdm, edit /usr/X11R6/lib/xdm/xdm-config + files in /usr. With xdm, edit /usr/local/lib/xdm/xdm-config and change the errorLogFile and pidFile config lines. With sshd, add 'HostKey' and 'RandomSeed' directives to specify Modified: head/share/examples/ppp/ppp.linkdown.sample ============================================================================== --- head/share/examples/ppp/ppp.linkdown.sample Sun Jan 8 23:30:23 2012 (r229830) +++ head/share/examples/ppp/ppp.linkdown.sample Mon Jan 9 00:48:19 2012 (r229831) @@ -23,7 +23,7 @@ # ``auplay'' (assuming NAS is installed and configured). # MYADDR: - !bg /usr/X11R6/bin/auplay /etc/ppp/linkdown.au + !bg /usr/local/bin/auplay /etc/ppp/linkdown.au # If you're running ``ppp -auto -nat dynamic-nat-auto'', and are # assigned a dynamic IP number by the peer, this may be worth while Modified: head/share/examples/printing/hpvf ============================================================================== --- head/share/examples/printing/hpvf Sun Jan 8 23:30:23 2012 (r229830) +++ head/share/examples/printing/hpvf Mon Jan 9 00:48:19 2012 (r229831) @@ -1,10 +1,10 @@ #!/bin/sh # +# $FreeBSD$ +# # hpvf - Convert GIF files into HP/PCL, then print # Installed in /usr/local/libexec/hpvf -PATH=/usr/X11R6/bin:$PATH; export PATH - giftopnm | ppmtopgm | pgmtopbm | pbmtolj -resolution 300 \ && exit 0 \ || exit 2 Modified: head/tools/tools/nanobsd/pcengines/Files/root/.cshrc ============================================================================== --- head/tools/tools/nanobsd/pcengines/Files/root/.cshrc Sun Jan 8 23:30:23 2012 (r229830) +++ head/tools/tools/nanobsd/pcengines/Files/root/.cshrc Mon Jan 9 00:48:19 2012 (r229831) @@ -14,7 +14,7 @@ alias ll ls -lA # A righteous umask umask 22 -set path = (/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin /usr/X11R6/bin $HOME/bin) +set path = (/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin $HOME/bin) setenv EDITOR vi setenv PAGER more Modified: head/usr.sbin/pkg_install/add/main.c ============================================================================== --- head/usr.sbin/pkg_install/add/main.c Sun Jan 8 23:30:23 2012 (r229830) +++ head/usr.sbin/pkg_install/add/main.c Mon Jan 9 00:48:19 2012 (r229831) @@ -285,7 +285,7 @@ main(int argc, char **argv) } /* Make sure the sub-execs we invoke get found */ setenv("PATH", - "/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin", + "/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin", 1); /* Set a reasonable umask */