[pkgsrc/trunk]: pkgsrc ${X11BASE} can now be set to /usr, so just do so for I...

[schwarz <schwarz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/43086eb1eb2b
branches:  trunk
changeset: 518487:43086eb1eb2b
user:      schwarz <schwarz%pkgsrc.org@localhost>
date:      Sun Sep 10 20:14:43 2006 +0000

description:
${X11BASE} can now be set to /usr, so just do so for IRIX and OSF1. No need
for any artificial symlinking any more in bootstrap.

diffstat:

 bootstrap/bootstrap |  7 +------
 mk/bsd.prefs.mk     |  4 +++-
 2 files changed, 4 insertions(+), 7 deletions(-)

diffs (41 lines):

diff -r dbf8f990651a -r 43086eb1eb2b bootstrap/bootstrap
--- a/bootstrap/bootstrap       Sun Sep 10 19:57:28 2006 +0000
+++ b/bootstrap/bootstrap       Sun Sep 10 20:14:43 2006 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.82 2006/09/02 11:14:48 schwarz Exp $
+# $NetBSD: bootstrap,v 1.83 2006/09/10 20:14:43 schwarz Exp $
 #
 #
 # Copyright (c) 2001-2002 Alistair G. Crooks.  All rights reserved.
@@ -187,11 +187,6 @@
                        echo "LDD=                      $prefix/sbin/fakeldd" >> ${MKCONF_EXAMPLE}
                fi
                ;;
-       OSF1)
-               if [ ! -e /usr/X11R6 ]; then
-                       ln -sf /usr /usr/X11R6
-               fi
-               ;;
        esac
 }
 
diff -r dbf8f990651a -r 43086eb1eb2b mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Sun Sep 10 19:57:28 2006 +0000
+++ b/mk/bsd.prefs.mk   Sun Sep 10 20:14:43 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.233 2006/08/26 19:07:00 schwarz Exp $
+# $NetBSD: bsd.prefs.mk,v 1.234 2006/09/10 20:14:43 schwarz Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -366,6 +366,8 @@
 .  if ${OPSYS} == "SunOS"
 # On Solaris, we default to using OpenWindows for X11.
 X11BASE?=      ${DESTDIR}/usr/openwin
+.elif ${OPSYS} == "IRIX" || ${OPSYS} == "OSF1"
+X11BASE?=      ${DESTDIR}/usr
 .  else
 X11BASE?=      ${DESTDIR}/usr/X11R6
 .  endif