various macos snowleopard changes to make it work for me

diff --git a/macosx/build/Makefile.snowleopard b/macosx/build/Makefile.snowleopard
index c1701be042a0c5d6c6ae5ac3e9ae3362c7682d61..0d3be64d31aaca375c961435909680588acef230 100644 (file)
--- a/macosx/build/Makefile.snowleopard
+++ b/macosx/build/Makefile.snowleopard
@@ -7,13 +7,15 @@ PMSURVEY=$(CURDIR)/pmsurvey
 
 # prefix
 
-PREFIX=$(HOME)/FIX/leopard
+PREFIX=$(HOME)/FIX/Darwin.i386
 
 # base
 
 GV_DIR=../..
 DOT=dot
 
+ARCH = -arch ppc -arch i386 -arch x86_64
+
 #
 # graphviz
 #
@@ -49,7 +51,7 @@ postinstall:
        echo >>$@
        echo "/usr/local/bin/dot -c" >>$@
        make -n -C ../../tclpkg install-data-hook >>$@
-       echo "arch -arch i386 -arch ppc /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,11 +61,17 @@ $(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 ppc -arch i386 -I$(PREFIX)/include" LDFLAGS="-arch ppc -arch i386 -L$(PREFIX)/lib -Wl,-dead_strip"
+       $(MAKE) -C $(GV_DIR)/tclpkg/tkspline CFLAGS="-O2 $(ARCH) -I$(PREFIX)/include" LDFLAGS="$(ARCH) -L$(PREFIX)/lib -Wl,-dead_strip"
        $(MAKE) -C $(GV_DIR)
        
 $(GV_DIR)/Makefile: $(GV_DIR)/configure
        @echo
        @echo CONFIGURING GRAPHVIZ...
        @echo
-       cd $(GV_DIR) && ./configure --disable-dependency-tracking --with-ipsepcola --with-quartz --with-smyrna --disable-perl 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"
+       cd $(GV_DIR) && ./configure --disable-dependency-tracking --with-ipsepcola --with-quartz --with-smyrna --disable-perl CFLAGS="-O2 $(ARCH) -I$(PREFIX)/include" CXXFLAGS="-O2 $(ARCH) -I$(PREFIX)/include" OBJCFLAGS="-O2 $(ARCH) -I$(PREFIX)/include" LDFLAGS="$(ARCH) -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"
+
+clean:
+       $(MAKE) -C $(GV_DIR)/Makefile clean
+
+disrclean:
+       $(MAKE) -C $(GV_DIR)/Makefile distclean

diff --git a/macosx/prebuild/.cvsignore b/macosx/prebuild/.cvsignore
index 5cfdbfc1678331c397c9df67e3938157f091ece8..540309462e6c513f078eb68f05daca047ce76a78 100644 (file)
--- a/macosx/prebuild/.cvsignore
+++ b/macosx/prebuild/.cvsignore
@@ -1,3 +1,5 @@
+autoconf-*
+automake-*
 atk-*
 cairo-*
 fontconfig-*
@@ -10,6 +12,7 @@ gts-*
 libXft-*
 libiconv-*
 libpng-*
+libtool-*
 jpeg*
 pango-*
 pixman-*

diff --git a/macosx/prebuild/Makefile-packages.incl b/macosx/prebuild/Makefile-packages.incl
index 5555c3657b391cde3565659daccb9a92f40270d8..c534693d7517dae9d4d686c0846ab95a945fc0a5 100644 (file)
--- a/macosx/prebuild/Makefile-packages.incl
+++ b/macosx/prebuild/Makefile-packages.incl
@@ -1,3 +1,6 @@
+AUTOCONF_URL=http://ftp.gnu.org/gnu/autoconf/autoconf-2.68.tar.gz
+AUTOMAKE_URL=http://ftp.gnu.org/gnu/automake/automake-1.11.tar.gz
+LIBTOOL_URL=http://ftp.gnu.org/gnu/libtool/libtool-2.2.8.tar.gz
 PKGCONFIG_URL=http://pkgconfig.freedesktop.org/releases/pkg-config-0.25.tar.gz
 PNG_URL=http://downloads.sourceforge.net/libpng/libpng-1.5.0.tar.gz
 FREETYPE_URL=http://download.savannah.gnu.org/releases-noredirect/freetype/freetype-2.4.4.tar.gz
@@ -16,4 +19,3 @@ TIFF_URL=ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.0beta6.tar.gz
 JPEG_URL=http://www.ijg.org/files/jpegsrc.v8b.tar.gz
 LIBICONV_URL=http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.13.tar.gz
 LIBXML2_URL=ftp://xmlsoft.org/libxml2/libxml2-2.7.8.tar.gz
