Renamed pfaedit to fontforge

6 files changed, 2 insertions, 78 deletions

diff --git a/fonts/Makefile b/fonts/Makefile
index aef4ffc49f4..7ce7474d5f8 100644
--- a/fonts/Makefile
+++ b/fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2004/11/26 13:05:20 adam Exp $
+# $NetBSD: Makefile,v 1.76 2004/11/29 10:05:04 adam Exp $
 #
 
 COMMENT=	Fonts
@@ -49,6 +49,7 @@ SUBDIR+=	cyr-rfx-winlatin_1
 SUBDIR+=	dbz-ttf
 SUBDIR+=	efont-unicode
 SUBDIR+=	fontconfig
+SUBDIR+=	fontforge
 SUBDIR+=	freefonts
 SUBDIR+=	geoslab703-ttf
 SUBDIR+=	ghostscript-cidfonts
@@ -85,7 +86,6 @@ SUBDIR+=	oto
 SUBDIR+=	p5-Font-AFM
 SUBDIR+=	p5-Font-TTF
 SUBDIR+=	pcf2bdf
-SUBDIR+=	pfaedit
 SUBDIR+=	profont
 SUBDIR+=	py-TTFQuery
 SUBDIR+=	py-fonttools
diff --git a/fonts/pfaedit/DESCR b/fonts/pfaedit/DESCR
deleted file mode 100644
index 2e0de95ca44..00000000000
--- a/fonts/pfaedit/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-A postscript font editor that lets you create your own postscript,
-truetype, opentype, cid-keyed and bitmap (bdf) fonts, or edit
-existing ones. Also lets you convert one format to another.
diff --git a/fonts/pfaedit/Makefile b/fonts/pfaedit/Makefile
deleted file mode 100644
index f4488f75969..00000000000
--- a/fonts/pfaedit/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2004/10/03 00:14:42 tv Exp $
-#
-
-DISTNAME=	pfaedit_full-${VERSION}
-PKGNAME=	pfaedit-20${VERSION}
-PKGREVISION=	1
-CATEGORIES=	fonts editors
-MASTER_SITES=	http://pfaedit.sourceforge.net/
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	adam@NetBSD.org
-HOMEPAGE=	http://pfaedit.sourceforge.net/
-COMMENT=	Postscript font editor
-
-VERSION=	040310
-
-USE_BUILDLINK3=		YES
-USE_GNU_TOOLS+=		make
-USE_LIBTOOL=		YES
-USE_X11=		YES
-GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--with-freetype-src=no
-WRKSRC=			${WRKDIR}/pfaedit-${VERSION}
-
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/libungif/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/pfaedit/PLIST b/fonts/pfaedit/PLIST
deleted file mode 100644
index 48ac4752020..00000000000
--- a/fonts/pfaedit/PLIST
+++ /dev/null
@@ -1,15 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:09:31 jlam Exp $
-bin/pfaedit
-bin/sfddiff
-lib/libgdraw.la
-lib/libgunicode.la
-man/man1/pfaedit.1
-man/man1/sfddiff.1
-share/pfaedit/pfaedit-de.ui
-share/pfaedit/pfaedit-en.ui
-share/pfaedit/pfaedit-es.ui
-share/pfaedit/pfaedit-fr.ui
-share/pfaedit/pfaedit-it.ui
-share/pfaedit/pfaedit-ja.ui
-share/pfaedit/pfaedit-ru.ui
-@dirrm share/pfaedit
diff --git a/fonts/pfaedit/distinfo b/fonts/pfaedit/distinfo
deleted file mode 100644
index afc906a0339..00000000000
--- a/fonts/pfaedit/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2004/04/27 08:23:01 adam Exp $
-
-SHA1 (pfaedit_full-040310.tgz) = 60660c687363bcfe7a681d61c750d852418f53ce
-Size (pfaedit_full-040310.tgz) = 4349085 bytes
-SHA1 (patch-aa) = 4625e539f6f1e336c90ed76fa7e1b18b5476aabd
diff --git a/fonts/pfaedit/patches/patch-aa b/fonts/pfaedit/patches/patch-aa
deleted file mode 100644
index affa736cb48..00000000000
--- a/fonts/pfaedit/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2004/04/27 08:23:02 adam Exp $
-
---- pfaedit/Makefile.dynamic.in.orig	2004-02-01 03:57:29.000000000 +0000
-+++ pfaedit/Makefile.dynamic.in
-@@ -13,7 +13,7 @@ LIBTOOL = @LIBTOOL@
- CC = @CC@
- 
- X_CFLAGS = @X_CFLAGS@
--X_LIBS = @X_LIBS@
-+X_LIBS = @X_LIBS@ -Wl,-R${X11BASE}/lib
- X_11LIB = @X_11LIB@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
-@@ -70,7 +70,7 @@ splinerefigure.o: splinerefigure.c
- #this makes all the .ui files but wildcarding doesn't work too well if the
- # files don't exist.
- nomen.h pfaedit-ui.c pfaedit-en.ui: $(srcdir)/nomen-*.c makenomenh.c
--	$(LIBTOOL) $(CC) -o makenomenh $(CFLAGS) $(srcdir)/makenomenh.c $(LIBS)
-+	$(LIBTOOL) $(CC) -o makenomenh $(CFLAGS) $(LDFLAGS) $(srcdir)/makenomenh.c $(LIBS)
- 	-ln -s $(srcdir)/nomen-*.c .
- 	./makenomenh
- 	mv pfaedit-ui-en.c pfaedit-ui.c