Complete move of textproc/t1lib, textproc/t1utils, and x11/typeinst to fonts.

24 files changed, 12 insertions, 395 deletions

diff --git a/fonts/Makefile b/fonts/Makefile
index 00d50f11cca..6e50afa9ed6 100644
--- a/fonts/Makefile
+++ b/fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2002/07/18 16:20:20 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2002/07/19 12:43:47 wiz Exp $
 #
 
 COMMENT=	Fonts
@@ -49,9 +49,12 @@ SUBDIR+=	mozilla-fonts
 SUBDIR+=	ms-ttf
 SUBDIR+=	p5-Font-AFM
 SUBDIR+=	p5-Font-TTF
+SUBDIR+=	t1lib
+SUBDIR+=	t1utils
 SUBDIR+=	ttf2pt1
 SUBDIR+=	ttftot42
 SUBDIR+=	ttmkfdir
+SUBDIR+=	type1inst
 SUBDIR+=	watanabe_vfont
 
 .include "../mk/bsd.pkg.subdir.mk"
diff --git a/fonts/ttf2pt1/Makefile b/fonts/ttf2pt1/Makefile
index 3dfce61494f..8abffd5f85c 100644
--- a/fonts/ttf2pt1/Makefile
+++ b/fonts/ttf2pt1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/07/16 15:26:01 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2002/07/19 12:43:51 wiz Exp $
 #
 
 DISTNAME=	ttf2pt1-3.4.0
@@ -11,7 +11,7 @@ MAINTAINER=	reinoud@netbsd.org
 HOMEPAGE=	http://ttf2pt1.sourceforge.net
 COMMENT=	TrueType font converter to Postscript type 1
 
-DEPENDS+=	t1utils-[0-9]*:../../textproc/t1utils
+DEPENDS+=	t1utils-[0-9]*:../../fonts/t1utils
 
 USE_CONFIG_WRAPPER=	yes
 
diff --git a/math/grace/Makefile b/math/grace/Makefile
index 51e7f59dbc6..771209bb361 100644
--- a/math/grace/Makefile
+++ b/math/grace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2002/04/23 02:08:53 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2002/07/19 12:43:51 wiz Exp $
 #
 
 DISTNAME=	grace-5.1.4
@@ -32,12 +32,12 @@ post-install:
 	${LN} -s ${PREFIX}/grace/bin/xmgrace ${PREFIX}/bin
 
 .include "../../devel/netcdf/buildlink.mk"
+.include "../../fonts/t1lib/buildlink.mk"
 .include "../../graphics/jpeg/buildlink.mk"
 .include "../../graphics/png/buildlink.mk"
 .include "../../graphics/tiff/buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
 .include "../../print/pdflib/buildlink.mk"
-.include "../../textproc/t1lib/buildlink.mk"
 .include "../../x11/Xbae/buildlink.mk"
 .include "../../mk/motif.buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
diff --git a/print/xpdf/Makefile b/print/xpdf/Makefile
index 4d8b26df0a2..3cec75f81ee 100644
--- a/print/xpdf/Makefile
+++ b/print/xpdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/06/10 10:58:58 drochner Exp $
+# $NetBSD: Makefile,v 1.9 2002/07/19 12:43:51 wiz Exp $
 # 
 
 DISTNAME=	xpdf-1.00
@@ -31,8 +31,8 @@ MAKE_ENV+=		SED="${SED}" ECHO="${ECHO}"
 CONFIGURE_ARGS+=	--enable-a4-paper
 .endif
 
+.include "../../fonts/t1lib/buildlink.mk"
 .include "../../graphics/freetype2/buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
-.include "../../textproc/t1lib/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/Makefile b/textproc/Makefile
index 63e776aa0fc..b534b5805b0 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.151 2002/07/01 12:38:41 wiz Exp $
+# $NetBSD: Makefile,v 1.152 2002/07/19 12:43:47 wiz Exp $
 #
 
 COMMENT=	Text processing utilities (does not include desktop publishing)
@@ -134,8 +134,6 @@ SUBDIR+=	scrollkeeper
 SUBDIR+=	source-highlight
 SUBDIR+=	sp
 SUBDIR+=	stardic
