Changes 20060114:

* Bug fixes

4 files changed, 17 insertions, 33 deletions

diff --git a/fonts/fontforge/Makefile b/fonts/fontforge/Makefile
index 85c63327f61..fd487b6c2aa 100644
--- a/fonts/fontforge/Makefile
+++ b/fonts/fontforge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/11/29 14:27:46 adam Exp $
+# $NetBSD: Makefile,v 1.17 2006/01/20 12:11:21 adam Exp $
 
 DISTNAME=	fontforge_full-${VERSION}
 PKGNAME=	fontforge-${VERSION}
@@ -10,8 +10,9 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://fontforge.sourceforge.net/
 COMMENT=	Postscript font editor
 
-VERSION=	20051028
+VERSION=	20060114
 
+USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
diff --git a/fonts/fontforge/PLIST b/fonts/fontforge/PLIST
index 0324a7dedee..e2852a9cb18 100644
--- a/fonts/fontforge/PLIST
+++ b/fonts/fontforge/PLIST
@@ -1,19 +1,12 @@
-@comment $NetBSD: PLIST,v 1.5 2005/06/30 14:36:27 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/01/20 12:11:22 adam Exp $
 bin/fontforge
-bin/pfaedit
-bin/sfddiff
 lib/libgdraw.la
 lib/libgunicode.la
 lib/pkgconfig/fontforge.pc
 man/man1/fontforge.1
 man/man1/sfddiff.1
-share/fontforge/pfaedit-de.ui
-share/fontforge/pfaedit-en.ui
-share/fontforge/pfaedit-es.ui
-share/fontforge/pfaedit-fr.ui
-share/fontforge/pfaedit-gr.ui
-share/fontforge/pfaedit-it.ui
-share/fontforge/pfaedit-ja.ui
-share/fontforge/pfaedit-ru.ui
-share/fontforge/pfaedit-zh.ui
-@dirrm share/fontforge
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/FontForge.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/FontForge.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/FontForge.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/FontForge.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/FontForge.mo
diff --git a/fonts/fontforge/distinfo b/fonts/fontforge/distinfo
index 8e8ac5764fc..c4c07b0b3d8 100644
--- a/fonts/fontforge/distinfo
+++ b/fonts/fontforge/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.14 2005/12/28 19:34:34 joerg Exp $
+$NetBSD: distinfo,v 1.15 2006/01/20 12:11:22 adam Exp $
 
-SHA1 (fontforge_full-20051028.tar.bz2) = 2a835d97d54c1d2f9974333908d570786206a64a
-RMD160 (fontforge_full-20051028.tar.bz2) = 37338e12c2295d8cdc934ad483b4b9de005febe5
-Size (fontforge_full-20051028.tar.bz2) = 3014049 bytes
-SHA1 (patch-aa) = aea7a2ebd0cd8690a0a6c35a5cf612a1e170fea1
-SHA1 (patch-ab) = 5cc7393802aa6b620cf87d6b50742bcef46bce60
+SHA1 (fontforge_full-20060114.tar.bz2) = 3bc28b87cb50faa3debf069eb69ee0e2cfc1240a
+RMD160 (fontforge_full-20060114.tar.bz2) = 65a14535c7902780b0309fd33107cef1c752de02
+Size (fontforge_full-20060114.tar.bz2) = 3211012 bytes
+SHA1 (patch-aa) = c7f9e18ad3c4e055f12f30b37d8ace4e0b7c1b24
diff --git a/fonts/fontforge/patches/patch-aa b/fonts/fontforge/patches/patch-aa
index dcbc141aab2..c9e39842d43 100644
--- a/fonts/fontforge/patches/patch-aa
+++ b/fonts/fontforge/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2005/10/19 12:21:00 adam Exp $
+$NetBSD: patch-aa,v 1.4 2006/01/20 12:11:22 adam Exp $
 
---- fontforge/Makefile.dynamic.in.orig	2005-10-18 21:52:14.000000000 +0000
+--- fontforge/Makefile.dynamic.in.orig	2006-01-15 15:26:05.000000000 +0100
 +++ fontforge/Makefile.dynamic.in
-@@ -13,7 +13,7 @@ LIBTOOL = @LIBTOOL@
+@@ -14,7 +14,7 @@ LIBTOOL = @LIBTOOL@
  CC = @CC@
  
  X_CFLAGS = @X_CFLAGS@
@@ -11,12 +11,3 @@ $NetBSD: patch-aa,v 1.3 2005/10/19 12:21:00 adam Exp $
  X_11LIB = @X_11LIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
  X_PRE_LIBS = @X_PRE_LIBS@
-@@ -70,7 +70,7 @@ splinerefigure.o: $(srcdir)/splinerefigu
- #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) --mode=link $(CC) -o makenomenh $(CFLAGS) $(srcdir)/makenomenh.c $(LIBS)
-+	$(LIBTOOL) --mode=link $(CC) -o makenomenh $(CFLAGS) $(LDFLAGS) $(srcdir)/makenomenh.c $(LIBS)
- 	-ln -s $(srcdir)/nomen-*.c .
- 	./makenomenh
- 	mv pfaedit-ui-en.c pfaedit-ui.c