Changes 20120731:

Change log unavailable.

7 files changed, 157 insertions, 24 deletions

diff --git a/fonts/fontforge/Makefile b/fonts/fontforge/Makefile
index 0fa93ea3199..9fc020f1928 100644
--- a/fonts/fontforge/Makefile
+++ b/fonts/fontforge/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.82 2012/10/08 23:01:33 adam Exp $
+# $NetBSD: Makefile,v 1.83 2012/11/23 20:49:03 adam Exp $
 
-DISTNAME=	fontforge_full-${VERSION}
-PKGNAME=	fontforge-${VERSION}
-PKGREVISION=	8
+DISTNAME=	fontforge_full-20120731-b
+PKGNAME=	${DISTNAME:S/_full//:S/-b//}
 CATEGORIES=	fonts editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fontforge/}
 EXTRACT_SUFX=	.tar.bz2
@@ -12,9 +11,7 @@ HOMEPAGE=	http://fontforge.sourceforge.net/
 COMMENT=	Postscript font editor
 LICENSE=	modified-bsd
 
-VERSION=	20110222
-
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
+WRKSRC=			${WRKDIR}/${DISTNAME:S/_full//}
 
 USE_LANGUAGES=		c
 USE_LIBTOOL=		yes
diff --git a/fonts/fontforge/PLIST b/fonts/fontforge/PLIST
index d2fe38c3599..e7d6c2f38d8 100644
--- a/fonts/fontforge/PLIST
+++ b/fonts/fontforge/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2011/05/02 11:15:42 adam Exp $
+@comment $NetBSD: PLIST,v 1.31 2012/11/23 20:49:03 adam Exp $
 bin/fontforge
 bin/fontimage
 bin/fontlint
@@ -74,6 +74,37 @@ man/man1/fontforge.1
 man/man1/fontimage.1
 man/man1/fontlint.1
 man/man1/sfddiff.1
+share/fontforge/pixmaps/chooseraudio.png
+share/fontforge/pixmaps/chooserback.png
+share/fontforge/pixmaps/chooserbookmark.png
+share/fontforge/pixmaps/choosercid.png
+share/fontforge/pixmaps/choosercompressed.png
+share/fontforge/pixmaps/chooserconfigtool.png
+share/fontforge/pixmaps/choosercore.png
+share/fontforge/pixmaps/chooserdir.png
+share/fontforge/pixmaps/chooserforward.png
+share/fontforge/pixmaps/chooserhomefolder.png
+share/fontforge/pixmaps/chooserimage.png
+share/fontforge/pixmaps/choosermac.png
+share/fontforge/pixmaps/choosermacttf.png
+share/fontforge/pixmaps/choosernobookmark.png
+share/fontforge/pixmaps/chooserobject.png
+share/fontforge/pixmaps/choosertar.png
+share/fontforge/pixmaps/choosertextbdf.png
+share/fontforge/pixmaps/choosertextc.png
+share/fontforge/pixmaps/choosertextcss.png
+share/fontforge/pixmaps/choosertextfontps.png
+share/fontforge/pixmaps/choosertextfontsfd.png
+share/fontforge/pixmaps/choosertexthtml.png
+share/fontforge/pixmaps/choosertextjava.png
+share/fontforge/pixmaps/choosertextmake.png
+share/fontforge/pixmaps/choosertextplain.png
+share/fontforge/pixmaps/choosertextps.png
+share/fontforge/pixmaps/choosertextxml.png
+share/fontforge/pixmaps/chooserttf.png
+share/fontforge/pixmaps/chooserunknown.png
+share/fontforge/pixmaps/chooserupdir.png
+share/fontforge/pixmaps/chooservideo.png
 share/fontforge/pixmaps/colorwheel.png
 share/fontforge/pixmaps/editclear.png
 share/fontforge/pixmaps/editclearback.png
@@ -107,7 +138,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/elementbuildcomposite.png
 share/fontforge/pixmaps/elementclockwise.png
 share/fontforge/pixmaps/elementcomparefonts.png
 share/fontforge/pixmaps/elementcomparelayers.png
@@ -176,6 +207,64 @@ share/fontforge/pixmaps/overlapexclude.png
 share/fontforge/pixmaps/overlapfindinter.png
 share/fontforge/pixmaps/overlapintersection.png
 share/fontforge/pixmaps/overlaprm.png
+share/fontforge/pixmaps/palette3drotate.png
+share/fontforge/pixmaps/palettecorner.png
+share/fontforge/pixmaps/palettecurve.png
+share/fontforge/pixmaps/paletteelipse.png
+share/fontforge/pixmaps/paletteflip.png
+share/fontforge/pixmaps/palettefreehand.png
+share/fontforge/pixmaps/palettehand.png
+share/fontforge/pixmaps/palettehvcurve.png
+share/fontforge/pixmaps/paletteknife.png
+share/fontforge/pixmaps/paletteline.png
+share/fontforge/pixmaps/palettemagnify.png
+share/fontforge/pixmaps/palettepen.png
+share/fontforge/pixmaps/palettepencil.png
+share/fontforge/pixmaps/paletteperspective.png
+share/fontforge/pixmaps/palettepointer.png
+share/fontforge/pixmaps/palettepoly.png
+share/fontforge/pixmaps/paletterect.png
+share/fontforge/pixmaps/paletterotate.png
+share/fontforge/pixmaps/paletteruler.png
+share/fontforge/pixmaps/palettescale.png
+share/fontforge/pixmaps/paletteshift.png
+share/fontforge/pixmaps/paletteskew.png
+share/fontforge/pixmaps/palettesmall3drotate.png
+share/fontforge/pixmaps/palettesmallcorner.png
+share/fontforge/pixmaps/palettesmallcurve.png
+share/fontforge/pixmaps/palettesmallelipse.png
+share/fontforge/pixmaps/palettesmallflip.png
+share/fontforge/pixmaps/palettesmallhand.png
+share/fontforge/pixmaps/palettesmallhvcurve.png
+share/fontforge/pixmaps/palettesmallknife.png
+share/fontforge/pixmaps/palettesmallmag.png
+share/fontforge/pixmaps/palettesmallpen.png
+share/fontforge/pixmaps/palettesmallpencil.png
+share/fontforge/pixmaps/palettesmallperspective.png
+share/fontforge/pixmaps/palettesmallpointer.png
+share/fontforge/pixmaps/palettesmallpoly.png
+share/fontforge/pixmaps/palettesmallrect.png
+share/fontforge/pixmaps/palettesmallrotate.png
+share/fontforge/pixmaps/palettesmallruler.png
+share/fontforge/pixmaps/palettesmallscale.png
+share/fontforge/pixmaps/palettesmallskew.png
+share/fontforge/pixmaps/palettesmallspirocorner.png
+share/fontforge/pixmaps/palettesmallspirocurve.png
+share/fontforge/pixmaps/palettesmallspirog2curve.png
+share/fontforge/pixmaps/palettesmallspiroleft.png
+share/fontforge/pixmaps/palettesmallspiroright.png
+share/fontforge/pixmaps/palettesmallstar.png
+share/fontforge/pixmaps/palettesmalltangent.png
+share/fontforge/pixmaps/palettespirocorner.png
+share/fontforge/pixmaps/palettespirocurve.png
+share/fontforge/pixmaps/palettespirodisabled.png
+share/fontforge/pixmaps/palettespirodown.png
+share/fontforge/pixmaps/palettespirog2curve.png
+share/fontforge/pixmaps/palettespiroleft.png
+share/fontforge/pixmaps/palettespiroright.png
+share/fontforge/pixmaps/palettespiroup.png
+share/fontforge/pixmaps/palettestar.png
+share/fontforge/pixmaps/palettetangent.png
 share/fontforge/pixmaps/pointsG2curve.png
 share/fontforge/pixmaps/pointsaddanchor.png
 share/fontforge/pixmaps/pointscorner.png
@@ -187,6 +276,10 @@ share/fontforge/pixmaps/pointsnamecontour.png
 share/fontforge/pixmaps/pointsspironext.png
 share/fontforge/pixmaps/pointsspiroprev.png
 share/fontforge/pixmaps/pointstangent.png
+share/fontforge/pixmaps/ptinfocorner.png
+share/fontforge/pixmaps/ptinfocurve.png
+share/fontforge/pixmaps/ptinfohvcurve.png
+share/fontforge/pixmaps/ptinfotangent.png
 share/fontforge/pixmaps/python.png
 share/fontforge/pixmaps/styleschangeweight.png
 share/fontforge/pixmaps/styleschangexheight.png
@@ -208,7 +301,7 @@ 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/toolspolygon.png
 share/fontforge/pixmaps/toolsrect.png
 share/fontforge/pixmaps/toolsrotate.png
 share/fontforge/pixmaps/toolsruler.png
@@ -223,6 +316,15 @@ share/fontforge/pixmaps/transformrotate180.png
 share/fontforge/pixmaps/transformrotateccw.png
 share/fontforge/pixmaps/transformrotatecw.png
 share/fontforge/pixmaps/transformskew.png
+share/fontforge/pixmaps/ttdebugcontinue.png
+share/fontforge/pixmaps/ttdebugexit.png
+share/fontforge/pixmaps/ttdebugmenudelta.png
+share/fontforge/pixmaps/ttdebugstepinto.png
+share/fontforge/pixmaps/ttdebugstepout.png
+share/fontforge/pixmaps/ttdebugstepover.png
+share/fontforge/pixmaps/ttdebugstop.png
+share/fontforge/pixmaps/ttdebugstopped.png
+share/fontforge/pixmaps/ttdebugwatchpnt.png
 share/fontforge/pixmaps/viewbiggersize.png
 share/fontforge/pixmaps/viewfindinfont.png
 share/fontforge/pixmaps/viewfit.png
@@ -230,6 +332,7 @@ share/fontforge/pixmaps/viewformer.png
 share/fontforge/pixmaps/viewgoto.png
 share/fontforge/pixmaps/viewinsertafter.png
 share/fontforge/pixmaps/viewinsertbefore.png
+share/fontforge/pixmaps/viewlayers.png
 share/fontforge/pixmaps/viewnext.png
 share/fontforge/pixmaps/viewnextdef.png
 share/fontforge/pixmaps/viewpalettes.png
@@ -240,6 +343,7 @@ share/fontforge/pixmaps/viewsmallersize.png
 share/fontforge/pixmaps/viewzoomin.png
 share/fontforge/pixmaps/viewzoomout.png
 share/fontforge/python/excepthook.py
+share/locale/ca/LC_MESSAGES/FontForge.mo
 share/locale/de/LC_MESSAGES/FontForge.mo
 share/locale/el/LC_MESSAGES/FontForge.mo
 share/locale/en_GB/LC_MESSAGES/FontForge.mo
diff --git a/fonts/fontforge/distinfo b/fonts/fontforge/distinfo
index 6671a10427f..071ad00ecd9 100644
--- a/fonts/fontforge/distinfo
+++ b/fonts/fontforge/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.58 2011/05/02 11:15:42 adam Exp $
+$NetBSD: distinfo,v 1.59 2012/11/23 20:49:03 adam Exp $
 
-SHA1 (fontforge_full-20110222.tar.bz2) = 8fada07647f102351bb1d7d1c4da487356e7142f
-RMD160 (fontforge_full-20110222.tar.bz2) = 7f276e9e3ef673b78355bb7be50f6b2587aee633
-Size (fontforge_full-20110222.tar.bz2) = 5126031 bytes
-SHA1 (patch-aa) = 9b94b0dccc3006112dae8289ed81c5aaba262576
+SHA1 (fontforge_full-20120731-b.tar.bz2) = b520f532b48e557c177dffa29120225066cc4e84
+RMD160 (fontforge_full-20120731-b.tar.bz2) = f752e70df3a1433ed2ddd10201c5cf88367f2959
+Size (fontforge_full-20120731-b.tar.bz2) = 5541994 bytes
+SHA1 (patch-aa) = 106c5adbeb2cdb7b468ef795cf1fdb973ada89f1
 SHA1 (patch-ab) = ec93a47051186bcb901fd145edffad7c457c33fd
-SHA1 (patch-ae) = 2cffc4dad365ff3f7850c1982bbe27bc9821f792
+SHA1 (patch-ae) = 18c976e7723641eda13c70f276113026bae18bc0
+SHA1 (patch-fontforge_macbinary.c) = 263fc55f334d0f3bdd59d4dcca64c4033cb13bad
+SHA1 (patch-gutils_giomime.c) = 77235fc0247dd65066491a44256d6d8531e581ff
diff --git a/fonts/fontforge/patches/patch-aa b/fonts/fontforge/patches/patch-aa
index da962e98abe..b9f2788b1d2 100644
--- a/fonts/fontforge/patches/patch-aa
+++ b/fonts/fontforge/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.10 2011/05/02 11:15:42 adam Exp $
+$NetBSD: patch-aa,v 1.11 2012/11/23 20:49:03 adam Exp $
 
 --- fontforge/Makefile.dynamic.in.orig	2010-02-02 05:23:06.000000000 +0000
 +++ fontforge/Makefile.dynamic.in
-@@ -15,7 +15,7 @@ CC = @CC@
+@@ -17,7 +17,7 @@ CC = @CC@
  O = @O_EXTENSION@
  
  X_CFLAGS = @X_CFLAGS@
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.10 2011/05/02 11:15:42 adam Exp $
  X_11LIB = @X_11LIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
  X_PRE_LIBS = @X_PRE_LIBS@
-@@ -75,7 +75,7 @@ LIBLIBS = -rpath $(libdir) ../libgutils.
+@@ -77,7 +77,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 846655be044..6cf54272f5c 100644
--- a/fonts/fontforge/patches/patch-ae
+++ b/fonts/fontforge/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.23 2011/05/02 11:15:42 adam Exp $
+$NetBSD: patch-ae,v 1.24 2012/11/23 20:49:03 adam Exp $
 
---- configure.orig	2010-04-29 17:53:45.000000000 +0000
+--- configure.orig	2012-08-02 15:09:08.000000000 +0000
 +++ configure
-@@ -20275,14 +20275,14 @@ if test "x$ac_cv_file__usr_include_libxm
+@@ -12608,14 +12608,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.23 2011/05/02 11:15:42 adam Exp $
    ac_cv_file__usr_local_include_libxml2_libxml=yes
  else
    ac_cv_file__usr_local_include_libxml2_libxml=no
-@@ -20291,7 +20291,7 @@ fi
+@@ -12624,7 +12624,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.23 2011/05/02 11:15:42 adam Exp $
  else
    $as_echo "#define _NO_LIBXML 1" >>confdefs.h
  
-@@ -23016,7 +23016,7 @@ if test "$gww_has_gettext" = "yes" >/dev
+@@ -15352,7 +15352,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-fontforge_macbinary.c b/fonts/fontforge/patches/patch-fontforge_macbinary.c
new file mode 100644
index 00000000000..ad3da13265f
--- /dev/null
+++ b/fonts/fontforge/patches/patch-fontforge_macbinary.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-fontforge_macbinary.c,v 1.1 2012/11/23 20:49:04 adam Exp $
+
+Fix OS X headers.
+
+--- fontforge/macbinary.c.orig	2012-11-22 16:48:27.000000000 +0000
++++ fontforge/macbinary.c
+@@ -37,7 +37,7 @@
+ #include "psfont.h"
+ #if __Mac
+ # include <ctype.h>
+-# include </Developer/Headers/FlatCarbon/Files.h>
++#include <CoreServices/CoreServices.h>
+ #else
+ # include <utype.h>
+ #undef __Mac
diff --git a/fonts/fontforge/patches/patch-gutils_giomime.c b/fonts/fontforge/patches/patch-gutils_giomime.c
new file mode 100644
index 00000000000..ff218579d09
--- /dev/null
+++ b/fonts/fontforge/patches/patch-gutils_giomime.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-gutils_giomime.c,v 1.1 2012/11/23 20:49:04 adam Exp $
+
+Fix OS X headers.
+
+--- gutils/giomime.c.orig	2012-11-22 16:44:08.000000000 +0000
++++ gutils/giomime.c
+@@ -65,7 +65,7 @@ unichar_t fontpcf[] = { 'a','p','p','l',
+ unichar_t fontsnf[] = { 'a','p','p','l','i','c','a','t','i','o','n','/','x','-','f','o','n','t','-','s','n','f', '\0' };
+ 
+ #ifdef __Mac
+-#include </Developer/Headers/FlatCarbon/Files.h>
++#include <Carbon/Carbon.h>
+ #define CHR(ch1,ch2,ch3,ch4) (((ch1)<<24)|((ch2)<<16)|((ch3)<<8)|(ch4))
+ 
+ unichar_t *_GioMacMime(const char *path) {