-SUBDIR+=	t1lib
-SUBDIR+=	t1utils
 SUBDIR+=	tcl-dom
 SUBDIR+=	tcl-expat
 SUBDIR+=	tcl-xml
diff --git a/textproc/t1lib/DEINSTALL b/textproc/t1lib/DEINSTALL
deleted file mode 100644
index eb015729e4e..00000000000
--- a/textproc/t1lib/DEINSTALL
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.1 2001/10/31 22:58:52 zuntum Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-case ${STAGE} in
-DEINSTALL)
-	;;
-POST-DEINSTALL)
-	CONFDIR=${PKG_PREFIX}/share/t1lib
-
-	cat << EOF
-===========================================================================
-If you won't be using ${PKGNAME} any longer, you may wish to manually
-remove the ${CONFDIR} directory.
-===========================================================================
-EOF
-	;;
-*)
-	echo "Unexpected argument: $2"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/textproc/t1lib/DESCR b/textproc/t1lib/DESCR
deleted file mode 100644
index 3f5cb3497aa..00000000000
--- a/textproc/t1lib/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-t1lib is a library written in C which implements functions for generating
-bitmaps from Adobe Type 1 fonts. It uses most internal parts of the Type 1
-rasterizer provided with X11R5 and newer but tries avoid the disadvantages
-known from that rasterizer. Although most people would use the rasterizer
-under X11, having X11 is not necessary at all. 
-
-The rasterizer is implemented as a shared or static library to be linked
-to the programs that want to use Type 1 fonts. In addition to this library
-there is a test-program called xglyph which, as the name indicates,
-requires X11. It can be used to show most of the features of the library.
-xglyph can be run out of the box without doing any X11 configuration like
-setting resources.
diff --git a/textproc/t1lib/INSTALL b/textproc/t1lib/INSTALL
deleted file mode 100644
index d1353d87264..00000000000
--- a/textproc/t1lib/INSTALL
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.1 2001/10/31 22:58:53 zuntum Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-case ${STAGE} in
-PRE-INSTALL)
-	;;
-POST-INSTALL)
-	CONFDIR=${PKG_PREFIX}/share/t1lib
-
-	echo "Installing configuration files:"
-	if [ ! -f ${CONFDIR}/t1lib.config ]
-	then
-		echo "	t1lib.config"
-		cp ${PKG_PREFIX}/share/examples/t1lib/t1lib.config.netbsd \
-			${CONFDIR}/t1lib.config
-		chmod 644 ${CONFDIR}/t1lib.config
-	fi
-	if [ ! -f ${CONFDIR}/FontDataBase ]
-	then
-		echo "	FontDataBase"
-		cp ${PKG_PREFIX}/share/examples/t1lib/FontDataBase \
-			${CONFDIR}/FontDataBase
-		chmod 644 ${CONFDIR}/FontDataBase
-	fi
-	echo "done."
-	;;
-*)
-	echo "Unexpected argument: $2"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/textproc/t1lib/MESSAGE b/textproc/t1lib/MESSAGE
deleted file mode 100644
index e12336c6bd2..00000000000
--- a/textproc/t1lib/MESSAGE
+++ /dev/null
@@ -1,18 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2001/10/31 22:58:54 zuntum Exp $
-
-Sample configs tailored for NetBSD may have been copied to
-${PREFIX}/share/t1lib, but no existing files were overwritten.
-More samples may be found in ${PREFIX}/share/examples/t1lib.
-
-Most programs that use the lib will look first in the directory
-specified by the environment variable T1LIB_CONFIG_DIR, and then
-${PREFIX}/share/t1lib. However, you *must* set T1LIB_CONFIG_DIR
-to run the "xglyph" test X client. E.g, for Bourne shells:
- ``T1LIB_CONFIG_DIR=${PREFIX}/share/t1lib xglyph &''
-
-The complete documentation requires LaTeX to build. If you have
-the print/teTeX package (or some other "tex"),
-``cd ${PREFIX}/share/doc/t1lib; make'' to build t1lib_doc.dvi.
-
-===========================================================================
diff --git a/textproc/t1lib/Makefile b/textproc/t1lib/Makefile
deleted file mode 100644
index ee444ef31f7..00000000000
--- a/textproc/t1lib/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2001/08/29 22:41:21 jlam Exp $
-#
-
-DISTNAME=	t1lib-1.1.1
-WRKSRC=		${WRKDIR}/T1-1.1.1
-CATEGORIES=	textproc devel graphics
-MASTER_SITES=	${MASTER_SITE_SUNSITE:=libs/graphics/} \
-		ftp://ftp.neuroinformatik.ruhr-uni-bochum.de/pub/software/t1lib/
-
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.neuroinformatik.ruhr-uni-bochum.de/ini/PEOPLE/rmz/t1lib/t1lib.html
-COMMENT=	Library for generating bitmaps from Adobe Type 1 fonts
-
-USE_BUILDLINK_ONLY=	# defined
-GNU_CONFIGURE=		# defined
-USE_GMAKE=		# defined
-USE_X11BASE=		# defined
-USE_LIBTOOL=		# defined
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
-ALL_TARGET=	without_doc
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/t1lib
-	cd ${WRKSRC}; \
-	  ${PAX} -rw Fonts ${PREFIX}/share/t1lib; \
-	  ${CHMOD} go+r ${PREFIX}/share/t1lib/Fonts/enc/IsoLatin2.enc; \
-	  ${PAX} -rw -s "/doc/t1lib/" doc ${PREFIX}/share/doc
-
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/t1lib
-	cd ${WRKSRC}/examples; \
-	  ${PAX} -rw FontDataBase t1example1.c t1lib.config \
-	      ${PREFIX}/share/examples/t1lib
-	${SED}	-e 's|@@X11BASE@@|${X11BASE}|g' \
-		-e 's|@@LOCALBASE@@|${LOCALBASE}|g' \
-		-e 's|@@PREFIX@@|${PREFIX}|g' \
-		< ${FILESDIR}/t1lib.config.netbsd \
-		> ${PREFIX}/share/examples/t1lib/t1lib.config.netbsd
-
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
-
-.include "../../mk/x11.buildlink.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/t1lib/PLIST b/textproc/t1lib/PLIST
deleted file mode 100644
index 37703582a16..00000000000
--- a/textproc/t1lib/PLIST
+++ /dev/null
@@ -1,100 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:00 skrll Exp $
-bin/type1afm
-bin/xglyph
-include/t1lib.h
-include/t1libx.h
-lib/libt1.a
-lib/libt1.la
-lib/libt1.so
-lib/libt1.so.2
-lib/libt1.so.2.1
-lib/libt1x.a
-lib/libt1x.la
-lib/libt1x.so
-lib/libt1x.so.2
-lib/libt1x.so.2.1
-share/doc/t1lib/Makefile.in
-share/doc/t1lib/Tee.eps
-share/doc/t1lib/Tee.pdf
-share/doc/t1lib/arbitrary.eps
-share/doc/t1lib/arbitrary.pdf
-share/doc/t1lib/concatglyphs.eps
-share/doc/t1lib/concatglyphs.pdf
-share/doc/t1lib/concatoutlines.eps
-share/doc/t1lib/concatoutlines.pdf
-share/doc/t1lib/extenth.eps
-share/doc/t1lib/extenth.pdf
-share/doc/t1lib/extentv.eps
-share/doc/t1lib/extentv.pdf
-share/doc/t1lib/getstart.tex
-share/doc/t1lib/internals.tex
-share/doc/t1lib/intro.tex
-share/doc/t1lib/manipulate.eps
-share/doc/t1lib/manipulate.pdf
-share/doc/t1lib/mirrorh.eps
-share/doc/t1lib/mirrorh.pdf
-share/doc/t1lib/mirrorv.eps
-share/doc/t1lib/mirrorv.pdf
-share/doc/t1lib/outlineproblems1.eps
-share/doc/t1lib/outlineproblems1.pdf
-share/doc/t1lib/outlineproblems2.eps
-share/doc/t1lib/outlineproblems2.pdf
-share/doc/t1lib/outlineproblems3.eps
-share/doc/t1lib/outlineproblems3.pdf
-share/doc/t1lib/outlineproblems4.eps
-share/doc/t1lib/outlineproblems4.pdf
-share/doc/t1lib/outlineproblems5.eps
-share/doc/t1lib/outlineproblems5.pdf
-share/doc/t1lib/outlines.eps
-share/doc/t1lib/outlines.fig
-share/doc/t1lib/outlines.pdf
-share/doc/t1lib/rotate.eps
-share/doc/t1lib/rotate.pdf
-share/doc/t1lib/shearh.eps
-share/doc/t1lib/shearh.pdf
-share/doc/t1lib/shearv.eps
-share/doc/t1lib/shearv.pdf
-share/doc/t1lib/t1_data.eps
-share/doc/t1lib/t1_data.fig
-share/doc/t1lib/t1_data.pdf
-share/doc/t1lib/t1lib_doc.out
-share/doc/t1lib/t1lib_doc.pdf
-share/doc/t1lib/t1lib_doc.tex
-share/doc/t1lib/type1afm.tex
-share/doc/t1lib/ut1lib.tex
-share/doc/t1lib/xglyph.tex
-share/doc/t1lib/xinterface.tex
-share/examples/t1lib/FontDataBase
-share/examples/t1lib/t1example1.c
-share/examples/t1lib/t1lib.config
-share/examples/t1lib/t1lib.config.netbsd
-share/t1lib/Fonts/afm/README
-share/t1lib/Fonts/afm/bchb.afm
-share/t1lib/Fonts/afm/bchbi.afm
-share/t1lib/Fonts/afm/bchr.afm
-share/t1lib/Fonts/afm/bchri.afm
-share/t1lib/Fonts/afm/dcbx10.afm
-share/t1lib/Fonts/afm/dcbxti10.afm
-share/t1lib/Fonts/afm/dcr10.afm
-share/t1lib/Fonts/afm/dcti10.afm
-share/t1lib/Fonts/afm/eufm10.afm
-share/t1lib/Fonts/enc/IsoLatin1.enc
-share/t1lib/Fonts/enc/IsoLatin2.enc
-share/t1lib/Fonts/enc/PSLatin1.enc
-share/t1lib/Fonts/type1/README
-share/t1lib/Fonts/type1/bchb.pfb
-share/t1lib/Fonts/type1/bchbi.pfb
-share/t1lib/Fonts/type1/bchr.pfb
-share/t1lib/Fonts/type1/bchri.pfb
-share/t1lib/Fonts/type1/dcbx10.pfb
-share/t1lib/Fonts/type1/dcbxti10.pfb
-share/t1lib/Fonts/type1/dcr10.pfb
-share/t1lib/Fonts/type1/dcti10.pfb
-share/t1lib/Fonts/type1/eufm10.pfb
-@dirrm share/t1lib/Fonts/type1
-@dirrm share/t1lib/Fonts/enc
-@dirrm share/t1lib/Fonts/afm
-@dirrm share/t1lib/Fonts
-@dirrm share/examples/t1lib
-@comment remove any rendered docs as well
-@unexec ${RM} -rf %D/share/doc/t1lib || true
diff --git a/textproc/t1lib/buildlink.mk b/textproc/t1lib/buildlink.mk
deleted file mode 100644
index e3066c8241f..00000000000
--- a/textproc/t1lib/buildlink.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/07/30 20:07:22 jlam Exp $
-#
-# This Makefile fragment is included by packages that use t1lib.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.t1lib to the dependency pattern
-#     for the version of t1lib desired.
-# (2) Include this Makefile fragment in the package Makefile,
-# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
-#     search path, and
-# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
-#     path.
-
-.if !defined(T1LIB_BUILDLINK_MK)
-T1LIB_BUILDLINK_MK=	# defined
-
-.include "../../mk/bsd.buildlink.mk"
-
-BUILDLINK_DEPENDS.t1lib?=	t1lib>=1.1.1
-DEPENDS+=	${BUILDLINK_DEPENDS.t1lib}:../../textproc/t1lib
-
-EVAL_PREFIX+=			BUILDLINK_PREFIX.t1lib=t1lib
-BUILDLINK_PREFIX.t1lib_DEFAULT=	${X11PREFIX}
-BUILDLINK_FILES.t1lib=		include/t1lib.h
-BUILDLINK_FILES.t1lib+=		include/t1libx.h
-BUILDLINK_FILES.t1lib+=		lib/libt1.*
-BUILDLINK_FILES.t1lib+=		lib/libt1x.*
-
-BUILDLINK_TARGETS.t1lib=	t1lib-buildlink
-BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.t1lib}
-
-pre-configure: ${BUILDLINK_TARGETS.t1lib}
-t1lib-buildlink: _BUILDLINK_USE
-
-.endif	# T1LIB_BUILDLINK_MK
diff --git a/textproc/t1lib/distinfo b/textproc/t1lib/distinfo
deleted file mode 100644
index 5973c3393f4..00000000000
--- a/textproc/t1lib/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2001/07/30 20:07:22 jlam Exp $
-
-SHA1 (t1lib-1.1.1.tar.gz) = 5183f718dc0b90ff8c0aee4fbcfdbbc90e5db883
-Size (t1lib-1.1.1.tar.gz) = 1442934 bytes
-SHA1 (patch-ac) = a75f5dc4a4c5d8e564690b774345488383d21580
diff --git a/textproc/t1lib/files/t1lib.config.netbsd b/textproc/t1lib/files/t1lib.config.netbsd
deleted file mode 100644
index 268bf350c0d..00000000000
--- a/textproc/t1lib/files/t1lib.config.netbsd
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: t1lib.config.netbsd,v 1.1 1999/09/24 01:00:03 fredb Exp $
-This is a configuration file for t1lib
-
-FONTDATABASE=@@PREFIX@@/share/t1lib/FontDataBase
-ENCODING=@@PREFIX@@/share/t1lib/Fonts/enc
-AFM=@@PREFIX@@/share/t1lib/Fonts/afm:@@LOCALBASE@@/share/ghostscript/fonts
-TYPE1=@@PREFIX@@/share/t1lib/Fonts/type1:/usr/share/groff_font/devps:@@LOCALBASE@@/share/ghostscript/fonts
diff --git a/textproc/t1lib/patches/patch-ac b/textproc/t1lib/patches/patch-ac
deleted file mode 100644
index e7d7dcdc249..00000000000
--- a/textproc/t1lib/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2001/07/30 20:07:23 jlam Exp $
-
---- lib/Makefile.in.orig	Mon Jan 15 17:34:40 2001
-+++ lib/Makefile.in
-@@ -161,17 +161,10 @@
- install: dummy
- 	$(MKINSTALLDIRS) $(libdir)
- 	$(MKINSTALLDIRS) $(includedir)
--	$(MKINSTALLDIRS) @T1LIB_DATA_DIR@
- 	$(LIBTOOL) --mode=install \
- 		$(INSTALL_DATA) $(MAIN_TARGET) $(libdir)
- 	$(LIBTOOL) --mode=install \
- 		$(INSTALL_DATA) $(MAIN_HEADER) $(includedir)
--	if (test -f @T1LIB_DATA_DIR@/t1lib.config) \
--	then \
--	  echo "Alert: Global configuration file exists, installation skipped!"; \
--	else \
--	  $(LIBTOOL) --mode=install $(INSTALL_DATA) t1lib.config @T1LIB_DATA_DIR@; \
--	fi;
- 
- 
- uninstall: dummy
diff --git a/textproc/t1utils/DESCR b/textproc/t1utils/DESCR
deleted file mode 100644
index 9680c8027ee..00000000000
--- a/textproc/t1utils/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Utilities for working with Postscript Type 1 font files.  In
-particular, this package includes programs for changing font files
-between ASCII and binary formats, and a "human readable" format,
-and it also includes a program for extracting the useful information
-from the "resource fork" of MacOS files.
diff --git a/textproc/t1utils/Makefile b/textproc/t1utils/Makefile
deleted file mode 100644
index f2b48f889d5..00000000000
--- a/textproc/t1utils/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2001/07/26 22:46:03 dillo Exp $
-#
-
-DISTNAME=	t1utils-1.23
-CATEGORIES=	textproc converters
-MASTER_SITES=	http://www.lcdf.org/~eddietwo/type/
-
-MAINTAINER=	jonb@netbsd.org
-HOMEPAGE=	http://www.lcdf.org/~eddietwo/type/
-COMMENT=	Utility programs for dealing with Postscript Type 1 font files
-
-GNU_CONFIGURE=		YES
-USE_BUILDLINK_ONLY=	YES
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/t1utils/PLIST b/textproc/t1utils/PLIST
deleted file mode 100644
index 8d3eda2b603..00000000000
--- a/textproc/t1utils/PLIST
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:58:56 zuntum Exp $
-bin/t1ascii
-bin/t1asm
-bin/t1binary
-bin/t1disasm
-bin/t1mac
-bin/t1unmac
-man/man1/t1ascii.1
-man/man1/t1asm.1
-man/man1/t1binary.1
-man/man1/t1disasm.1
-man/man1/t1mac.1
-man/man1/t1unmac.1
diff --git a/textproc/t1utils/distinfo b/textproc/t1utils/distinfo
deleted file mode 100644
index 88eaf885af2..00000000000
--- a/textproc/t1utils/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.3 2001/07/26 22:46:03 dillo Exp $
-
-SHA1 (t1utils-1.23.tar.gz) = b9b44b6b76494c6b7444af0341d338f1bc6eaa7f
-Size (t1utils-1.23.tar.gz) = 72306 bytes
diff --git a/x11/Makefile b/x11/Makefile
index 6f757aa4f74..360862d1c19 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.256 2002/07/17 12:32:53 skrll Exp $
+# $NetBSD: Makefile,v 1.257 2002/07/19 12:43:47 wiz Exp $
 #
 
 COMMENT=	Packages to support the X window system
