Changes 20080927:

* Bug fixes and improvements

5 files changed, 35 insertions, 34 deletions

diff --git a/fonts/fontforge/Makefile b/fonts/fontforge/Makefile
index 5a63534b25f..69c7ddeefb9 100644
--- a/fonts/fontforge/Makefile
+++ b/fonts/fontforge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2008/09/17 16:34:40 rillig Exp $
+# $NetBSD: Makefile,v 1.52 2008/10/18 11:43:45 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=	20080720
+VERSION=	20080927
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -23,7 +23,6 @@ USE_TOOLS+=		gmake msgfmt
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-freetype-src
 CONFIGURE_ARGS+=	--without-python
-CONFIGURE_ENV+=		LOCALBASE=${LOCALBASE}
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 BROKEN_GETTEXT_DETECTION=	yes
 
diff --git a/fonts/fontforge/PLIST b/fonts/fontforge/PLIST
index 473f164f345..a8927496938 100644
--- a/fonts/fontforge/PLIST
+++ b/fonts/fontforge/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2008/07/29 05:17:01 adam Exp $
+@comment $NetBSD: PLIST,v 1.21 2008/10/18 11:43:45 adam Exp $
 bin/fontforge
 bin/fontimage
 bin/fontlint
@@ -70,6 +70,7 @@ man/man1/fontforge.1
 man/man1/fontimage.1
 man/man1/fontlint.1
 man/man1/sfddiff.1
+share/fontforge/pixmaps/colorwheel.png
 share/fontforge/pixmaps/editclear.png
 share/fontforge/pixmaps/editclearback.png
 share/fontforge/pixmaps/editcopy.png
@@ -102,6 +103,7 @@ share/fontforge/pixmaps/elementautotrace.png
 share/fontforge/pixmaps/elementbdfinfo.png
 share/fontforge/pixmaps/elementbitmapsavail.png
 share/fontforge/pixmaps/elementbuildaccent.png
+share/fontforge/pixmaps/elementbuildcomposit.png
 share/fontforge/pixmaps/elementclockwise.png
 share/fontforge/pixmaps/elementcomparefonts.png
 share/fontforge/pixmaps/elementcomparelayers.png
diff --git a/fonts/fontforge/distinfo b/fonts/fontforge/distinfo
index c521aedabb6..a1ddc9c21cd 100644
--- a/fonts/fontforge/distinfo
+++ b/fonts/fontforge/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.42 2008/07/29 05:17:01 adam Exp $
+$NetBSD: distinfo,v 1.43 2008/10/18 11:43:45 adam Exp $
 
-SHA1 (fontforge_full-20080720.tar.bz2) = e964955d5257b5c88887823293d069ce372bf0fa
-RMD160 (fontforge_full-20080720.tar.bz2) = 9f2c8a0afaa2be55a7f69db2272c886aaf5a6bfd
-Size (fontforge_full-20080720.tar.bz2) = 5039266 bytes
+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) = 269a8aaf439539fceb3eb31b771af631988b5070
 SHA1 (patch-ab) = ec93a47051186bcb901fd145edffad7c457c33fd
-SHA1 (patch-ae) = 3c86aed655da00ebc56a5a9cd02fe3a8bfd43eec
-SHA1 (patch-af) = ddf487cf9a2252a67f7afbcaa62fdbdf7b68c8ae
+SHA1 (patch-ae) = a5ccbd571154dc03fbb4e3dae31615e6d064832d
+SHA1 (patch-af) = b71942feaf59b69d02782679219dd694e1054b3d
diff --git a/fonts/fontforge/patches/patch-ae b/fonts/fontforge/patches/patch-ae
index 635eeb232cb..1e63fde5cab 100644
--- a/fonts/fontforge/patches/patch-ae
+++ b/fonts/fontforge/patches/patch-ae
@@ -1,37 +1,37 @@
-$NetBSD: patch-ae,v 1.15 2008/07/29 05:17:01 adam Exp $
+$NetBSD: patch-ae,v 1.16 2008/10/18 11:43:45 adam Exp $
 
