Index: Makefile =================================================================== RCS file: /cvsroot/pkgsrc/fonts/fontforge/Makefile,v retrieving revision 1.82 diff -u -p -r1.82 Makefile --- Makefile 8 Oct 2012 23:01:33 -0000 1.82 +++ Makefile 16 Nov 2012 22:11:39 -0000 @@ -2,7 +2,6 @@ DISTNAME= fontforge_full-${VERSION} PKGNAME= fontforge-${VERSION} -PKGREVISION= 8 CATEGORIES= fonts editors MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fontforge/} EXTRACT_SUFX= .tar.bz2 @@ -12,7 +11,7 @@ HOMEPAGE= http://fontforge.sourceforge.n COMMENT= Postscript font editor LICENSE= modified-bsd -VERSION= 20110222 +VERSION= 20120731-b WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} Index: PLIST =================================================================== RCS file: /cvsroot/pkgsrc/fonts/fontforge/PLIST,v retrieving revision 1.30 diff -u -p -r1.30 PLIST --- PLIST 2 May 2011 11:15:42 -0000 1.30 +++ PLIST 16 Nov 2012 22:11:39 -0000 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.30 2011/05/02 11:15:42 adam Exp $ +@comment $NetBSD$ 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 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.p 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/pointsnamecontou 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/transformrotate1 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. 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 Index: distinfo =================================================================== RCS file: /cvsroot/pkgsrc/fonts/fontforge/distinfo,v retrieving revision 1.58 diff -u -p -r1.58 distinfo --- distinfo 2 May 2011 11:15:42 -0000 1.58 +++ distinfo 16 Nov 2012 22:11:39 -0000 @@ -1,8 +1,8 @@ $NetBSD: distinfo,v 1.58 2011/05/02 11:15:42 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 (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) = 9b94b0dccc3006112dae8289ed81c5aaba262576 SHA1 (patch-ab) = ec93a47051186bcb901fd145edffad7c457c33fd -SHA1 (patch-ae) = 2cffc4dad365ff3f7850c1982bbe27bc9821f792 +SHA1 (patch-ae) = 78cdaa6cff84acec404f6f3baf53076b15d225c4 Index: patches/patch-ae =================================================================== RCS file: /cvsroot/pkgsrc/fonts/fontforge/patches/patch-ae,v retrieving revision 1.23 diff -u -p -r1.23 patch-ae --- patches/patch-ae 2 May 2011 11:15:42 -0000 1.23 +++ patches/patch-ae 16 Nov 2012 22:11:39 -0000 @@ -1,8 +1,6 @@ -$NetBSD: patch-ae,v 1.23 2011/05/02 11:15:42 adam Exp $ - ---- configure.orig 2010-04-29 17:53:45.000000000 +0000 -+++ configure -@@ -20275,14 +20275,14 @@ if test "x$ac_cv_file__usr_include_libxm +--- configure.orig 2012-07-26 11:34:53.000000000 -0500 ++++ configure 2012-11-15 12:17:50.000000000 -0600 +@@ -12608,14 +12608,14 @@ CFLAGS="$CFLAGS -I/usr/include/libxml2/" else @@ -20,7 +18,7 @@ $NetBSD: patch-ae,v 1.23 2011/05/02 11:1 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 @@ { $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 +27,16 @@ $NetBSD: patch-ae,v 1.23 2011/05/02 11:1 else $as_echo "#define _NO_LIBXML 1" >>confdefs.h -@@ -23016,7 +23016,7 @@ if test "$gww_has_gettext" = "yes" >/dev +@@ -15325,7 +15325,7 @@ + + cat $ac_confdir/po/mackeys/Makefile.in + echo 'prefix = @prefix@' >> $ac_confdir/po/mackeys/Makefile.in +- echo 'localedir = $(prefix)/share/locale' >> $ac_confdir/po/mackeys/Makefile.in ++ echo 'localedir = ${PREFIX}/${PKGLOCALEDIR}/locale' >> $ac_confdir/po/mackeys/Makefile.in + echo 'INSTALL = @INSTALL@' >> $ac_confdir/po/mackeys/Makefile.in + echo 'INSTALL_DATA = @INSTALL_DATA@' >> $ac_confdir/po/mackeys/Makefile.in + echo '' >> $ac_confdir/po/mackeys/Makefile.in +@@ -15352,7 +15352,7 @@ cat $ac_confdir/po/Makefile.in echo 'prefix = @prefix@' >> $ac_confdir/po/Makefile.in