Complete the move of ttmkfdir from x11 to fonts.

7 files changed, 1 insertions, 75 deletions

diff --git a/x11/Makefile b/x11/Makefile
index 4d4ee7ecc0e..26fa9fab269 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.252 2002/06/17 02:26:03 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.253 2002/07/02 13:08:16 wiz Exp $
 #
 
 COMMENT=	Packages to support the X window system
@@ -99,7 +99,6 @@ SUBDIR+=	tk
 SUBDIR+=	tk-Tix
 SUBDIR+=	tkinfo
 SUBDIR+=	tkman
-SUBDIR+=	ttmkfdir
 SUBDIR+=	type1inst
 SUBDIR+=	unclutter
 SUBDIR+=	wmavgload
diff --git a/x11/ttmkfdir/DESCR b/x11/ttmkfdir/DESCR
deleted file mode 100644
index f87da12ca9f..00000000000
--- a/x11/ttmkfdir/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-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/x11/ttmkfdir/Makefile b/x11/ttmkfdir/Makefile
deleted file mode 100644
index e840c07fa7d..00000000000
--- a/x11/ttmkfdir/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/06/10 13:25:30 drochner Exp $
-#
-
-DISTNAME=	ttmkfdir
-PKGNAME=	ttmkfdir-0
-CATEGORIES=	x11
-MASTER_SITES=	http://www.joerg-pommnitz.de/TrueType/
-
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.joerg-pommnitz.de/TrueType/xfsft.html
-COMMENT=	tool that creates a fonts.scale file
-
-WRKSRC=		${WRKDIR}
-USE_BUILDLINK_ONLY=	yes
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ttmkfdir ${PREFIX}/bin
-
-.include "../../graphics/freetype-lib/buildlink.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/x11/ttmkfdir/PLIST b/x11/ttmkfdir/PLIST
deleted file mode 100644
index a552c9f033f..00000000000
--- a/x11/ttmkfdir/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/10 13:25:30 drochner Exp $
-bin/ttmkfdir
diff --git a/x11/ttmkfdir/distinfo b/x11/ttmkfdir/distinfo
deleted file mode 100644
index f89482b386c..00000000000
--- a/x11/ttmkfdir/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-
-SHA1 (ttmkfdir.tar.gz) = 1ba2b5103e159758e2e84e709cb396e5d532ed95
-Size (ttmkfdir.tar.gz) = 61487 bytes
-SHA1 (patch-aa) = 77a658c66ed97c6638407ae646f003d9a54ed391
-SHA1 (patch-ab) = 18c7924642ba2b7a87a682a9e3343dc7a659e078
diff --git a/x11/ttmkfdir/patches/patch-aa b/x11/ttmkfdir/patches/patch-aa
deleted file mode 100644
index d6e1c89eb00..00000000000
--- a/x11/ttmkfdir/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/06/10 13:25:30 drochner Exp $
-
---- Makefile.orig	Sat Jun  8 21:36:43 2002
-+++ Makefile	Sat Jun  8 21:42:01 2002
-@@ -1,10 +1,10 @@
--FREETYPE_BASE=../freetype-1.1
--FREETYPE_INCL=$(FREETYPE_BASE)/lib
--FREETYPE_LIB=-L$(FREETYPE_BASE)/lib/.libs -lttf
--
--CC=gcc
--CFLAGS=-Wall -pedantic -I$(FREETYPE_INCL)
--LDFALGS=$(FREETYPE_LIB) -s
-+#FREETYPE_BASE=../freetype-1.1
-+#FREETYPE_INCL=$(FREETYPE_BASE)/lib
-+#FREETYPE_LIB=-L$(FREETYPE_BASE)/lib/.libs -lttf
-+
-+#CC=gcc
-+#CFLAGS=-Wall -pedantic -I$(FREETYPE_INCL)
-+#LDFALGS=$(FREETYPE_LIB) -s
- 
- all: ttmkfdir
- 
-@@ -18,7 +18,7 @@
- 	ln $< $@
- 
- ttmkfdir: ttmkfdir.o
--	$(CC) -o $@ $< $(LDFALGS)
-+	$(CC) -o $@ ttmkfdir.o $(LDFLAGS) -lttf
- 
- ttmkfdir.o: ttmkfdir.c panose.h ttos2val.h
- 
diff --git a/x11/ttmkfdir/patches/patch-ab b/x11/ttmkfdir/patches/patch-ab
deleted file mode 100644
index f2ddf3d223b..00000000000
--- a/x11/ttmkfdir/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/06/10 13:25:30 drochner Exp $
-
---- ttmkfdir.c.orig	Sat Jun  8 21:37:58 2002
-+++ ttmkfdir.c	Sat Jun  8 21:38:18 2002
-@@ -61,7 +61,7 @@
- #include <ctype.h>
- #include <errno.h>
- 
--#include <freetype.h>
-+#include <freetype/freetype.h>
- 
- #include "panose.h"
- #include "ttos2val.h"