Changes 20080720:

* Bug fixes and improvements.

4 files changed, 173 insertions, 27 deletions

diff --git a/fonts/fontforge/Makefile b/fonts/fontforge/Makefile
index 6fa6012f5af..eb512de89ac 100644
--- a/fonts/fontforge/Makefile
+++ b/fonts/fontforge/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.49 2008/06/23 11:38:50 drochner Exp $
+# $NetBSD: Makefile,v 1.50 2008/07/29 05:17:01 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=	20080607
+VERSION=	20080720
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/fonts/fontforge/PLIST b/fonts/fontforge/PLIST
index 11c809b7442..473f164f345 100644
--- a/fonts/fontforge/PLIST
+++ b/fonts/fontforge/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2008/06/22 18:30:54 adam Exp $
+@comment $NetBSD: PLIST,v 1.20 2008/07/29 05:17:01 adam Exp $
 bin/fontforge
 bin/fontimage
 bin/fontlint
@@ -70,6 +70,151 @@ man/man1/fontforge.1
 man/man1/fontimage.1
 man/man1/fontlint.1
 man/man1/sfddiff.1
+share/fontforge/pixmaps/editclear.png
+share/fontforge/pixmaps/editclearback.png
+share/fontforge/pixmaps/editcopy.png
+share/fontforge/pixmaps/editcopyfg2bg.png
+share/fontforge/pixmaps/editcopylayer2layer.png
+share/fontforge/pixmaps/editcopylbearing.png
+share/fontforge/pixmaps/editcopylookupdata.png
+share/fontforge/pixmaps/editcopyrbearing.png
+share/fontforge/pixmaps/editcopyref.png
+share/fontforge/pixmaps/editcopyvwidth.png
+share/fontforge/pixmaps/editcopywidth.png
+share/fontforge/pixmaps/editcut.png
+share/fontforge/pixmaps/editfind.png
+share/fontforge/pixmaps/editjoin.png
+share/fontforge/pixmaps/editmerge.png
+share/fontforge/pixmaps/editpaste.png
+share/fontforge/pixmaps/editpasteafter.png
+share/fontforge/pixmaps/editpasteinto.png
+share/fontforge/pixmaps/editredo.png
+share/fontforge/pixmaps/editrmundoes.png
+share/fontforge/pixmaps/editrplref.png
+share/fontforge/pixmaps/editsameas.png
+share/fontforge/pixmaps/editselect.png
+share/fontforge/pixmaps/editundo.png
+share/fontforge/pixmaps/editunlink.png
+share/fontforge/pixmaps/elementaddextrema.png
+share/fontforge/pixmaps/elementalign.png
+share/fontforge/pixmaps/elementanticlock.png
+share/fontforge/pixmaps/elementautotrace.png
+share/fontforge/pixmaps/elementbdfinfo.png
+share/fontforge/pixmaps/elementbitmapsavail.png
+share/fontforge/pixmaps/elementbuildaccent.png
+share/fontforge/pixmaps/elementclockwise.png
+share/fontforge/pixmaps/elementcomparefonts.png
+share/fontforge/pixmaps/elementcomparelayers.png
+share/fontforge/pixmaps/elementcorrectdir.png
+share/fontforge/pixmaps/elementexpandstroke.png
+share/fontforge/pixmaps/elementfindprobs.png
+share/fontforge/pixmaps/elementfontinfo.png
+share/fontforge/pixmaps/elementgetinfo.png
+share/fontforge/pixmaps/elementglyphinfo.png
+share/fontforge/pixmaps/elementhbaselines.png
+share/fontforge/pixmaps/elementinterpolatefonts.png
+share/fontforge/pixmaps/elementmathinfo.png
+share/fontforge/pixmaps/elementmergefonts.png
+share/fontforge/pixmaps/elementorder.png
+share/fontforge/pixmaps/elementotherinfo.png
+share/fontforge/pixmaps/elementregenbitmaps.png
+share/fontforge/pixmaps/elementremovebitmaps.png
+share/fontforge/pixmaps/elementrenameglyph.png
+share/fontforge/pixmaps/elementround.png
+share/fontforge/pixmaps/elementshowdep.png
+share/fontforge/pixmaps/elementsimplify.png
+share/fontforge/pixmaps/elementstyles.png
+share/fontforge/pixmaps/elementtilepath.png
+share/fontforge/pixmaps/elementtilepattern.png
+share/fontforge/pixmaps/elementtransform.png
+share/fontforge/pixmaps/elementvalidate.png
+share/fontforge/pixmaps/elementvbaselines.png
+share/fontforge/pixmaps/fileclose.png
+share/fontforge/pixmaps/fileexecute.png
+share/fontforge/pixmaps/fileexport.png
+share/fontforge/pixmaps/filegenerate.png
+share/fontforge/pixmaps/filegeneratefamily.png
+share/fontforge/pixmaps/fileimport.png
+share/fontforge/pixmaps/filemergefeature.png
+share/fontforge/pixmaps/filenew.png
+share/fontforge/pixmaps/fileopen.png
+share/fontforge/pixmaps/fileprefs.png
+share/fontforge/pixmaps/fileprint.png
+share/fontforge/pixmaps/filequit.png
+share/fontforge/pixmaps/filerecent.png
+share/fontforge/pixmaps/filerevert.png
+share/fontforge/pixmaps/filerevertbackup.png
+share/fontforge/pixmaps/filerevertglyph.png
+share/fontforge/pixmaps/filesave.png
+share/fontforge/pixmaps/filesaveall.png
+share/fontforge/pixmaps/filesaveas.png
+share/fontforge/pixmaps/helpabout.png
+share/fontforge/pixmaps/helphelp.png
+share/fontforge/pixmaps/helpindex.png
+share/fontforge/pixmaps/hintsadddstem.png
+share/fontforge/pixmaps/hintsaddhstem.png
+share/fontforge/pixmaps/hintsaddvstem.png
+share/fontforge/pixmaps/hintsautohint.png
+share/fontforge/pixmaps/hintscleardstems.png
+share/fontforge/pixmaps/hintsclearhstems.png
+share/fontforge/pixmaps/hintsclearvstems.png
+share/fontforge/pixmaps/hintsdontautohint.png
+share/fontforge/pixmaps/hintsreviewhints.png
+share/fontforge/pixmaps/menuempty.png
+share/fontforge/pixmaps/metricscenter.png
+share/fontforge/pixmaps/metricssetlbearing.png
+share/fontforge/pixmaps/metricssetrbearing.png
+share/fontforge/pixmaps/metricssetvwidth.png
+share/fontforge/pixmaps/metricssetwidth.png
+share/fontforge/pixmaps/overlapexclude.png
+share/fontforge/pixmaps/overlapfindinter.png
+share/fontforge/pixmaps/overlapintersection.png
+share/fontforge/pixmaps/overlaprm.png
+share/fontforge/pixmaps/pointsG2curve.png
+share/fontforge/pixmaps/pointsaddanchor.png
+share/fontforge/pixmaps/pointscorner.png
+share/fontforge/pixmaps/pointscurve.png
+share/fontforge/pixmaps/pointshvcurve.png
+share/fontforge/pixmaps/pointsmakearc.png
+share/fontforge/pixmaps/pointsmakeline.png
+share/fontforge/pixmaps/pointsnamecontour.png
+share/fontforge/pixmaps/pointsspironext.png
+share/fontforge/pixmaps/pointsspiroprev.png
+share/fontforge/pixmaps/pointstangent.png
+share/fontforge/pixmaps/python.png
+share/fontforge/pixmaps/styleschangeweight.png
+share/fontforge/pixmaps/styleschangexheight.png
+share/fontforge/pixmaps/stylesextendcondense.png
+share/fontforge/pixmaps/stylesinline.png
+share/fontforge/pixmaps/stylesitalic.png
+share/fontforge/pixmaps/stylesoblique.png
+share/fontforge/pixmaps/stylesoutline.png
+share/fontforge/pixmaps/stylesshadow.png
+share/fontforge/pixmaps/stylessmallcaps.png
+share/fontforge/pixmaps/stylessubsuper.png
+share/fontforge/pixmaps/styleswireframe.png
+share/fontforge/pixmaps/transformfliphor.png
+share/fontforge/pixmaps/transformflipvert.png
+share/fontforge/pixmaps/transformrotate180.png
+share/fontforge/pixmaps/transformrotateccw.png
+share/fontforge/pixmaps/transformrotatecw.png
+share/fontforge/pixmaps/transformskew.png
+share/fontforge/pixmaps/viewbiggersize.png
+share/fontforge/pixmaps/viewfindinfont.png
+share/fontforge/pixmaps/viewfit.png
+share/fontforge/pixmaps/viewformer.png
+share/fontforge/pixmaps/viewgoto.png
+share/fontforge/pixmaps/viewinsertafter.png
+share/fontforge/pixmaps/viewinsertbefore.png
+share/fontforge/pixmaps/viewnext.png
+share/fontforge/pixmaps/viewnextdef.png
+share/fontforge/pixmaps/viewpalettes.png
+share/fontforge/pixmaps/viewprev.png
+share/fontforge/pixmaps/viewprevdef.png
+share/fontforge/pixmaps/viewreplace.png
+share/fontforge/pixmaps/viewsmallersize.png
+share/fontforge/pixmaps/viewzoomin.png
+share/fontforge/pixmaps/viewzoomout.png
 share/fontforge/python/excepthook.py
 share/locale/de/LC_MESSAGES/FontForge.mo
 share/locale/el/LC_MESSAGES/FontForge.mo