---- configure.orig	2008-07-13 16:36:19.000000000 +0200
+--- configure.orig	2008-09-15 01:31:08.000000000 +0200
 +++ configure
-@@ -20189,8 +20189,8 @@ fi
- 
- fi
+@@ -19759,8 +19759,8 @@ if test $ac_cv_file__usr_include_libxml2
+   CFLAGS="$CFLAGS -I/usr/include/libxml2/"
+ else
  
--{ echo "$as_me:$LINENO: checking for /usr/include/libxml2/libxml" >&5
--echo $ECHO_N "checking for /usr/include/libxml2/libxml... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: checking for ${LOCALBASE}/libxml2/libxml" >&5
-+echo $ECHO_N "checking for ${LOCALBASE}/libxml2/libxml... $ECHO_C" >&6; }
- if test "${ac_cv_file__usr_include_libxml2_libxml+set}" = set; then
+- 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
-@@ -20219,7 +20219,7 @@ else
+@@ -19768,7 +19768,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; }; }
 -if test -r "/usr/local/include/libxml2/libxml"; then
-+if test -r "${LOCALBASE}/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
-@@ -20228,7 +20228,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; }
+@@ -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
  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${LOCALBASE}/include -I${LOCALBASE}/include/libxml2/"
++  CFLAGS="$CFLAGS -I${PREFIX}/include -I${PREFIX}/include/libxml2/"
  else
    cat >>confdefs.h <<\_ACEOF
  #define _NO_LIBXML 1
-@@ -22938,7 +22938,7 @@ fi
+@@ -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.
@@ -40,7 +40,7 @@ $NetBSD: patch-ae,v 1.15 2008/07/29 05:17:01 adam Exp $
  /usr/X11/include
  /usr/X11R6/include
  /usr/X11R5/include
-@@ -22949,29 +22949,29 @@ ac_x_header_dirs='
+@@ -22651,29 +22651,29 @@ ac_x_header_dirs='
  /usr/include/X11R5
  /usr/include/X11R4
  
@@ -81,8 +81,8 @@ $NetBSD: patch-ae,v 1.15 2008/07/29 05:17:01 adam Exp $
 +/usr/openwin/share/include"
  
  if test "$ac_x_includes" = no; then
-   # Guess where to find include files, by looking for Xlib.h.
-@@ -25868,7 +25868,7 @@ if test "$gww_has_gettext" = "yes" >/dev
+   # Guess where to find include files, by looking for Intrinsic.h.
+@@ -25686,7 +25686,7 @@ if test "$gww_has_gettext" = "yes" >/dev
  
   cat </dev/null >$ac_confdir/po/Makefile.in
   echo 'prefix = @prefix@' >> $ac_confdir/po/Makefile.in
diff --git a/fonts/fontforge/patches/patch-af b/fonts/fontforge/patches/patch-af
index 450be2be303..a00bf685644 100644
--- a/fonts/fontforge/patches/patch-af
+++ b/fonts/fontforge/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.4 2008/06/23 11:38:51 drochner Exp $
+$NetBSD: patch-af,v 1.5 2008/10/18 11:43:45 adam Exp $
 
---- fontforge/cvimportdlg.c.orig	2008-04-17 14:36:53.000000000 +0200
+--- fontforge/cvimportdlg.c.orig	2008-08-19 01:22:41.000000000 +0200
 +++ fontforge/cvimportdlg.c
-@@ -51,6 +51,7 @@ return;
+@@ -60,6 +60,7 @@ return;
      fclose(plate);
  }
  
@@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.4 2008/06/23 11:38:51 drochner Exp $
  static void ImportSVG(CharView *cv,char *path) {
      SCImportSVG(cv->b.sc,CVLayer((CharViewBase *) cv),path,NULL,0,false);
  }
-@@ -58,6 +59,7 @@ static void ImportSVG(CharView *cv,char 
+@@ -67,6 +68,7 @@ static void ImportSVG(CharView *cv,char 
  static void ImportGlif(CharView *cv,char *path) {
      SCImportGlif(cv->b.sc,CVLayer((CharViewBase *) cv),path,NULL,0,false);
  }