Changes 20080109:

* Bug fixes
* Improvements

4 files changed, 70 insertions, 15 deletions

diff --git a/fonts/fontforge/Makefile b/fonts/fontforge/Makefile
index c59ff342c3c..c44a23dbff7 100644
--- a/fonts/fontforge/Makefile
+++ b/fonts/fontforge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2007/11/17 21:20:49 adam Exp $
+# $NetBSD: Makefile,v 1.38 2008/01/26 11:27:02 adam Exp $
 
 DISTNAME=	fontforge_full-${VERSION}
 PKGNAME=	fontforge-${VERSION}
@@ -10,7 +10,7 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://fontforge.sourceforge.net/
 COMMENT=	Postscript font editor
 
-VERSION=	20071110
+VERSION=	20080109
 
 MAKE_ENV+=	PKGLOCALEDIR=${PKGLOCALEDIR}
 
@@ -29,7 +29,4 @@ WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXi/buildlink3.mk"
-.include "../../x11/libxkbui/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/fontforge/PLIST b/fonts/fontforge/PLIST
index bbf01f31cfe..d43bf938b40 100644
--- a/fonts/fontforge/PLIST
+++ b/fonts/fontforge/PLIST
@@ -1,11 +1,68 @@
-@comment $NetBSD: PLIST,v 1.16 2007/11/17 21:20:49 adam Exp $
+@comment $NetBSD: PLIST,v 1.17 2008/01/26 11:27:02 adam Exp $
 bin/fontforge
 bin/fontimage
 bin/fontlint
 bin/sfddiff
+include/fontforge/PfEd.h
+include/fontforge/autowidth.h
+include/fontforge/baseviews.h
+include/fontforge/basics.h
+include/fontforge/bezctx_ff.h
+include/fontforge/bitmapcontrol.h
+include/fontforge/chardata.h
+include/fontforge/charset.h
+include/fontforge/config.h
+include/fontforge/configure-pfaedit.h
+include/fontforge/dynamic.h
+include/fontforge/edgelist.h
+include/fontforge/edgelist2.h
+include/fontforge/encoding.h
+include/fontforge/fffreetype.h
+include/fontforge/ffpython.h
+include/fontforge/fileutil.h
+include/fontforge/fontforgevw.h
+include/fontforge/fvmetrics.h
+include/fontforge/gdraw.h
+include/fontforge/gfile.h
+include/fontforge/ggadget.h
+include/fontforge/gicons.h
+include/fontforge/gimage.h
+include/fontforge/gio.h
+include/fontforge/gkeysym.h
+include/fontforge/gprogress.h
+include/fontforge/gresource.h
+include/fontforge/groups.h
+include/fontforge/gwidget.h
+include/fontforge/gwwiconv.h
+include/fontforge/import.h
+include/fontforge/intl.h
+include/fontforge/libffstamp.h
+include/fontforge/lookups.h
+include/fontforge/mm.h
+include/fontforge/nonlineartrans.h
+include/fontforge/ofl.h
+include/fontforge/pfaedit.h
+include/fontforge/plugins.h
+include/fontforge/print.h
+include/fontforge/psfont.h
+include/fontforge/savefont.h
+include/fontforge/scriptfuncs.h
+include/fontforge/scripting.h
+include/fontforge/sd.h
+include/fontforge/search.h
+include/fontforge/sfd1.h
+include/fontforge/sflayoutP.h
+include/fontforge/splinefont.h
+include/fontforge/stemdb.h
+include/fontforge/ttf.h
+include/fontforge/ttfinstrs.h
+include/fontforge/uiinterface.h
+include/fontforge/unicoderange.h
+include/fontforge/ustring.h
+include/fontforge/utype.h
 lib/libfontforge.la
-lib/libgdraw.la
 lib/libgunicode.la
+lib/libgutils.la
 lib/pkgconfig/fontforge.pc
 man/man1/fontforge.1
 man/man1/fontimage.1
@@ -23,3 +80,4 @@ share/locale/ru/LC_MESSAGES/FontForge.mo
 share/locale/vi/LC_MESSAGES/FontForge.mo
 share/locale/zh_CN/LC_MESSAGES/FontForge.mo
 share/locale/zh_TW/LC_MESSAGES/FontForge.mo
+@dirrm include/fontforge
diff --git a/fonts/fontforge/distinfo b/fonts/fontforge/distinfo
index 479a4756d04..2f6154595b3 100644
--- a/fonts/fontforge/distinfo
+++ b/fonts/fontforge/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.34 2007/11/17 21:20:49 adam Exp $
+$NetBSD: distinfo,v 1.35 2008/01/26 11:27:02 adam Exp $
 
-SHA1 (fontforge_full-20071110.tar.bz2) = 9675da83b9ccc0ef8591509bedf7071b8f303a43
-RMD160 (fontforge_full-20071110.tar.bz2) = 41260e5a0164689c14f20f52e500c8f64a371b5b
-Size (fontforge_full-20071110.tar.bz2) = 4261638 bytes
+SHA1 (fontforge_full-20080109.tar.bz2) = e3b21ff8aa18e108eac958e62a01dc3b41a0e99e
+RMD160 (fontforge_full-20080109.tar.bz2) = ad2a07358896de92719bd0416362a3eac5e44cd0
+Size (fontforge_full-20080109.tar.bz2) = 4548471 bytes
 SHA1 (patch-aa) = 269a8aaf439539fceb3eb31b771af631988b5070
 SHA1 (patch-ab) = ec93a47051186bcb901fd145edffad7c457c33fd
-SHA1 (patch-ae) = 8c9b71ce299be0ee9bf2bb1f2083065cfa938cdc
+SHA1 (patch-ae) = 787dd7f105c82f39ac7442a29965246bd92544ed
diff --git a/fonts/fontforge/patches/patch-ae b/fonts/fontforge/patches/patch-ae
index b5de45fc070..aec72b2b7b1 100644
--- a/fonts/fontforge/patches/patch-ae
+++ b/fonts/fontforge/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.8 2007/11/17 21:20:50 adam Exp $
+$NetBSD: patch-ae,v 1.9 2008/01/26 11:27:02 adam Exp $
 
---- configure.orig	2007-10-28 23:19:03.000000000 +0100
+--- configure.orig	2008-01-05 18:58:52.000000000 +0100
 +++ configure
-@@ -25012,7 +25012,7 @@ if test "$gww_has_gettext" = "yes" >/dev
+@@ -25013,7 +25013,7 @@ if test "$gww_has_gettext" = "yes" >/dev
  
   cat </dev/null >$ac_confdir/po/Makefile.in
   echo 'prefix = @prefix@' >> $ac_confdir/po/Makefile.in