initial import of ttmkfdir2-20021109

(Yu Shao's ttmkfdir)
adresses PR 24934 by Martin Husemann
patch-a[ac] are adapted from FreeBSD port's

7 files changed, 92 insertions, 0 deletions

diff --git a/fonts/ttmkfdir2/DESCR b/fonts/ttmkfdir2/DESCR
new file mode 100644
index 00000000000..f87da12ca9f
--- /dev/null
+++ b/fonts/ttmkfdir2/DESCR
@@ -0,0 +1,2 @@
+This program reads TrueType fonts and creates a suitable fonts.scale file for
+use with the xfsft X font server or XFree86-4.
diff --git a/fonts/ttmkfdir2/Makefile b/fonts/ttmkfdir2/Makefile
new file mode 100644
index 00000000000..4bc583e4acf
--- /dev/null
+++ b/fonts/ttmkfdir2/Makefile
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile,v 1.1.1.1 2004/03/29 22:04:08 recht Exp $
+#
+
+DISTNAME=	ttmkfdir2.20021109
+PKGNAME=	${DISTNAME:S/./-/}
+CATEGORIES=	fonts x11
+MASTER_SITES=	http://people.redhat.com/yshao/
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	tech-pkg@NetBSD.org
+HOMEPAGE=	http://people.redhat.com/yshao/
+COMMENT=	Tool that creates a fonts.scale file
+
+WRKSRC=		${WRKDIR}/${PKGBASE}
+USE_LIBTOOL=	yes
+USE_BUILDLINK3=	yes
+USE_GNU_TOOLS+=	make
+USE_LANGUAGES=	c c++
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/ttmkfdir ${PREFIX}/bin
+
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/ttmkfdir2/PLIST b/fonts/ttmkfdir2/PLIST
new file mode 100644
index 00000000000..cc848bca145
--- /dev/null
+++ b/fonts/ttmkfdir2/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2004/03/29 22:04:09 recht Exp $
+bin/ttmkfdir
diff --git a/fonts/ttmkfdir2/distinfo b/fonts/ttmkfdir2/distinfo
new file mode 100644
index 00000000000..495996c69e0
--- /dev/null
+++ b/fonts/ttmkfdir2/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1.1.1 2004/03/29 22:04:09 recht Exp $
+
+SHA1 (ttmkfdir2.20021109.tar.bz2) = bee1944ce3e5b6c4503a14e6429737cc558a24c0
+Size (ttmkfdir2.20021109.tar.bz2) = 701900 bytes
+SHA1 (patch-aa) = 513c6922cfa60a6c2dbf332a5d65e0277bd89929
+SHA1 (patch-ab) = d22b1eb7de9c2ba622583bb2e2fe6c4ccd4b26d2
+SHA1 (patch-ac) = 23eb6e500522a1ce826a9b0899d7afff6017d096
diff --git a/fonts/ttmkfdir2/patches/patch-aa b/fonts/ttmkfdir2/patches/patch-aa
new file mode 100644
index 00000000000..5e76f7e586c
--- /dev/null
+++ b/fonts/ttmkfdir2/patches/patch-aa
@@ -0,0 +1,31 @@
+$NetBSD: patch-aa,v 1.1.1.1 2004/03/29 22:04:09 recht Exp $
+
+--- Makefile.orig	2002-11-07 06:28:44.000000000 +0100
++++ Makefile
+@@ -1,12 +1,9 @@
+-FREETYPE_BASE=/usr/include/freetype2
+-FREETYPE_INCL=-I$(FREETYPE_BASE)/.
+-FREETYPE_LIB=/usr/lib/libfreetype.so
+-
+-DEBUG=-ggdb
+-CXX=g++
+-CXXFLAGS=-Wall -pedantic $(FREETYPE_INCL) $(DEBUG)
++FREETYPE_INCL=`freetype-config --cflags`
++FREETYPE_LIB=`freetype-config --libs`
+ 
+-LDFLAGS=$(FREETYPE_LIB) $(DEBUG)
++CXXFLAGS+=$(FREETYPE_INCL)
++
++LDFLAGS+=$(FREETYPE_LIB)
+ 
+ .PHONY: clean
+ 
+@@ -19,7 +16,7 @@ ttmkfdir: ttmkfdir.o directory.o command
+ 	libtool --mode=link $(CXX) -o $@ $^ $(LDFLAGS)
+ 
+ parser.cpp: encoding.l
+-	    flex -i -8 -o$@ $<
++	    lex -i -8 -o$@ $<
+ 
+ clean:
+ 	-rm -f *.o *~ ttmkfdir core parser.cpp
diff --git a/fonts/ttmkfdir2/patches/patch-ab b/fonts/ttmkfdir2/patches/patch-ab
new file mode 100644
index 00000000000..8e69c926b95
--- /dev/null
+++ b/fonts/ttmkfdir2/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1.1.1 2004/03/29 22:04:09 recht Exp $
+
+--- ttf.cpp.orig	2004-03-29 12:46:48.000000000 +0200
++++ ttf.cpp
+@@ -226,7 +226,7 @@ Face::FontFamilyName (void) const
+ 	for (i = 0; i < n; i++) {
+ 	    if ((fterror = FT_Get_Sfnt_Name (face, i, &NamePtr)) != FT_Err_Ok) {
+                     std::cout << "Warning: Can't SFNT name : " << FileName << "(" << fterror << ")" << std::endl;
+-	            return;
++	            return "unknown";
+             };
+             platform = NamePtr.platform_id;
+             encoding = NamePtr.encoding_id;
diff --git a/fonts/ttmkfdir2/patches/patch-ac b/fonts/ttmkfdir2/patches/patch-ac
new file mode 100644
index 00000000000..f0bb08df748
--- /dev/null
+++ b/fonts/ttmkfdir2/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1.1.1 2004/03/29 22:04:09 recht Exp $
+
+--- ttf.h.orig	2002-11-07 06:28:44.000000000 +0100
++++ ttf.h
+@@ -13,6 +13,8 @@
+ #include "util.h"
+ #include "encoding.h"
+ 
++using namespace std;
++
+ namespace ttf {
+ 
+     class Face {