Update to 20030712.

Lots of new features and bug features; details under
http://pfaedit.sourceforge.net/changelog.html#change-log

4 files changed, 37 insertions, 15 deletions

diff --git a/fonts/pfaedit/Makefile b/fonts/pfaedit/Makefile
index 81d3f3db15e..e8d8700efad 100644
--- a/fonts/pfaedit/Makefile
+++ b/fonts/pfaedit/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2003/06/02 01:19:43 jschauma Exp $
+# $NetBSD: Makefile,v 1.5 2003/07/13 08:25:29 wiz Exp $
 #
 
-DISTNAME=	pfaedit_full-020910
-PKGNAME=	pfaedit-20020910
-PKGREVISION=	1
-WRKSRC=		${WRKDIR}/pfaedit
+DISTNAME=	pfaedit_full-${VERSION}
+PKGNAME=	pfaedit-20${VERSION}
+WRKSRC=		${WRKDIR}/pfaedit-${VERSION}
 CATEGORIES=	fonts editors
 MASTER_SITES=	http://pfaedit.sourceforge.net/
 EXTRACT_SUFX=	.tgz
@@ -13,8 +12,11 @@ MAINTAINER=	tech-pkg@netbsd.org
 HOMEPAGE=	http://pfaedit.sourceforge.net/
 COMMENT=	postscript font editor
 
+VERSION=	030712
+
+USE_GMAKE=	YES
 USE_LIBTOOL=	YES
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=	YES
 USE_BUILDLINK2=	YES
 USE_X11=	YES
diff --git a/fonts/pfaedit/PLIST b/fonts/pfaedit/PLIST
index b1ca5cab663..daad46efbc0 100644
--- a/fonts/pfaedit/PLIST
+++ b/fonts/pfaedit/PLIST
@@ -1,12 +1,23 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/09/29 23:15:10 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/07/13 08:25:30 wiz Exp $
 bin/pfaedit
 bin/sfddiff
+lib/libgdraw.a
+lib/libgdraw.la
+lib/libgdraw.so
+lib/libgdraw.so.1
+lib/libgdraw.so.1.4
+lib/libgunicode.a
+lib/libgunicode.la
+lib/libgunicode.so
+lib/libgunicode.so.2
+lib/libgunicode.so.2.0
 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
index e307f2e02bb..ef6f0e2a0da 100644
--- a/fonts/pfaedit/distinfo
+++ b/fonts/pfaedit/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/09/29 23:15:10 wiz Exp $
+$NetBSD: distinfo,v 1.2 2003/07/13 08:25:30 wiz Exp $
 
-SHA1 (pfaedit_full-020910.tgz) = 752328d07f7329b698d1db62af058c80089d17a3
-Size (pfaedit_full-020910.tgz) = 2762492 bytes
-SHA1 (patch-aa) = 7e8abdca9cfc5a346ab0fca09438348ed689fd8b
+SHA1 (pfaedit_full-030712.tgz) = c3ad353e720aa78cf41c196e3639469832504779
+Size (pfaedit_full-030712.tgz) = 3335361 bytes
+SHA1 (patch-aa) = f4df7d4d8d811d3ce59e0515839142a06828d087
diff --git a/fonts/pfaedit/patches/patch-aa b/fonts/pfaedit/patches/patch-aa
index 9ad223b1ef4..0def93ad4e1 100644
--- a/fonts/pfaedit/patches/patch-aa
+++ b/fonts/pfaedit/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/09/29 23:15:10 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2003/07/13 08:25:30 wiz Exp $
 
---- pfaedit/Makefile.in.orig	Tue Sep 10 02:57:20 2002
-+++ pfaedit/Makefile.in
-@@ -8,7 +8,7 @@ bindir = @bindir@
+--- pfaedit/Makefile.dynamic.in.orig	Mon Jun 30 15:41:04 2003
++++ pfaedit/Makefile.dynamic.in
+@@ -13,7 +13,7 @@ LIBTOOL = @LIBTOOL@
  CC = @CC@
  
  X_CFLAGS = @X_CFLAGS@
@@ -11,3 +11,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/09/29 23:15:10 wiz Exp $
  X_11LIB = @X_11LIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
  X_PRE_LIBS = @X_PRE_LIBS@
+@@ -62,7 +62,7 @@ acorn2sfd: $(ACORNOBJS)
+ #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