-

diff --git a/macosx/prebuild/Makefile.snowleopard b/macosx/prebuild/Makefile.snowleopard
index 1bdc8b3a43709b56f404267509edb229de67b5e2..22dbf58e17922285536fa58f968d4d51073d33fa 100644 (file)
--- a/macosx/prebuild/Makefile.snowleopard
+++ b/macosx/prebuild/Makefile.snowleopard
@@ -4,7 +4,7 @@ CURL=curl
 MAKE=make
 TAR=tar
 
-PREFIX=$(HOME)/FIX/leopard
+PREFIX=$(HOME)/FIX/Darwin.i386
 
 ARCHS=-arch ppc -arch i386 -arch x86_64
 
@@ -12,9 +12,13 @@ ARCHS=-arch ppc -arch i386 -arch x86_64
 
 include Makefile-packages.incl
 
-# libraries
-
+# bins
+AUTOCONF=autoconf
+AUTOMAKE=automake
+LIBTOOL=libtoolize
 PKGCONFIG=pkg-config
+
+# libs
 FREETYPE=libfreetype.la
 FONTCONFIG=libfontconfig.la
 XFT=libXft.la
@@ -33,6 +37,9 @@ JPEG=libjpeg.a
 
 # directories
 dirname=$(basename $(basename $(notdir $(1))))
+AUTOCONF_DIR=$(call dirname, $(AUTOCONF_URL))
+AUTOMAKE_DIR=$(call dirname, $(AUTOMAKE_URL))
+LIBTOOL_DIR=$(call dirname, $(LIBTOOL_URL))
 PKGCONFIG_DIR=$(call dirname, $(PKGCONFIG_URL))
 FREETYPE_DIR=$(call dirname, $(FREETYPE_URL))
 FONTCONFIG_DIR=$(call dirname, $(FONTCONFIG_URL))
@@ -64,7 +71,9 @@ JPEG_DIR=$(call dirname, $(JPEG_URL))
 BASE_CONFIG=--prefix=$(PREFIX) --disable-dependency-tracking --enable-static=yes --enable-shared=no PKG_CONFIG="$(PREFIX)/bin/pkg-config" PKG_CONFIG_PATH="$(PREFIX)/lib/pkgconfig:/usr/X11/lib/pkgconfig"
 FLAG_CONFIG=CFLAGS="-O2 $(ARCHS) -I$(PREFIX)/include" LDFLAGS="$(ARCHS) -L$(PREFIX)/lib -framework CoreFoundation -framework CoreServices" 
 
-install: $(PREFIX)/lib/$(PANGO) $(PREFIX)/lib/$(GD) $(PREFIX)/lib/$(GTS)
+install: install-bins install-libs
+install-bins: $(PREFIX)/bin/$(AUTOCONF) $(PREFIX)/bin/$(AUTOMAKE) $(PREFIX)/bin/$(LIBTOOL) $(PREFIX)/bin/$(PKGCONFIG)
+install-libs: $(PREFIX)/lib/$(PANGO) $(PREFIX)/lib/$(GD) $(PREFIX)/lib/$(GTS)
 
 # gtk dropped, unable to build....
 # $(PREFIX)/lib/$(GTK)
