Changes 20081117:

* First release with Pango and Cairo
* The first time you run fontforge with Pango something takes several minutes
  to initialize itself. This delay does not occur on subsequent invocations.
* Displaying magnified bitmap strikes in the font view often caused a crash.
* Non-English translations of "%d pixel bitmap" in the View menu of the font
  view came out garbled. There were interpreted as latin1 rather than utf8.

5 files changed, 48 insertions, 75 deletions

diff --git a/fonts/fontforge/Makefile b/fonts/fontforge/Makefile
index 02cc9477c10..66e11561d48 100644
--- a/fonts/fontforge/Makefile
+++ b/fonts/fontforge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2008/11/01 09:51:59 adam Exp $
+# $NetBSD: Makefile,v 1.54 2008/11/21 18:54:19 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=	20080927
+VERSION=	20081117
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -30,6 +30,8 @@ BROKEN_GETTEXT_DETECTION=	yes
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
diff --git a/fonts/fontforge/PLIST b/fonts/fontforge/PLIST
index f487d21ad6d..daaf7d4c115 100644
--- a/fonts/fontforge/PLIST
+++ b/fonts/fontforge/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2008/11/01 09:51:59 adam Exp $
+@comment $NetBSD: PLIST,v 1.23 2008/11/21 18:54:19 adam Exp $
 bin/fontforge
 bin/fontimage
 bin/fontlint
@@ -225,6 +225,7 @@ share/locale/es/LC_MESSAGES/FontForge.mo
 share/locale/fr/LC_MESSAGES/FontForge.mo
 share/locale/it/LC_MESSAGES/FontForge.mo
 share/locale/ja/LC_MESSAGES/FontForge.mo
+share/locale/mal/LC_MESSAGES/FontForge.mo
 share/locale/pl/LC_MESSAGES/FontForge.mo
 share/locale/ru/LC_MESSAGES/FontForge.mo
 share/locale/vi/LC_MESSAGES/FontForge.mo
diff --git a/fonts/fontforge/distinfo b/fonts/fontforge/distinfo
index 718285f2aab..d4130f82b10 100644
--- a/fonts/fontforge/distinfo
+++ b/fonts/fontforge/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.44 2008/11/01 09:51:59 adam Exp $
+$NetBSD: distinfo,v 1.45 2008/11/21 18:54:19 adam Exp $
 
-SHA1 (fontforge_full-20080927.tar.bz2) = bf80dd035d0ff26da1f5cc4aa55dcd9b6ff9e748
-RMD160 (fontforge_full-20080927.tar.bz2) = 8f8fb0026b967602184bfefd83d5234fc684f340
-Size (fontforge_full-20080927.tar.bz2) = 5072410 bytes
-SHA1 (patch-aa) = ca71036b37dc1abf9b6915a75c75a0f9b9f1bbd6
+SHA1 (fontforge_full-20081117.tar.bz2) = b1020d85ed5c4ad16bc9517463d4efd6f1ec64b1
+RMD160 (fontforge_full-20081117.tar.bz2) = 2165d7ccba2c2d33d83acacbfaae8691556abace
+Size (fontforge_full-20081117.tar.bz2) = 5137474 bytes
+SHA1 (patch-aa) = bb06cfc2ba3a6310a1d423166613140def0a06ea
 SHA1 (patch-ab) = ec93a47051186bcb901fd145edffad7c457c33fd
-SHA1 (patch-ae) = a5ccbd571154dc03fbb4e3dae31615e6d064832d
+SHA1 (patch-ae) = 75eba12edee7da3ffcb9f0b188f6b592f600be60
 SHA1 (patch-af) = b71942feaf59b69d02782679219dd694e1054b3d
diff --git a/fonts/fontforge/patches/patch-aa b/fonts/fontforge/patches/patch-aa
index 0d58e814be4..f3d400206a3 100644
--- a/fonts/fontforge/patches/patch-aa
+++ b/fonts/fontforge/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.7 2008/11/01 09:51:59 adam Exp $
+$NetBSD: patch-aa,v 1.8 2008/11/21 18:54:19 adam Exp $
 
---- fontforge/Makefile.dynamic.in.orig	2008-09-15 00:27:24.000000000 +0200
+--- fontforge/Makefile.dynamic.in.orig	2008-11-15 06:36:26.000000000 +0100
 +++ fontforge/Makefile.dynamic.in
 @@ -15,7 +15,7 @@ CC = @CC@
  O = @O_EXTENSION@
@@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.7 2008/11/01 09:51:59 adam Exp $
  X_PRE_LIBS = @X_PRE_LIBS@
 @@ -73,7 +73,7 @@ LIBLIBS = -rpath $(libdir) ../libgutils.
      @LIBS@ $(STATIC_LIBS) -lm
