From 4a19ebfa0a05c82d5c37ce40f51ad427198f2054 Mon Sep 17 00:00:00 2001
From: north <devnull@localhost>
Date: Tue, 12 Apr 2011 00:50:01 +0000
Subject: [PATCH] Change PREFIX to /opt/local. Restore -arch pcc. Disable
 smyrna until glut for ppc is fixed.

---
 macosx/build/Makefile.leopard | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/macosx/build/Makefile.leopard b/macosx/build/Makefile.leopard
index 6729b4378..f64b7a700 100644
--- a/macosx/build/Makefile.leopard
+++ b/macosx/build/Makefile.leopard
@@ -7,7 +7,7 @@ PMSURVEY=$(CURDIR)/pmsurvey
 
 # prefix
 
-PREFIX=$(HOME)/FIX/leopard
+PREFIX=/opt/local
 
 # base
 
@@ -49,7 +49,7 @@ postinstall:
 	echo >>$@
 	echo "/usr/local/bin/dot -c" >>$@
 	make -n -C ../../tclpkg install-data-hook >>$@
-	echo "arch -arch i386 /usr/local/bin/gv-fc-cache" >>$@
+	echo "arch -arch ppc -arch i386 /usr/local/bin/gv-fc-cache" >>$@
 	echo 'if test `sysctl -n hw.cpu64bit_capable` = 1; then arch -arch x86_64 /usr/local/bin/gv-fc-cache; fi' >>$@
 
 $(GV_DIR)/cmd/dot/.libs/$(DOT): $(GV_DIR)/Makefile
@@ -59,7 +59,7 @@ $(GV_DIR)/cmd/dot/.libs/$(DOT): $(GV_DIR)/Makefile
 	if [[ -e $@ ]]; then $(MAKE) -C $(GV_DIR) clean; fi
 	$(MAKE) -C $(GV_DIR)/tclpkg/tkstubs
 	$(MAKE) -C $(GV_DIR)/tclpkg/tclstubs
-	$(MAKE) -C $(GV_DIR)/tclpkg/tkspline CFLAGS="-O2 -arch i386 -I$(PREFIX)/include" LDFLAGS="-arch i386 -L$(PREFIX)/lib -Wl,-dead_strip"
+	$(MAKE) -C $(GV_DIR)/tclpkg/tkspline CFLAGS="-O2 -arch ppc -arch i386 -I$(PREFIX)/include" LDFLAGS="-arch ppc -arch i386 -L$(PREFIX)/lib -Wl,-dead_strip"
 	$(MAKE) -C $(GV_DIR)
 	
 $(GV_DIR)/Makefile: $(GV_DIR)/configure
@@ -67,4 +67,4 @@ $(GV_DIR)/Makefile: $(GV_DIR)/configure
 	@echo CONFIGURING GRAPHVIZ...
 	@echo
 # add ppc and ppc64 below if you want them
-	cd $(GV_DIR) && ./configure --disable-dependency-tracking --with-ipsepcola --with-quartz --with-smyrna CFLAGS="-O2 -arch i386 -arch x86_64 -I$(PREFIX)/include" CXXFLAGS="-O2 -arch i386 -arch x86_64 -I$(PREFIX)/include" OBJCFLAGS="-O2 -arch i386 -arch x86_64 -I$(PREFIX)/include" LDFLAGS="-arch i386 -arch x86_64 -L$(PREFIX)/lib -Wl,-dead_strip" GDLIB_CONFIG="$(PREFIX)/bin/gdlib-config" PKG_CONFIG="$(PREFIX)/bin/pkg-config" PKG_CONFIG_PATH="$(PREFIX)/lib/pkgconfig:/usr/X11/lib/pkgconfig"
+	cd $(GV_DIR) && ./configure --disable-dependency-tracking --with-ipsepcola --with-quartz CFLAGS="-O2 -arch ppc -arch i386 -arch x86_64 -I$(PREFIX)/include" CXXFLAGS="-O2 -arch ppc -arch i386 -arch x86_64 -I$(PREFIX)/include" OBJCFLAGS="-O2 -arch ppc -arch i386 -arch x86_64 -I$(PREFIX)/include" LDFLAGS="-arch ppc -arch i386 -arch x86_64 -L$(PREFIX)/lib -Wl,-dead_strip" GDLIB_CONFIG="$(PREFIX)/bin/gdlib-config" PKG_CONFIG="$(PREFIX)/bin/pkg-config" PKG_CONFIG_PATH="$(PREFIX)/lib/pkgconfig:/usr/X11/lib/pkgconfig"
-- 
2.40.0