@@ -84,4 +229,6 @@ 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/python
+@dirrm share/fontforge/pixmaps
 @dirrm share/fontforge
diff --git a/fonts/fontforge/distinfo b/fonts/fontforge/distinfo
index 268c461692c..c521aedabb6 100644
--- a/fonts/fontforge/distinfo
+++ b/fonts/fontforge/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.41 2008/06/23 11:38:50 drochner Exp $
+$NetBSD: distinfo,v 1.42 2008/07/29 05:17:01 adam Exp $
 
-SHA1 (fontforge_full-20080607.tar.bz2) = 5c72921bb43556ec0b6c174f07f9406065363feb
-RMD160 (fontforge_full-20080607.tar.bz2) = 0f9f1653d69acd3a24409df169ef2bf70f515816
-Size (fontforge_full-20080607.tar.bz2) = 4844736 bytes
+SHA1 (fontforge_full-20080720.tar.bz2) = e964955d5257b5c88887823293d069ce372bf0fa
+RMD160 (fontforge_full-20080720.tar.bz2) = 9f2c8a0afaa2be55a7f69db2272c886aaf5a6bfd
+Size (fontforge_full-20080720.tar.bz2) = 5039266 bytes
 SHA1 (patch-aa) = 269a8aaf439539fceb3eb31b771af631988b5070
 SHA1 (patch-ab) = ec93a47051186bcb901fd145edffad7c457c33fd
