Changes 20090923:

* Bug fixes.

4 files changed, 55 insertions, 30 deletions

diff --git a/fonts/fontforge/Makefile b/fonts/fontforge/Makefile
index be5789440bf..45d69bbc0cd 100644
--- a/fonts/fontforge/Makefile
+++ b/fonts/fontforge/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.61 2009/08/26 19:57:28 sno Exp $
+# $NetBSD: Makefile,v 1.62 2009/10/11 08:01:47 adam Exp $
 
 DISTNAME=	fontforge_full-${VERSION}
 PKGNAME=	fontforge-${VERSION}
-PKGREVISION=	1
 CATEGORIES=	fonts editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fontforge/}
 EXTRACT_SUFX=	.tar.bz2
@@ -11,7 +10,7 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://fontforge.sourceforge.net/
 COMMENT=	Postscript font editor
 
-VERSION=	20090622
+VERSION=	20090923
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/fonts/fontforge/PLIST b/fonts/fontforge/PLIST
index 7573e61bc18..cc6ede55c5d 100644
--- a/fonts/fontforge/PLIST
+++ b/fonts/fontforge/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2009/07/24 08:02:59 adam Exp $
+@comment $NetBSD: PLIST,v 1.28 2009/10/11 08:01:47 adam Exp $
 bin/fontforge
 bin/fontimage
 bin/fontlint
@@ -13,6 +13,7 @@ include/fontforge/chardata.h
 include/fontforge/charset.h
 include/fontforge/config.h
 include/fontforge/configure-pfaedit.h
+include/fontforge/delta.h
 include/fontforge/dynamic.h
 include/fontforge/edgelist.h
 include/fontforge/edgelist2.h
@@ -40,11 +41,11 @@ include/fontforge/intl.h
 include/fontforge/libffstamp.h
 include/fontforge/lookups.h
 include/fontforge/mm.h
+include/fontforge/namehash.h
 include/fontforge/nonlineartrans.h
 include/fontforge/ofl.h
 include/fontforge/pfaedit.h
 include/fontforge/plugins.h
-include/fontforge/prefpage.h
 include/fontforge/print.h
 include/fontforge/psfont.h
 include/fontforge/savefont.h
@@ -197,6 +198,24 @@ share/fontforge/pixmaps/stylesshadow.png
 share/fontforge/pixmaps/stylessmallcaps.png
 share/fontforge/pixmaps/stylessubsuper.png
 share/fontforge/pixmaps/styleswireframe.png
+share/fontforge/pixmaps/tools3drotate.png
+share/fontforge/pixmaps/toolselipse.png
+share/fontforge/pixmaps/toolsflip.png
+share/fontforge/pixmaps/toolsfreehand.png
+share/fontforge/pixmaps/toolsknife.png
+share/fontforge/pixmaps/toolsmagnify.png
+share/fontforge/pixmaps/toolspen.png
+share/fontforge/pixmaps/toolsperspective.png
+share/fontforge/pixmaps/toolspointer.png
+share/fontforge/pixmaps/toolspoly.png
+share/fontforge/pixmaps/toolsrect.png
+share/fontforge/pixmaps/toolsrotate.png
+share/fontforge/pixmaps/toolsruler.png
+share/fontforge/pixmaps/toolsscale.png
+share/fontforge/pixmaps/toolsscroll.png
+share/fontforge/pixmaps/toolsskew.png
+share/fontforge/pixmaps/toolsspiro.png
+share/fontforge/pixmaps/toolsstar.png
 share/fontforge/pixmaps/transformfliphor.png
 share/fontforge/pixmaps/transformflipvert.png
 share/fontforge/pixmaps/transformrotate180.png
diff --git a/fonts/fontforge/distinfo b/fonts/fontforge/distinfo
index 503ed5a0f6d..b8acbcde114 100644
--- a/fonts/fontforge/distinfo
+++ b/fonts/fontforge/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.49 2009/07/24 08:02:59 adam Exp $
+$NetBSD: distinfo,v 1.50 2009/10/11 08:01:47 adam Exp $
 
-SHA1 (fontforge_full-20090622.tar.bz2) = bc638eeeb4cf2d540773bacc52cc6bac1c6ca76f
-RMD160 (fontforge_full-20090622.tar.bz2) = ba9983bf667091e0e9b88fcabf865c65ba2debbd
-Size (fontforge_full-20090622.tar.bz2) = 5359385 bytes
+SHA1 (fontforge_full-20090923.tar.bz2) = cccf78ddf074ea5ddc3ce13a988dc17d383eabdd
+RMD160 (fontforge_full-20090923.tar.bz2) = 704a623f506500c839f378393f11ef14b5dec367
+Size (fontforge_full-20090923.tar.bz2) = 5492119 bytes
 SHA1 (patch-aa) = bb06cfc2ba3a6310a1d423166613140def0a06ea
 SHA1 (patch-ab) = ec93a47051186bcb901fd145edffad7c457c33fd
