Changes 20100501:

* Bug-fix release.

5 files changed, 18 insertions, 27 deletions

diff --git a/fonts/fontforge/Makefile b/fonts/fontforge/Makefile
index 86e4cffb2de..5ef72d118f9 100644
--- a/fonts/fontforge/Makefile
+++ b/fonts/fontforge/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2010/01/18 09:58:49 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2010/05/21 06:34:23 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=	20090923
+VERSION=	20100501
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/fonts/fontforge/PLIST b/fonts/fontforge/PLIST
index cc6ede55c5d..7de29533c5a 100644
--- a/fonts/fontforge/PLIST
+++ b/fonts/fontforge/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.28 2009/10/11 08:01:47 adam Exp $
+@comment $NetBSD: PLIST,v 1.29 2010/05/21 06:34:23 adam Exp $
 bin/fontforge
 bin/fontimage
 bin/fontlint
 bin/sfddiff
 include/fontforge/PfEd.h
 include/fontforge/autowidth.h
+include/fontforge/autowidth2.h
 include/fontforge/baseviews.h
 include/fontforge/basics.h
 include/fontforge/bezctx_ff.h
diff --git a/fonts/fontforge/distinfo b/fonts/fontforge/distinfo
index 34be32d6df3..da79434fd6f 100644
--- a/fonts/fontforge/distinfo
+++ b/fonts/fontforge/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.51 2010/02/15 20:39:31 schwarz Exp $
+$NetBSD: distinfo,v 1.52 2010/05/21 06:34:23 adam Exp $
 
-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 (fontforge_full-20100501.tar.bz2) = 483425116c6af6ad90e37f9ada0c28e34f251ec3
+RMD160 (fontforge_full-20100501.tar.bz2) = 4dee2ecdbd32bf3854105f195984d9cabf198fd8
+Size (fontforge_full-20100501.tar.bz2) = 6666386 bytes
+SHA1 (patch-aa) = e6846a21c973aaa265bb46ba63d145d5f9c00714
 SHA1 (patch-ab) = ec93a47051186bcb901fd145edffad7c457c33fd
-SHA1 (patch-ae) = e84d2bd77f576eb1c632beae14b23c5b331e2144
+SHA1 (patch-ae) = ca532490137e83ff328ad32c0102d57bed7bb453
diff --git a/fonts/fontforge/patches/patch-aa b/fonts/fontforge/patches/patch-aa
index f3d400206a3..dc125cf76c1 100644
--- a/fonts/fontforge/patches/patch-aa
+++ b/fonts/fontforge/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.8 2008/11/21 18:54:19 adam Exp $
+$NetBSD: patch-aa,v 1.9 2010/05/21 06:34:23 adam Exp $
 
---- fontforge/Makefile.dynamic.in.orig	2008-11-15 06:36:26.000000000 +0100
+--- fontforge/Makefile.dynamic.in.orig	2010-02-02 05:23:06.000000000 +0000
 +++ fontforge/Makefile.dynamic.in
 @@ -15,7 +15,7 @@ CC = @CC@
  O = @O_EXTENSION@
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.8 2008/11/21 18:54:19 adam Exp $
  X_11LIB = @X_11LIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
  X_PRE_LIBS = @X_PRE_LIBS@
-@@ -73,7 +73,7 @@ LIBLIBS = -rpath $(libdir) ../libgutils.
+@@ -74,7 +74,7 @@ LIBLIBS = -rpath $(libdir) ../libgutils.
      @LIBS@ $(STATIC_LIBS) -lm
  DLIBS = -rpath $(libdir)  ../libfontforge.la ../libgutils.la ../libgunicode.la @LIBS@ $(STATIC_LIBS) -lm
  
diff --git a/fonts/fontforge/patches/patch-ae b/fonts/fontforge/patches/patch-ae
index efd7f6871f2..b6bcdfd296f 100644
--- a/fonts/fontforge/patches/patch-ae
+++ b/fonts/fontforge/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.21 2010/02/15 20:39:31 schwarz Exp $
+$NetBSD: patch-ae,v 1.22 2010/05/21 06:34:23 adam Exp $
 
---- configure.orig	2009-09-24 01:55:22.000000000 +0200
+--- configure.orig	2010-04-29 17:53:45.000000000 +0000
 +++ configure
-@@ -20246,14 +20246,14 @@ if test "x$ac_cv_file__usr_include_libxm
+@@ -20275,14 +20275,14 @@ if test "x$ac_cv_file__usr_include_libxm
    CFLAGS="$CFLAGS -I/usr/include/libxml2/"
  else
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ae,v 1.21 2010/02/15 20:39:31 schwarz Exp $
    ac_cv_file__usr_local_include_libxml2_libxml=yes
  else
    ac_cv_file__usr_local_include_libxml2_libxml=no
-@@ -20262,7 +20262,7 @@ fi
+@@ -20291,7 +20291,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 :
@@ -29,7 +29,7 @@ $NetBSD: patch-ae,v 1.21 2010/02/15 20:39:31 schwarz Exp $
  else
    $as_echo "#define _NO_LIBXML 1" >>confdefs.h
  
-@@ -22761,7 +22761,7 @@ if test "$gww_has_gettext" = "yes" >/dev
+@@ -22930,7 +22930,7 @@ if test "$gww_has_gettext" = "yes" >/dev
  
   cat </dev/null >$ac_confdir/po/Makefile.in
   echo 'prefix = @prefix@' >> $ac_confdir/po/Makefile.in
@@ -38,12 +38,3 @@ $NetBSD: patch-ae,v 1.21 2010/02/15 20:39:31 schwarz 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/-O[1-9]//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