Fix build with new freetype2.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7608 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 126 insertions, 0 deletions

diff --git a/chinese/xttmgr/Makefile b/chinese/xttmgr/Makefile
new file mode 100644
index 000000000..0eb4ae2c7
--- /dev/null
+++ b/chinese/xttmgr/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	ArialUni CJK TrueType fonts
+# Date created:		13 Oct 2001
+# Whom:			Shen Chuan-Hsing <statue@freebsd.sinica.edu.tw>
+#
+# $FreeBSD: ports/chinese/xttmgr/Makefile,v 1.5 2005/07/25 21:58:10 linimon Exp $
+#
+
+PORTNAME=	xttmgr
+PORTVERSION=	0.9.6
+CATEGORIES=	chinese
+MASTER_SITES=	ftp://freebsd.sinica.edu.tw/pub/statue/xttmgr/
+
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	A Big5/GB enhanced TrueType Font Manager
+
+BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2
+
+PLIST_FILES=	bin/xttmgr
+
+.include <bsd.port.mk>
diff --git a/chinese/xttmgr/distinfo b/chinese/xttmgr/distinfo
new file mode 100644
index 000000000..451f6d2d2
--- /dev/null
+++ b/chinese/xttmgr/distinfo
@@ -0,0 +1,3 @@
+MD5 (xttmgr-0.9.6.tar.gz) = fd08757ed9644c92539078135357c92b
+SHA256 (xttmgr-0.9.6.tar.gz) = 95c6a16223149a3c041dd2d53a5d647774050adad792008d4020d8aeffbf8658
+SIZE (xttmgr-0.9.6.tar.gz) = 28876
diff --git a/chinese/xttmgr/files/patch-Makefile b/chinese/xttmgr/files/patch-Makefile
new file mode 100644
index 000000000..2248c3e5c
--- /dev/null
+++ b/chinese/xttmgr/files/patch-Makefile
@@ -0,0 +1,33 @@
+--- Makefile.orig	Thu May  8 08:41:13 2003
++++ Makefile	Mon Jun 23 22:44:18 2003
+@@ -1,16 +1,16 @@
+-FREETYPE_BASE=/usr
+-FREETYPE_INCL=$(FREETYPE_BASE)/include/freetype2
++FREETYPE_BASE=/usr/local
++FREETYPE_INCL=-I$(FREETYPE_BASE)/include/freetype2 -I$(FREETYPE_BASE)/include
+ FREETYPE_LIB=$(FREETYPE_BASE)/lib
+-prefix=/usr
++prefix=/usr/local
+ 
+ CC=gcc
+-CFLAGS=$(RPM_OPT_FLAGS) -Wall -pedantic -I$(FREETYPE_INCL)
++CFLAGS=$(RPM_OPT_FLAGS) -Wall -pedantic $(FREETYPE_INCL)
+ LDFALGS=-L$(FREETYPE_LIB) -lfreetype -lz
+ 
+ all: xttmgr
+ 
+ xttmgr: xttmgr.o
+-	$(CC) -o $@ $< $(LDFALGS)
++	$(CC) -o $@ xttmgr.o $(LDFALGS)
+ 
+ xttmgr.o: xttmgr.c
+ 
+@@ -18,7 +18,7 @@
+ 	-rm -f *.o core xttmgr
+ 
+ install:
+-	-install -s -m 755 xttmgr $(DESTDIR)$(prefix)/sbin/xttmgr
++	-install -s -m 755 xttmgr $(DESTDIR)$(prefix)/bin/xttmgr
+ 
+ uninstall:
+ 	-rm -f /usr/sbin/xttmgr
diff --git a/chinese/xttmgr/files/patch-xttmgr.c b/chinese/xttmgr/files/patch-xttmgr.c
new file mode 100644
index 000000000..a44e6b2df
--- /dev/null
+++ b/chinese/xttmgr/files/patch-xttmgr.c
@@ -0,0 +1,57 @@
+--- xttmgr.c.orig	Sat Oct  7 11:34:31 2006
++++ xttmgr.c	Sat Oct  7 11:34:10 2006
+@@ -7,7 +7,6 @@
+ #include <ft2build.h>
+ #include FT_FREETYPE_H
+ #include FT_MODULE_H
+-#include FT_INTERNAL_OBJECTS_H
+ #include FT_TRUETYPE_IDS_H
+ #include FT_TRUETYPE_TABLES_H
+ #include FT_SFNT_NAMES_H
+@@ -269,7 +268,7 @@ int main( int argc, char *argv[] )
+ static int Check_Font_Face( char *filename )
+ {
+        FT_Face face;
+-       FT_ModuleRec*  module;
++       int is_sfnt = 0;
+ 
+        num_faces = 0; /* 先將 face 總數設為 0 */
+ 
+@@ -278,16 +277,12 @@ static int Check_Font_Face( char *filena
+           return 1;
+        }
+ 
+-       module = &face->driver->root;
+        num_faces = face->num_faces; /* 紀錄共有多少個 faces */
++       is_sfnt = FT_IS_SFNT( face );
+        FT_Done_Face( face );
+ 
+        /* 檢查該檔案是否是 TrueType 檔 */
+-       if ( strncasecmp( module->clazz->module_name, "TrueType", 8 ) ) {
+-          return 1;
+-       }
+-
+-       return 0;
++       return is_sfnt;
+ 
+ }
+ 
+@@ -1305,7 +1300,6 @@ static int Font_Info( char *filename )
+     FT_ULong   face_idx;
+     FT_Int     pos, num_encodings;
+     FT_CharMap charmap;
+-    FT_ModuleRec*  module;
+     TT_OS2     *os2;
+     FT_UShort  platform_id, encoding_id;
+     char       *platform_name=NULL;
+@@ -1366,8 +1360,8 @@ static int Font_Info( char *filename )
+ 	printf( "Number of glyphs : %ld\n", face->num_glyphs ); 
+ 	printf( "..........................................\n\n" );
+ 
+-	module = &face->driver->root;
+-	printf( "模組名稱 : %s\n", module->clazz->module_name );
++	/*module = &face->driver->root;
++	printf( "模組名稱 : %s\n", module->clazz->module_name );*/
+ 
+ 	printf( "\nFace flags :\n" );
+ 
diff --git a/chinese/xttmgr/pkg-descr b/chinese/xttmgr/pkg-descr
new file mode 100644
index 000000000..c7e95a1cd
--- /dev/null
+++ b/chinese/xttmgr/pkg-descr
@@ -0,0 +1,13 @@
+A True Type Font Manager that handles true type font
+installation, uninstallation, list, and default font
+setting.  It was originally in the CLE distribution.
+
+The manager doesn't deal with applications using TTF
+directly.  Instead, it calls modules to handle the
+details.  There are only several predefined behaviours
+of the modules, like add/remove/list.  
+
+Some modules are Big5/GB enhanced, for better font
+detection/generation.
+
+WWW: http://firefly.idv.tw/test/Forum.php?Board=1