-SHA1 (patch-ae) = 64a289cc5b921d54a6785e71338de45737b8a01c
+SHA1 (patch-ae) = ab81cc98fbf18a6e1bacc8de93e00fddd9fb834c
diff --git a/fonts/fontforge/patches/patch-ae b/fonts/fontforge/patches/patch-ae
index 521f998d089..55ba92ea692 100644
--- a/fonts/fontforge/patches/patch-ae
+++ b/fonts/fontforge/patches/patch-ae
@@ -1,37 +1,35 @@
-$NetBSD: patch-ae,v 1.19 2009/01/03 19:45:29 adam Exp $
+$NetBSD: patch-ae,v 1.20 2009/10/11 08:01:47 adam Exp $
 
---- configure.orig	2008-12-15 20:38:07.000000000 +0100
+--- configure.orig	2009-09-24 01:55:22.000000000 +0200
 +++ configure
-@@ -21815,8 +21815,8 @@ if test $ac_cv_file__usr_include_libxml2
+@@ -20246,14 +20246,14 @@ if test "x$ac_cv_file__usr_include_libxm
    CFLAGS="$CFLAGS -I/usr/include/libxml2/"
  else
  
-- { echo "$as_me:$LINENO: checking for /usr/local/include/libxml2/libxml" >&5
--echo $ECHO_N "checking for /usr/local/include/libxml2/libxml... $ECHO_C" >&6; }
-+ { echo "$as_me:$LINENO: checking for ${PREFIX}/include/libxml2/libxml" >&5
-+echo $ECHO_N "checking for ${PREFIX}/include/libxml2/libxml... $ECHO_C" >&6; }
- if test "${ac_cv_file__usr_local_include_libxml2_libxml+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/local/include/libxml2/libxml" >&5
+-$as_echo_n "checking for /usr/local/include/libxml2/libxml... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${PREFIX}/include/libxml2/libxml" >&5
++$as_echo_n "checking for ${PREFIX}/include/libxml2/libxml... " >&6; }
+ if test "${ac_cv_file__usr_local_include_libxml2_libxml+set}" = set; then :
+   $as_echo_n "(cached) " >&6
  else
-@@ -21824,7 +21824,7 @@ else
-   { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
- echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-    { (exit 1); exit 1; }; }
+   test "$cross_compiling" = yes &&
+   as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 -if test -r "/usr/local/include/libxml2/libxml"; then
 +if test -r "${PREFIX}/include/libxml2/libxml"; then
    ac_cv_file__usr_local_include_libxml2_libxml=yes
  else
    ac_cv_file__usr_local_include_libxml2_libxml=no
-@@ -21833,7 +21833,7 @@ fi
- { echo "$as_me:$LINENO: result: $ac_cv_file__usr_local_include_libxml2_libxml" >&5
- echo "${ECHO_T}$ac_cv_file__usr_local_include_libxml2_libxml" >&6; }
- if test $ac_cv_file__usr_local_include_libxml2_libxml = yes; then
+@@ -20262,7 +20262,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_local_include_libxml2_libxml" >&5
+ $as_echo "$ac_cv_file__usr_local_include_libxml2_libxml" >&6; }
+ if test "x$ac_cv_file__usr_local_include_libxml2_libxml" = x""yes; then :
 -  CFLAGS="$CFLAGS -I/usr/local/include -I/usr/local/include/libxml2/"
 +  CFLAGS="$CFLAGS -I${PREFIX}/include -I${PREFIX}/include/libxml2/"
  else
-   cat >>confdefs.h <<\_ACEOF
- #define _NO_LIBXML 1
-@@ -26606,7 +26606,7 @@ if test "$gww_has_gettext" = "yes" >/dev
+   $as_echo "#define _NO_LIBXML 1" >>confdefs.h
+ 
+@@ -22761,7 +22761,7 @@ if test "$gww_has_gettext" = "yes" >/dev
  
   cat </dev/null >$ac_confdir/po/Makefile.in
   echo 'prefix = @prefix@' >> $ac_confdir/po/Makefile.in
@@ -40,3 +38,12 @@ $NetBSD: patch-ae,v 1.19 2009/01/03 19:45:29 adam Exp $
   echo 'INSTALL = @INSTALL@' >> $ac_confdir/po/Makefile.in
   echo 'INSTALL_DATA = @INSTALL_DATA@' >> $ac_confdir/po/Makefile.in
   echo '' >> $ac_confdir/po/Makefile.in
+@@ -22843,7 +22843,7 @@ if test "$gww_archlist" != "" ; then
+   LDFLAGS="$LDFLAGS $gww_archlist"
+ fi
+ 
+-CFLAGS_NOOPT=`echo $CFLAGS | sed -e s/-O2// | sed -e s/-O//`
++CFLAGS_NOOPT=`echo $CFLAGS | sed -e s/-O2//g | sed -e s/-O//g`
+ 
+ cp $ac_confdir/Makefile.dynamic.in $ac_confdir/Makefile.in
+ cp $ac_confdir/Unicode/Makefile.dynamic.in $ac_confdir/Unicode/Makefile.in