Changes 20080607:

* Bug fixes and improvements.

4 files changed, 17 insertions, 14 deletions

diff --git a/fonts/fontforge/Makefile b/fonts/fontforge/Makefile
index 3b17a22fab7..21d9cc1f77d 100644
--- a/fonts/fontforge/Makefile
+++ b/fonts/fontforge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2008/04/21 14:52:58 adam Exp $
+# $NetBSD: Makefile,v 1.48 2008/06/22 18:30:54 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=	20080330
+VERSION=	20080607
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -19,7 +19,7 @@ MAKE_ENV+=	PKGLOCALEDIR=${PKGLOCALEDIR}
 USE_LIBTOOL=		yes
 USE_LANGUAGES+=		c c++ fortran
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=			gmake msgfmt
+USE_TOOLS+=		gmake msgfmt
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-freetype-src
 CONFIGURE_ARGS+=	--without-python
diff --git a/fonts/fontforge/PLIST b/fonts/fontforge/PLIST
index 2791cae5b3b..11c809b7442 100644
--- a/fonts/fontforge/PLIST
+++ b/fonts/fontforge/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2008/01/29 01:06:20 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.19 2008/06/22 18:30:54 adam Exp $
 bin/fontforge
 bin/fontimage
 bin/fontlint
@@ -62,6 +62,7 @@ include/fontforge/ustring.h
 include/fontforge/utype.h
 lib/libfontforge.la
 lib/libgdraw.la
+lib/libgioftp.la
 lib/libgunicode.la
 lib/libgutils.la
 lib/pkgconfig/fontforge.pc
@@ -69,6 +70,7 @@ man/man1/fontforge.1
 man/man1/fontimage.1
 man/man1/fontlint.1
 man/man1/sfddiff.1
+share/fontforge/python/excepthook.py
 share/locale/de/LC_MESSAGES/FontForge.mo
 share/locale/el/LC_MESSAGES/FontForge.mo
 share/locale/en_GB/LC_MESSAGES/FontForge.mo
@@ -82,3 +84,4 @@ 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
+@dirrm share/fontforge
diff --git a/fonts/fontforge/distinfo b/fonts/fontforge/distinfo
index 73e206e2d69..fd7b04d496c 100644
--- a/fonts/fontforge/distinfo
+++ b/fonts/fontforge/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.39 2008/04/21 14:52:58 adam Exp $
+$NetBSD: distinfo,v 1.40 2008/06/22 18:30:54 adam Exp $
 
-SHA1 (fontforge_full-20080330.tar.bz2) = 0207392300bda80b15fb50e79fc1f09d1e92a0e4
-RMD160 (fontforge_full-20080330.tar.bz2) = d3dd8f88b942333827f516038376dc7fa4083654
-Size (fontforge_full-20080330.tar.bz2) = 4774776 bytes
+SHA1 (fontforge_full-20080607.tar.bz2) = 5c72921bb43556ec0b6c174f07f9406065363feb
+RMD160 (fontforge_full-20080607.tar.bz2) = 0f9f1653d69acd3a24409df169ef2bf70f515816
+Size (fontforge_full-20080607.tar.bz2) = 4844736 bytes
 SHA1 (patch-aa) = 269a8aaf439539fceb3eb31b771af631988b5070
 SHA1 (patch-ab) = ec93a47051186bcb901fd145edffad7c457c33fd
-SHA1 (patch-ae) = 212a77a52e16fe9b8897ab501a8b63ef4ad3addc
+SHA1 (patch-ae) = 2e562e815ba0d8f844dc004f076273ef823c38b6
diff --git a/fonts/fontforge/patches/patch-ae b/fonts/fontforge/patches/patch-ae
index fee77dd7c61..e789357cce6 100644
--- a/fonts/fontforge/patches/patch-ae
+++ b/fonts/fontforge/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.12 2008/04/21 14:52:58 adam Exp $
+$NetBSD: patch-ae,v 1.13 2008/06/22 18:30:54 adam Exp $
 
---- configure.orig	2008-03-29 23:33:58.000000000 +0100
+--- configure.orig	2008-05-05 17:07:18.000000000 +0200
 +++ configure
-@@ -22079,7 +22079,7 @@ fi
+@@ -22082,7 +22082,7 @@ fi
  
  # Standard set of common directories for X headers.
  # Check X11 before X11Rn because it is often a symlink to the current release.
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.12 2008/04/21 14:52:58 adam Exp $
  /usr/X11/include
  /usr/X11R6/include
  /usr/X11R5/include
-@@ -22090,29 +22090,29 @@ ac_x_header_dirs='
+@@ -22093,29 +22093,29 @@ ac_x_header_dirs='
  /usr/include/X11R5
  /usr/include/X11R4
  
@@ -53,7 +53,7 @@ $NetBSD: patch-ae,v 1.12 2008/04/21 14:52:58 adam Exp $
  
  if test "$ac_x_includes" = no; then
    # Guess where to find include files, by looking for Intrinsic.h.
-@@ -25096,7 +25096,7 @@ if test "$gww_has_gettext" = "yes" >/dev
+@@ -25099,7 +25099,7 @@ if test "$gww_has_gettext" = "yes" >/dev
  
   cat </dev/null >$ac_confdir/po/Makefile.in
   echo 'prefix = @prefix@' >> $ac_confdir/po/Makefile.in