@@ -710,7 +719,7 @@ $(FONTCONFIG_DIR)/Makefile: $(PREFIX)/lib/$(FREETYPE) | $(PREFIX)/bin/$(PKGCONFI
        @echo
        @echo CONFIGURING FONTCONFIG...
        @echo
-       cd $(FONTCONFIG_DIR) && ./configure $(BASE_CONFIG) $(FLAG_CONFIG) --with-confdir="/usr/X11/lib/X11/fontconfig" --with-cache-dir="/usr/X11/var/cache/fontconfig" 
+       cd $(FONTCONFIG_DIR) && ./configure $(BASE_CONFIG) $(FLAG_CONFIG) --with-confdir="$(PREFIX)/etc/fontconfig" --with-cache-dir="$(PREFIX)/var/cache/fontconfig" 
        
 $(FONTCONFIG_DIR)/configure: | $(FONTCONFIG_DIR).tar.gz
        @echo
@@ -724,6 +733,114 @@ $(FONTCONFIG_DIR).tar.gz:
        @echo
        $(CURL) --remote-name --location $(FONTCONFIG_URL) || rm -f $(FONTCONFIG_DIR).tar.gz
 
+#
+# autoconf
+#
+# only needed during build, don't need Universal Binary
+
+$(PREFIX)/bin/$(AUTOCONF): $(AUTOCONF_DIR)/$(AUTOCONF)
+       @echo
+       @echo INSTALLING AUTOCONF...
+       @echo
+       $(MAKE) -C $(AUTOCONF_DIR) install
+       
+$(AUTOCONF_DIR)/$(AUTOCONF): $(AUTOCONF_DIR)/Makefile
+       @echo
+       @echo MAKING AUTOCONF...
+       @echo
+       if [[ -e $@ ]]; then $(MAKE) -C $(AUTOCONF_DIR) clean; fi && \
+       $(MAKE) -C $(AUTOCONF_DIR)
+       
+$(AUTOCONF_DIR)/Makefile: | $(AUTOCONF_DIR)/configure
+       @echo
+       @echo CONFIGURING AUTOCONF...
+       @echo
+       cd $(AUTOCONF_DIR) && ./configure --prefix=$(PREFIX) --disable-dependency-tracking
+       
+$(AUTOCONF_DIR)/configure: | $(AUTOCONF_DIR).tar.gz
+       @echo
+       @echo UNTARRING AUTOCONF...
+       @echo
+       $(TAR) xzf $|
+       
+$(AUTOCONF_DIR).tar.gz:
+       @echo
+       @echo TRANSFERRING AUTOCONF...
+       @echo
+       $(CURL) --remote-name --location $(AUTOCONF_URL) || rm -f $(AUTOCONF_DIR).tar.gz
+
+#
+# automake
+#
+# only needed during build, don't need Universal Binary
+
+$(PREFIX)/bin/$(AUTOMAKE): $(AUTOMAKE_DIR)/$(AUTOMAKE)
+       @echo
+       @echo INSTALLING AUTOMAKE...
+       @echo
+       $(MAKE) -C $(AUTOMAKE_DIR) install
+       
+$(AUTOMAKE_DIR)/$(AUTOMAKE): $(AUTOMAKE_DIR)/Makefile
+       @echo
+       @echo MAKING AUTOMAKE...
+       @echo
+       if [[ -e $@ ]]; then $(MAKE) -C $(AUTOMAKE_DIR) clean; fi && \
+       $(MAKE) -C $(AUTOMAKE_DIR)
+       
+$(AUTOMAKE_DIR)/Makefile: | $(AUTOMAKE_DIR)/configure
+       @echo
+       @echo CONFIGURING AUTOMAKE...
+       @echo
+       cd $(AUTOMAKE_DIR) && ./configure --prefix=$(PREFIX) --disable-dependency-tracking
+       
+$(AUTOMAKE_DIR)/configure: | $(AUTOMAKE_DIR).tar.gz
+       @echo
+       @echo UNTARRING AUTOMAKE...
+       @echo
+       $(TAR) xzf $|
+       
+$(AUTOMAKE_DIR).tar.gz:
+       @echo
+       @echo TRANSFERRING AUTOMAKE...
+       @echo
+       $(CURL) --remote-name --location $(AUTOMAKE_URL) || rm -f $(AUTOMAKE_DIR).tar.gz
+
+#
+# libtool
+#
+# only needed during build, don't need Universal Binary
+
+$(PREFIX)/bin/$(LIBTOOL): $(LIBTOOL_DIR)/$(LIBTOOL)
+       @echo
+       @echo INSTALLING LIBTOOL...
+       @echo
+       $(MAKE) -C $(LIBTOOL_DIR) install
+       
+$(LIBTOOL_DIR)/$(LIBTOOL): $(LIBTOOL_DIR)/Makefile
+       @echo
+       @echo MAKING LIBTOOL...
+       @echo
+       if [[ -e $@ ]]; then $(MAKE) -C $(LIBTOOL_DIR) clean; fi && \
+       $(MAKE) -C $(LIBTOOL_DIR)
+       
+$(LIBTOOL_DIR)/Makefile: | $(LIBTOOL_DIR)/configure
+       @echo
+       @echo CONFIGURING LIBTOOL...
+       @echo
+       cd $(LIBTOOL_DIR) && ./configure --prefix=$(PREFIX) --disable-dependency-tracking
+       
+$(LIBTOOL_DIR)/configure: | $(LIBTOOL_DIR).tar.gz
+       @echo
+       @echo UNTARRING LIBTOOL...
+       @echo
+       $(TAR) xzf $|
+       
+$(LIBTOOL_DIR).tar.gz:
+       @echo
+       @echo TRANSFERRING LIBTOOL...
+       @echo
+       $(CURL) --remote-name --location $(LIBTOOL_URL) || rm -f $(LIBTOOL_DIR).tar.gz
+
 #
 # pkgconfig
 #