Sat Sep 13 05:05:16 2008 UTC ()
Detect X11BASE as /usr/X11R7.  From John Nemeth.


(cube)
diff -r1.286 -r1.286.6.1 pkgsrc/mk/bsd.prefs.mk
cvs diff -r1.286 -r1.286.6.1 pkgsrc/mk/bsd.prefs.mk (expand / switch to unified diff)

--- pkgsrc/mk/bsd.prefs.mk 2008/06/22 16:25:32 1.286
+++ pkgsrc/mk/bsd.prefs.mk 2008/09/13 05:05:16 1.286.6.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.prefs.mk,v 1.286 2008/06/22 16:25:32 tnn Exp $ 1# $NetBSD: bsd.prefs.mk,v 1.286.6.1 2008/09/13 05:05:16 cube Exp $
2# 2#
3# This file includes the mk.conf file, which contains the user settings. 3# This file includes the mk.conf file, which contains the user settings.
4# 4#
5# Packages should include this file before any of the .if directives, as 5# Packages should include this file before any of the .if directives, as
6# well as before modifying variables like CFLAGS, LDFLAGS, and so on. 6# well as before modifying variables like CFLAGS, LDFLAGS, and so on.
7# Otherwise the behavior may be unexpected. 7# Otherwise the behavior may be unexpected.
8# 8#
9# When mk.conf is included by this file, the following variables are 9# When mk.conf is included by this file, the following variables are
10# defined: 10# defined:
11# 11#
12# ACCEPTABLE_LICENSES 12# ACCEPTABLE_LICENSES
13# This variable is set to the list of Open Source licenses. See 13# This variable is set to the list of Open Source licenses. See
14# mk/license.mk for details. 14# mk/license.mk for details.
@@ -481,26 +481,28 @@ PKG_INSTALLATION_TYPE?= none @@ -481,26 +481,28 @@ PKG_INSTALLATION_TYPE?= none
481IPV6_READY= YES 481IPV6_READY= YES
482.else 482.else
483IPV6_READY= NO 483IPV6_READY= NO
484.endif 484.endif
485 485
486LOCALBASE?= /usr/pkg 486LOCALBASE?= /usr/pkg
487X11_TYPE?= native 487X11_TYPE?= native
488.if !empty(X11_TYPE:Mnative) 488.if !empty(X11_TYPE:Mnative)
489. if ${OPSYS} == "SunOS" 489. if ${OPSYS} == "SunOS"
490# On Solaris, we default to using OpenWindows for X11. 490# On Solaris, we default to using OpenWindows for X11.
491X11BASE?= /usr/openwin 491X11BASE?= /usr/openwin
492. elif ${OPSYS} == "IRIX" || ${OPSYS} == "OSF1" || ${OPSYS} == "HPUX" 492. elif ${OPSYS} == "IRIX" || ${OPSYS} == "OSF1" || ${OPSYS} == "HPUX"
493X11BASE?= /usr 493X11BASE?= /usr
 494. elif exists(/usr/X11R7/lib/libX11.so)
 495X11BASE?= /usr/X11R7
494. else 496. else
495X11BASE?= /usr/X11R6 497X11BASE?= /usr/X11R6
496. endif 498. endif
497.endif 499.endif
498CROSSBASE?= ${LOCALBASE}/cross 500CROSSBASE?= ${LOCALBASE}/cross
499 501
500# If xpkgwedge.def is found, then clearly we're using xpkgwedge. 502# If xpkgwedge.def is found, then clearly we're using xpkgwedge.
501.if exists(${LOCALBASE}/lib/X11/config/xpkgwedge.def) || \ 503.if exists(${LOCALBASE}/lib/X11/config/xpkgwedge.def) || \
502 exists(${X11BASE}/lib/X11/config/xpkgwedge.def) 504 exists(${X11BASE}/lib/X11/config/xpkgwedge.def)
503USE_XPKGWEDGE= yes 505USE_XPKGWEDGE= yes
504.elif ${PKG_INSTALLATION_TYPE} == "pkgviews" 506.elif ${PKG_INSTALLATION_TYPE} == "pkgviews"
505USE_XPKGWEDGE= yes 507USE_XPKGWEDGE= yes
506.elif ${X11_TYPE} == "modular" 508.elif ${X11_TYPE} == "modular"