- DLIBS = -rpath $(libdir) ../libgunicode.la @LIBS@ $(STATIC_LIBS) -lm
+ DLIBS = -rpath $(libdir)  ../libfontforge.la ../libgutils.la ../libgunicode.la @LIBS@ $(STATIC_LIBS) -lm
  
 -all: @FINAL_TARGET@ @MACAPP@ sfddiff fontimage fontlint
 +all: @FINAL_TARGET@ sfddiff fontimage fontlint
diff --git a/fonts/fontforge/patches/patch-ae b/fonts/fontforge/patches/patch-ae
index 1e63fde5cab..2a74b8e1e66 100644
--- a/fonts/fontforge/patches/patch-ae
+++ b/fonts/fontforge/patches/patch-ae
@@ -1,19 +1,19 @@
-$NetBSD: patch-ae,v 1.16 2008/10/18 11:43:45 adam Exp $
+$NetBSD: patch-ae,v 1.17 2008/11/21 18:54:19 adam Exp $
 
---- configure.orig	2008-09-15 01:31:08.000000000 +0200
+--- configure.orig	2008-11-15 15:16:49.000000000 +0100
 +++ configure
-@@ -19759,8 +19759,8 @@ if test $ac_cv_file__usr_include_libxml2
+@@ -21813,8 +21813,8 @@ if test $ac_cv_file__usr_include_libxml2
    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
+- { 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
  else
-@@ -19768,7 +19768,7 @@ else
+@@ -21822,7 +21822,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; }; }
@@ -22,67 +22,37 @@ $NetBSD: patch-ae,v 1.16 2008/10/18 11:43:45 adam Exp $
    ac_cv_file__usr_local_include_libxml2_libxml=yes
  else
    ac_cv_file__usr_local_include_libxml2_libxml=no
-@@ -19777,7 +19777,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
+@@ -21831,7 +21831,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
 -  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
-@@ -22640,7 +22640,7 @@ fi
- 
- # Standard set of common directories for X headers.
- # Check X11 before X11Rn because it is often a symlink to the current release.
--ac_x_header_dirs='
-+ac_x_header_dirs="
- /usr/X11/include
- /usr/X11R6/include
- /usr/X11R5/include
-@@ -22651,29 +22651,29 @@ ac_x_header_dirs='
- /usr/include/X11R5
- /usr/include/X11R4
- 
--/usr/local/X11/include
--/usr/local/X11R6/include
--/usr/local/X11R5/include
--/usr/local/X11R4/include
--
--/usr/local/include/X11
--/usr/local/include/X11R6
--/usr/local/include/X11R5
--/usr/local/include/X11R4
-+${prefix}/X11/include
-+${prefix}/X11R6/include
-+${prefix}/X11R5/include
-+${prefix}/X11R4/include
-+
-+${prefix}/include/X11
-+${prefix}/include/X11R6
-+${prefix}/include/X11R5
-+${prefix}/include/X11R4
- 
- /usr/X386/include
- /usr/x386/include
- /usr/XFree86/include/X11
- 
- /usr/include
--/usr/local/include
-+${prefix}/include
- /usr/unsupported/include
- /usr/athena/include
--/usr/local/x11r5/include
-+${prefix}/x11r5/include
- /usr/lpp/Xamples/include
- 
- /usr/openwin/include
--/usr/openwin/share/include'
-+/usr/openwin/share/include"
- 
- if test "$ac_x_includes" = no; then
-   # Guess where to find include files, by looking for Intrinsic.h.
-@@ -25686,7 +25686,7 @@ if test "$gww_has_gettext" = "yes" >/dev
+@@ -24099,9 +24099,9 @@ else
+   :
+ fi
+ 
+-  if test "$pan_headers" != "" >& /dev/null ; then
++  if test "$pan_headers" != "" 2> /dev/null ; then
+     gww_haspango="done"
+-  elif pkg-config --libs pangoxft >& /dev/null ; then
++  elif pkg-config --libs pangoxft 2> /dev/null ; then
+     gww_CFLAGS="$CFLAGS"
+     CFLAGS="$CFLAGS $X_CFLAGS"
+     { echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5
+@@ -24169,7 +24169,7 @@ if test "$gww_haspango" = "yes" ; then
+  CFLAGS="$CFLAGS `pkg-config --cflags pangoxft`"
+ fi
+ if test "$gww_haspango" = "yes" -a "$gww_hascairo" = "yes" ; then
+-  if pkg-config --libs pangocairo >& /dev/null ; then
++  if pkg-config --libs pangocairo 2> /dev/null ; then
+     gww_haspangocairo="yes"
+     CFLAGS="$CFLAGS `pkg-config --cflags pangocairo`"
+   fi
+@@ -26602,7 +26602,7 @@ if test "$gww_has_gettext" = "yes" >/dev
  
   cat </dev/null >$ac_confdir/po/Makefile.in
   echo 'prefix = @prefix@' >> $ac_confdir/po/Makefile.in