-SHA1 (patch-ae) = de1948996c64aeb77e9cde3062c1679ae60ca512
+SHA1 (patch-ae) = 3c86aed655da00ebc56a5a9cd02fe3a8bfd43eec
 SHA1 (patch-af) = ddf487cf9a2252a67f7afbcaa62fdbdf7b68c8ae
diff --git a/fonts/fontforge/patches/patch-ae b/fonts/fontforge/patches/patch-ae
index 5800c229cb9..635eeb232cb 100644
--- a/fonts/fontforge/patches/patch-ae
+++ b/fonts/fontforge/patches/patch-ae
@@ -1,19 +1,19 @@
-$NetBSD: patch-ae,v 1.14 2008/06/23 11:38:51 drochner Exp $
+$NetBSD: patch-ae,v 1.15 2008/07/29 05:17:01 adam Exp $
 
---- configure.orig	2008-05-05 17:07:18.000000000 +0200
+--- configure.orig	2008-07-13 16:36:19.000000000 +0200
 +++ configure
-@@ -19201,8 +19201,8 @@ if test $ac_cv_file__usr_include_libxml2
-   CFLAGS="$CFLAGS -I/usr/include/libxml2/"
- else
+@@ -20189,8 +20189,8 @@ fi
+ 
+ fi
  
-- 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 ${LOCALBASE}/include/libxml2/libxml" >&5
-+echo $ECHO_N "checking for ${LOCALBASE}/include/libxml2/libxml... $ECHO_C" >&6
- if test "${ac_cv_file__usr_local_include_libxml2_libxml+set}" = set; then
+-{ 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 $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -19210,7 +19210,7 @@ else
+@@ -20219,7 +20219,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,16 +22,16 @@ $NetBSD: patch-ae,v 1.14 2008/06/23 11:38:51 drochner Exp $
    ac_cv_file__usr_local_include_libxml2_libxml=yes
  else
    ac_cv_file__usr_local_include_libxml2_libxml=no
-@@ -19219,7 +19219,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
+@@ -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; }
  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/"
  else
    cat >>confdefs.h <<\_ACEOF
  #define _NO_LIBXML 1
-@@ -22082,7 +22082,7 @@ fi
+@@ -22938,7 +22938,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.14 2008/06/23 11:38:51 drochner Exp $
  /usr/X11/include
  /usr/X11R6/include
  /usr/X11R5/include
-@@ -22093,29 +22093,29 @@ ac_x_header_dirs='
+@@ -22949,29 +22949,29 @@ ac_x_header_dirs='
  /usr/include/X11R5
  /usr/include/X11R4
  
@@ -81,8 +81,8 @@ $NetBSD: patch-ae,v 1.14 2008/06/23 11:38:51 drochner Exp $
 +/usr/openwin/share/include"
  
  if test "$ac_x_includes" = no; then
-   # Guess where to find include files, by looking for Intrinsic.h.
-@@ -25099,7 +25099,7 @@ if test "$gww_has_gettext" = "yes" >/dev
+   # Guess where to find include files, by looking for Xlib.h.
+@@ -25868,7 +25868,7 @@ if test "$gww_has_gettext" = "yes" >/dev
  
   cat </dev/null >$ac_confdir/po/Makefile.in
   echo 'prefix = @prefix@' >> $ac_confdir/po/Makefile.in