Index: makefile.mk
===================================================================
RCS file: /cvs/external/freetype/makefile.mk,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -u -r1.21 -r1.21.2.1
--- makefile.mk	13 Oct 2005 16:49:16 -0000	1.21
+++ makefile.mk	31 Jan 2006 00:43:50 -0000	1.21.2.1
@@ -46,22 +46,31 @@
 # the X11 port because there are some header conflicts
 # and linktime conflicts as well.  It is simply less of
 # a headache to use the one provided.
-.IF "$(SYSTEM_FREETYPE)" == "YES" || "$(OS)" == "MACOSX"
+.IF "$(SYSTEM_FREETYPE)" == "YES"
 dummy:
 	@echo "An already available installation of freetype should exist on your system."
 	@echo "Therefore the version provided here does not need to be built in addition."
 .ELSE
 # --- Files --------------------------------------------------------
 
+.IF "$(OS)"=="MACOSX"
+TARFILE_NAME=freetype-2.1.10
+PATCH_FILE_NAME=
+.ELSE
 TARFILE_NAME=freetype-2.1.4
-
 PATCH_FILE_NAME=freetype-2.1.4.patch
+.ENDIF
 
 CONFIGURE_DIR=
 .IF "$(GUI)"=="UNX"
 #relative to CONFIGURE_DIR
+.IF "$(OS)"=="MACOSX"
+CONFIGURE_ACTION=./configure
+CONFIGURE_FLAGS=--with-pic --without-zlib
+.ELSE
 CONFIGURE_ACTION=$(GNUMAKE)
 CONFIGURE_FLAGS=setup CFG="--with-pic --without-zlib"
+.ENDIF
 
 BUILD_DIR=$(CONFIGURE_DIR)
 BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
@@ -81,6 +90,9 @@
 	include$/freetype$/f*.h \
 	include$/freetype$/tt*.h \
 	include$/ft2build.h
+.IF "$(OS)"=="MACOSX"
+OUT2INC+=include$/freetype$/t1tables.h
+.ENDIF
 
 OUTDIR2INC= \
 	include$/freetype$/internal \
Index: download/freetype-2.1.10.tar.gz
===================================================================
RCS file: download/freetype-2.1.10.tar.gz
diff -N download/freetype-2.1.10.tar.gz
Binary files /dev/null and /tmp/cvsvLa4.f differ