@@ -99,7 +99,6 @@ SUBDIR+=	tk
 SUBDIR+=	tk-Tix
 SUBDIR+=	tkinfo
 SUBDIR+=	tkman
-SUBDIR+=	type1inst
 SUBDIR+=	unclutter
 SUBDIR+=	wmavgload
 SUBDIR+=	wmessage
diff --git a/x11/type1inst/DESCR b/x11/type1inst/DESCR
deleted file mode 100644
index 559e7e75f78..00000000000
--- a/x11/type1inst/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-type1inst is a small perl script which generates the "fonts.scale"
-file required by an X11 server to use any Type 1 PostScript fonts
-which exist in a particular directory.  It gathers this informatiom
-from the font files themselves, a task which previously was done
-by hand.  The script is also capable of generating the similar
-"Fontmap" file used by ghostscript.  It can also generate sample
-sheets for the fonts.
diff --git a/x11/type1inst/Makefile b/x11/type1inst/Makefile
deleted file mode 100644
index 7b0b1739d6f..00000000000
--- a/x11/type1inst/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2002/07/19 12:33:21 wiz Exp $
-#
-
-DISTNAME=		type1inst-0.6.1
-CATEGORIES=		x11
-MASTER_SITES=		${MASTER_SITE_SUNSITE:=X11/xutils/}
-
-MAINTAINER=		groo@netbsd.org
-COMMENT=		Automatically generate fonts.scale/fonts.dir for Type1 fonts
-
-USE_PERL5=		yes
-USE_X11BASE=		yes
-REPLACE_PERL=		t1embed type1inst
-
-NO_BUILD=		yes
-
-do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/type1inst ${X11PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/t1embed ${X11PREFIX}/bin
-	@${INSTALL_MAN} ${WRKSRC}/type1inst.man ${X11PREFIX}/man/man1/type1inst.1
-	@${INSTALL_DATA_DIR} ${X11PREFIX}/share/doc/type1inst
-	@${INSTALL_DATA} ${WRKSRC}/README ${X11PREFIX}/share/doc/type1inst
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/x11/type1inst/PLIST b/x11/type1inst/PLIST
deleted file mode 100644
index c7969fb34f5..00000000000
--- a/x11/type1inst/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:11:45 zuntum Exp $
-bin/type1inst
-bin/t1embed
-man/man1/type1inst.1
-share/doc/type1inst/README
-@dirrm share/doc/type1inst
diff --git a/x11/type1inst/distinfo b/x11/type1inst/distinfo
deleted file mode 100644
index d8b13eced99..00000000000
--- a/x11/type1inst/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.3 2002/07/19 12:33:21 wiz Exp $
-
-SHA1 (type1inst-0.6.1.tar.gz) = 17a445cfee17ac3c8268666639b3164867ae3dc5
-Size (type1inst-0.6.1.tar.gz) = 27966 bytes