summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcube <cube>2008-09-24 17:47:29 +0000
committercube <cube>2008-09-24 17:47:29 +0000
commitdb4c3d67e575c0a2ca99ca3997ead0712b75efa8 (patch)
tree7e67b87fde183f9f1dd76ed4ba8cb87832f5aa41
parent606f6c9c9a1a6213d9359bfd599348043d92b232 (diff)
downloadpkgsrc-db4c3d67e575c0a2ca99ca3997ead0712b75efa8.tar.gz
Pull-up 1.287 for MacOS X support.
-rw-r--r--mk/bsd.prefs.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 5cd7b80584f..0e5a61f3729 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.286.6.1 2008/09/13 05:05:16 cube Exp $
+# $NetBSD: bsd.prefs.mk,v 1.286.6.2 2008/09/24 17:47:29 cube Exp $
#
# This file includes the mk.conf file, which contains the user settings.
#
@@ -491,6 +491,8 @@ X11_TYPE?= native
X11BASE?= /usr/openwin
. elif ${OPSYS} == "IRIX" || ${OPSYS} == "OSF1" || ${OPSYS} == "HPUX"
X11BASE?= /usr
+. elif !empty(MACHINE_PLATFORM:MDarwin-9.*-*)
+X11BASE?= /usr/X11
. elif exists(/usr/X11R7/lib/libX11.so)
X11BASE?= /usr/X11R7
. else