From 76c8dd65370098117c6fa511de981b8048bab7b3 Mon Sep 17 00:00:00 2001
From: Andreas Fuchs <asf@boinkor.net>
Date: Mon, 8 Jun 2009 12:34:28 +0200
Subject: [PATCH] Fix build of CLIM on OS X, using Motif from Macports at
 version 2.3.x.

This should make it possible to build and run CLIM on OS X with the macports Motif
in place. In order to build CLIM, this needs a symlink in place from
/usr/local/motif to /opt/local/var/macports/software/openmotif/<VERSION>/opt/local/,
the installation prefix of whatever the installed version of Motif is.
---
 ChangeLog.n     | 7 +++++++
 Makefile.macosx | 8 +++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ChangeLog.n b/ChangeLog.n
index 11546e11..e39a07ca 100644
--- a/ChangeLog.n
+++ b/ChangeLog.n
@@ -19,6 +19,13 @@ user visible.
 	* test/test-driver.lisp: Remove :process7 feature dependencies
 
 *******************************************************************************
+2009-06-08  Andreas Fuchs  <afuchs@franz.com>
+
+	* Makefile.macosx: Fix build of CLIM on Mac OS X: Now, it requires Motif
+	  2.3.x from Macports to be installed, and a symlink from
+	  /usr/local/motif -> /opt/local/var/macports/software/openmotif/<VERSION>/opt/local/
+	  in place.
+
 2009-05-06  Andreas Fuchs  <afuchs@franz.com>
 
 	* clim/accept.lisp: offer only those presentations on presentation history
diff --git a/Makefile.macosx b/Makefile.macosx
index 5380ee42..0ff46cd2 100644
--- a/Makefile.macosx
+++ b/Makefile.macosx
@@ -13,18 +13,16 @@ SHARED-OL-OBJS= climol.dylib
 Makefile=Makefile.macosx
 
 # removed /usr/local/lib:
-SET_LIBRARY_PATH = \
-  DYLD_LIBRARY_PATH=/opt/local/lib:/usr/X11R6/lib:/lib:/usr/lib:$(DYLD_LIBRARY_PATH); \
-  export DYLD_LIBRARY_PATH
+SET_LIBRARY_PATH = 
 
 #CL=../src/xm-dcl
 
-TKLIB=-L/opt/local/lib -L/usr/local/motif/lib -lXm -lpng12
+TKLIB=-L/usr/local/motif/lib -lXm
 XTLIB=-L/usr/X11R6/lib -lXt
 XLIB=-L/usr/X11R6/lib -lX11
 # removed /usr/local/lib/liblanginfo.a from XLIB
 
-XINCLUDES=-I/usr/X11R6/include -I/usr/local/motif/include -I/opt/local/include -I/opt/local/include/X11
+XINCLUDES=-I/usr/X11R6/include -I/usr/local/motif/include
 
 ifeq ($(SIXTYFOURBIT),yes)
 CFLAGS= -arch ppc64 -DAcl64Bit
-- 
GitLab