pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk X11 is located in "/usr/X11" under Mac OS X Leopard...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c75734a268ba
branches:  trunk
changeset: 547398:c75734a268ba
user:      tron <tron%pkgsrc.org@localhost>
date:      Tue Sep 16 11:40:10 2008 +0000

description:
X11 is located in "/usr/X11" under Mac OS X Leopard, "/usr/X11R6" is just
a symlink. Use the correct directory because the buildlink framework will
otherwise remove compiler options like "-I/usr/X11/include/pixman-1".

diffstat:

 mk/bsd.prefs.mk |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (18 lines):

diff -r aeb223c91427 -r c75734a268ba mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Tue Sep 16 11:24:58 2008 +0000
+++ b/mk/bsd.prefs.mk   Tue Sep 16 11:40:10 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.286 2008/06/22 16:25:32 tnn Exp $
+# $NetBSD: bsd.prefs.mk,v 1.287 2008/09/16 11:40:10 tron Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -491,6 +491,8 @@
 X11BASE?=      /usr/openwin
 .  elif ${OPSYS} == "IRIX" || ${OPSYS} == "OSF1" || ${OPSYS} == "HPUX"
 X11BASE?=      /usr
+.  elif !empty(MACHINE_PLATFORM:MDarwin-9.*-*)
+X11BASE?=      /usr/X11
 .  else
 X11BASE?=      /usr/X11R6
 .  endif



Home | Main Index | Thread Index | Old Index