Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/mk/bsd.prefs.mk,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/mk/bsd.prefs.mk,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- pkgsrc/mk/bsd.prefs.mk	2001/06/12 18:58:42	1.40
+++ pkgsrc/mk/bsd.prefs.mk	2001/06/14 13:45:12	1.41
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.40 2001/06/12 18:58:42 jlam Exp $
+# $NetBSD: bsd.prefs.mk,v 1.41 2001/06/14 13:45:12 rafal Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -39,6 +39,7 @@ GNU_ARCH.i586?=		i386
 GNU_ARCH.i686?=		i386
 GNU_ARCH.m68k?=		m68k
 GNU_ARCH.mips?=		mipsel
+GNU_ARCH.mipseb?=	mipseb
 GNU_ARCH.ns32k?=	ns32k
 GNU_ARCH.sparc?=	sparc
 GNU_ARCH.vax?=		vax
@@ -55,9 +56,6 @@ MAKEFLAGS+=		LOWER_ARCH=${LOWER_ARCH}
 . endif
 LOWER_VENDOR?=		sun
 LOWER_OPSYS?=		solaris
-
-# We need to set this early to get "USE_MESA" and "USE_XPM" working.
-X11BASE?=               ${DESTDIR}/usr/openwin
 .elif ${OPSYS} == "Linux"
 LOWER_OPSYS?=		linux
 . if ${MACHINE_ARCH} == "unknown"
@@ -115,28 +113,12 @@ USE_INET6?=		NO
 # or a pkg Makefile modifies them.
 .include <sys.mk>
 
-# Load the OS-specific definitions for program variables.  Default to loading
-# the NetBSD ones if an OS-specific file doesn't exist.
-.if exists(${.CURDIR}/../../mk/defs.${OPSYS}.mk)
-.include "${.CURDIR}/../../mk/defs.${OPSYS}.mk"
-.elif exists(${.CURDIR}/../mk/defs.${OPSYS}.mk)
-.include "${.CURDIR}/../mk/defs.${OPSYS}.mk"
-.elif exists(${.CURDIR}/mk/defs.${OPSYS}.mk)
-.include "${.CURDIR}/mk/defs.${OPSYS}.mk"
-.elif exists(${.CURDIR}/../../mk/defs.NetBSD.mk)
-.include "${.CURDIR}/../../mk/defs.NetBSD.mk"
-.elif exists(${.CURDIR}/../mk/defs.NetBSD.mk)
-.include "${.CURDIR}/../mk/defs.NetBSD.mk"
-.else exists(${.CURDIR}/mk/defs.NetBSD.mk)
-.include "${.CURDIR}/mk/defs.NetBSD.mk"
-.endif
-
 # Check if we got Mesa distributed with XFree86 4.x or if we need to
 # depend on the Mesa package.
 .if (defined(CHECK_MESA) || defined(USE_MESA))
 X11BASE?=		/usr/X11R6
 .if exists(${X11BASE}/include/GL/glx.h)
-__BUILTIN_MESA!=	${EGREP} -c BuildGLXLibrary ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE}
+__BUILTIN_MESA!=	egrep -c BuildGLXLibrary ${X11BASE}/lib/X11/config/X11.tmpl || true
 .else
 __BUILTIN_MESA=		0
 .endif
@@ -153,7 +135,7 @@ HAVE_BUILTIN_MESA=	YES
 .if (defined(CHECK_FREETYPE2) || defined(USE_FREETYPE2))
 X11BASE?=		/usr/X11R6
 .if exists(${X11BASE}/include/freetype2/freetype/freetype.h)
-__BUILTIN_FREETYPE2!=	${EGREP} -c BuildFreetype2Library ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE}
+__BUILTIN_FREETYPE2!=	egrep -c BuildFreetype2Library ${X11BASE}/lib/X11/config/X11.tmpl || true
 .else
 __BUILTIN_FREETYPE2=	0
 .endif
@@ -222,13 +204,9 @@ SERIAL_DEVICES?=	/dev/null
 PKG_TOOLS_BIN?=		/usr/sbin
 .elif (${OPSYS} == "SunOS")
 LOCALBASE?=             ${DESTDIR}/usr/local
+X11BASE?=               ${DESTDIR}/usr/openwin
 ZOULARISBASE?=		${LOCALBASE}/bsd
 PKG_TOOLS_BIN?=		${ZOULARISBASE}/bin
-
-.if (${X11BASE} == "/usr/openwin")
-HAVE_OPENWINDOWS=	YES
-.endif
-
 .elif (${OPSYS} == "Linux")
 ZOULARISBASE?=		${DESTDIR}/usr/local/bsd
 PKG_TOOLS_BIN?=		${ZOULARISBASE}/bin