Changes 20150824:

This fixes a few bugs, including some in U. F. O. kerning classes and FreeType rasterization, and adds a Korean translation.

12 files changed, 963 insertions, 144 deletions

diff --git a/fonts/fontforge/Makefile b/fonts/fontforge/Makefile
index 56e946150bb..c935cdc84a1 100644
--- a/fonts/fontforge/Makefile
+++ b/fonts/fontforge/Makefile
@@ -1,42 +1,49 @@
-# $NetBSD: Makefile,v 1.94 2015/04/25 14:20:48 tnn Exp $
+# $NetBSD: Makefile,v 1.95 2016/02/07 14:09:08 adam Exp $
 
-DISTNAME=	fontforge_full-20120731-b
-PKGNAME=	${DISTNAME:S/_full//:S/-b//}
-PKGREVISION=	11
+DISTNAME=	fontforge-20150824
 CATEGORIES=	fonts editors
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fontforge/}
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	${MASTER_SITE_GITHUB:=fontforge/}
+GITHUB_PROJECT=	fontforge
+GITHUB_RELEASE=	20150824
 
 MAINTAINER=	adam@NetBSD.org
-HOMEPAGE=	http://fontforge.sourceforge.net/
+HOMEPAGE=	http://fontforge.github.io/
 COMMENT=	Postscript font editor
 LICENSE=	modified-bsd
 
-WRKSRC=			${WRKDIR}/${DISTNAME:S/_full//}
-
 USE_LANGUAGES=		c
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake msgfmt
+USE_TOOLS+=		gmake msgfmt pkg-config
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--without-freetype-src
-CONFIGURE_ARGS+=	--without-python
 
-MAKE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
-LDFLAGS.SunOS+=		-lrt
+PKGCONFIG_OVERRIDE_STAGE=	post-configure
+PKGCONFIG_OVERRIDE+=		libfontforge.pc
+PKGCONFIG_OVERRIDE+=		libfontforgeexe.pc
+
+CHECK_PORTABILITY_SKIP+=osx/FontForge.app/Contents/MacOS/*
+CHECK_INTERPRETER_SKIP+=share/fontforge/python/collab/*
+CHECK_INTERPRETER_SKIP+=share/fontforge/python/gdraw/*
+CHECK_INTERPRETER_SKIP+=share/fontforge/python/simple/*
 
-BROKEN_GETTEXT_DETECTION=	yes
+PY_PATCHPLIST=		yes
 
 .include "options.mk"
 
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
+.include "../../lang/python/application.mk"
+.include "../../lang/python/extension.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../graphics/giflib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/fontforge/PLIST b/fonts/fontforge/PLIST
index e7d6c2f38d8..39887c13d0a 100644
--- a/fonts/fontforge/PLIST
+++ b/fonts/fontforge/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.31 2012/11/23 20:49:03 adam Exp $
+@comment $NetBSD: PLIST,v 1.32 2016/02/07 14:09:08 adam Exp $
 bin/fontforge
 bin/fontimage
 bin/fontlint
@@ -10,18 +10,22 @@ include/fontforge/baseviews.h
 include/fontforge/basics.h
 include/fontforge/bezctx_ff.h
 include/fontforge/bitmapcontrol.h
+include/fontforge/carbon.h
 include/fontforge/chardata.h
 include/fontforge/charset.h
-include/fontforge/config.h
 include/fontforge/configure-fontforge.h
+include/fontforge/cvruler.h
 include/fontforge/delta.h
+include/fontforge/dlist.h
 include/fontforge/dynamic.h
 include/fontforge/edgelist.h
 include/fontforge/edgelist2.h
 include/fontforge/encoding.h
 include/fontforge/fffreetype.h
+include/fontforge/ffglib.h
 include/fontforge/ffpython.h
 include/fontforge/fileutil.h
+include/fontforge/fontforge-config.h
 include/fontforge/fontforge.h
 include/fontforge/fontforgevw.h
 include/fontforge/fvmetrics.h
@@ -32,13 +36,15 @@ include/fontforge/gicons.h
 include/fontforge/gimage.h
 include/fontforge/gio.h
 include/fontforge/gkeysym.h
+include/fontforge/glif_name_hash.h
+include/fontforge/gnetwork.h
 include/fontforge/gprogress.h
 include/fontforge/gresedit.h
 include/fontforge/gresource.h
 include/fontforge/groups.h
+include/fontforge/gutils.h
 include/fontforge/gwidget.h
 include/fontforge/gwwiconv.h
-include/fontforge/import.h
 include/fontforge/intl.h
 include/fontforge/libffstamp.h
 include/fontforge/lookups.h
@@ -62,18 +68,801 @@ include/fontforge/ttf.h
 include/fontforge/ttfinstrs.h
 include/fontforge/uiinterface.h
 include/fontforge/unicoderange.h
+include/fontforge/usermenu.h
 include/fontforge/ustring.h
 include/fontforge/utype.h
 lib/libfontforge.la
+lib/libfontforgeexe.la
 ${PLIST.x11}lib/libgdraw.la
 lib/libgioftp.la
 lib/libgunicode.la
 lib/libgutils.la
-lib/pkgconfig/fontforge.pc
+lib/pkgconfig/libfontforge.pc
+lib/pkgconfig/libfontforgeexe.pc
+${PYSITELIB}/fontforge.la
+${PYSITELIB}/fontforge.so
+${PYSITELIB}/psMat.la
+${PYSITELIB}/psMat.so
 man/man1/fontforge.1
 man/man1/fontimage.1
 man/man1/fontlint.1
 man/man1/sfddiff.1
+share/applications/fontforge.desktop
+share/doc/fontforge/.htaccess
+share/doc/fontforge/AA-Comparison.html
+share/doc/fontforge/AddLookup-Liga.png
+share/doc/fontforge/AmbrosiaFV-bm.png
+share/doc/fontforge/AmbrosiaFV.png
+share/doc/fontforge/Anna.gif
+share/doc/fontforge/Antigone.gif
+share/doc/fontforge/As.png
+share/doc/fontforge/BASEdlg.png
+share/doc/fontforge/BASEfeat.png
+share/doc/fontforge/BASElang.png
+share/doc/fontforge/BDFgrey.html
+share/doc/fontforge/BethSans.png
+share/doc/fontforge/BethSerif.png
+share/doc/fontforge/BexpandBigSerifs.png
+share/doc/fontforge/BexpandCJK.png
+share/doc/fontforge/BexpandLCG.png
+share/doc/fontforge/BexpandLCGsquish.png
+share/doc/fontforge/Big5.txt
+share/doc/fontforge/BitmapReference.png
+share/doc/fontforge/BitmapView.png
+share/doc/fontforge/BoldHiraDA.png
+share/doc/fontforge/BottomSerif.png
+share/doc/fontforge/Bperspective.png
+share/doc/fontforge/C1.png
+share/doc/fontforge/C10.png
+share/doc/fontforge/C2.png
+share/doc/fontforge/C3.png
+share/doc/fontforge/C4.png
+share/doc/fontforge/C5.png
+share/doc/fontforge/C6.png
+share/doc/fontforge/C7.png
+share/doc/fontforge/C8.png
+share/doc/fontforge/C9.png
+share/doc/fontforge/CaslonOriginality.png
+share/doc/fontforge/ChangeGlyph1Dlg.png
+share/doc/fontforge/ChangeGlyph2Dlg.png
+share/doc/fontforge/ChangeGlyph3Dlg.png
+share/doc/fontforge/ChangeWeight.png
+share/doc/fontforge/ChangeXHeightDlg.png
+share/doc/fontforge/CharPrint.png
+share/doc/fontforge/ClippedA.png
+share/doc/fontforge/ClippedARaster.png
+share/doc/fontforge/CondenseExtend.png
+share/doc/fontforge/Constrain1_1.png
+share/doc/fontforge/Constrain1_2.png
+share/doc/fontforge/Constrain2_1.png
+share/doc/fontforge/Constrain2_2.png
+share/doc/fontforge/Cspirals.png
+share/doc/fontforge/Cspiro0.png
+share/doc/fontforge/Cspiro1.png
+share/doc/fontforge/Cspiro10.png
+share/doc/fontforge/Cspiro2.png
+share/doc/fontforge/Cspiro3.png
+share/doc/fontforge/Cspiro4.png
+share/doc/fontforge/Cspiro5.png
+share/doc/fontforge/Cspiro6.png
+share/doc/fontforge/Cspiro6_5.png
+share/doc/fontforge/Cspiro7.png
+share/doc/fontforge/Cspiro8.png
+share/doc/fontforge/Cspiro9.png
+share/doc/fontforge/CyrilItalicComp.png
+share/doc/fontforge/DisplayFonts.png
+share/doc/fontforge/Eback.png
+share/doc/fontforge/EbackTtf.png
+share/doc/fontforge/Efore.png
+share/doc/fontforge/EforeTtf.png
+share/doc/fontforge/Ehinted.png
+share/doc/fontforge/EhintedTtf.png
+share/doc/fontforge/Eperspective.png
+share/doc/fontforge/FF32.png
+share/doc/fontforge/FFmacotfIcon.png
+share/doc/fontforge/FFsfd32.png
+share/doc/fontforge/FVHMetrics.png
+share/doc/fontforge/FVVMetrics.png
+share/doc/fontforge/FlatSerif.png
+share/doc/fontforge/FontDisplay.png
+share/doc/fontforge/FontForge.css
+share/doc/fontforge/FontForgeSplash.png
+share/doc/fontforge/FontImage.png
+share/doc/fontforge/FontSample.png
+share/doc/fontforge/GButton.png
+share/doc/fontforge/GCancelButton.png
+share/doc/fontforge/GComboBox.png
+share/doc/fontforge/GComboBoxMenu.png
+share/doc/fontforge/GDefaultButton.png
+share/doc/fontforge/GDropList.png
+share/doc/fontforge/GLabel.png
+share/doc/fontforge/GListMark.png
+share/doc/fontforge/GMatrixEdit.png
+share/doc/fontforge/GNumericField.png
+share/doc/fontforge/GNumericFieldSpinner.png
+share/doc/fontforge/GRadio.png
+share/doc/fontforge/GSUB-Order.png
+share/doc/fontforge/GTextField.png
+share/doc/fontforge/GenerateFamily.png
+share/doc/fontforge/GenerateOptions.png
+share/doc/fontforge/GenerateTTC.png
+share/doc/fontforge/GlossaryFS.html
+share/doc/fontforge/GlossaryFrame.html
+share/doc/fontforge/GlyphSep-To.png
+share/doc/fontforge/GlyphSep-rectangles.png
+share/doc/fontforge/GradientDlg.png
+share/doc/fontforge/GridFit.png
+share/doc/fontforge/GridFitM.png
+share/doc/fontforge/H-bm.png
+share/doc/fontforge/H-gm.png
+share/doc/fontforge/HI.hints.png
+share/doc/fontforge/HI.nohints.png
+share/doc/fontforge/HebrewMetrics.png
+share/doc/fontforge/HebrewSerifs.png
+share/doc/fontforge/Hints.png
+share/doc/fontforge/HotKeys.html
+share/doc/fontforge/IndexFS.html
+share/doc/fontforge/IndexFrame.html
+share/doc/fontforge/InsertTextDlg.html
+share/doc/fontforge/InsertTxtDlg.png
+share/doc/fontforge/ItalicCompCaslon.png
+share/doc/fontforge/ItalicCompGalliard.png
+share/doc/fontforge/ItalicDlg.png
+share/doc/fontforge/JustOutside.png
+share/doc/fontforge/JustifyDlg.png
+share/doc/fontforge/JustifyExtenderDlg.png
+share/doc/fontforge/JustifyLangDlg.png
+share/doc/fontforge/JustifyLookupDlg.png
+share/doc/fontforge/KernPairs.png
+share/doc/fontforge/LinearGradient.png
+share/doc/fontforge/MATH-Constants.png
+share/doc/fontforge/MATH-Exten.png
+share/doc/fontforge/MATH-GlyphConstructed.png
+share/doc/fontforge/MATH-GlyphConstruction.png
+share/doc/fontforge/MATH-GlyphConstructionDlg.png
+share/doc/fontforge/MATH-Italic.png
+share/doc/fontforge/MATH-MathKern.png
+share/doc/fontforge/MATH-MathKernGraph.png
+share/doc/fontforge/MATH-MathKernText.png
+share/doc/fontforge/MATH-TopAccent.png
+share/doc/fontforge/MATH-VertVariants.png
+share/doc/fontforge/MacFeatName.png
+share/doc/fontforge/MacMapping.png
+share/doc/fontforge/MassRename.png
+share/doc/fontforge/MenuWithMacIcons.png
+share/doc/fontforge/MenuWithoutMacIcons.png
+share/doc/fontforge/Metal-fontforge-600.jpeg
+share/doc/fontforge/MetalType.jpeg
+share/doc/fontforge/MetricsView-features.png
+share/doc/fontforge/MetricsView.png
+share/doc/fontforge/MultiPrint.png
+share/doc/fontforge/NoPointHint.png
+share/doc/fontforge/OFL-FAQ-Unofficial-fr.html
+share/doc/fontforge/OFL-FAQ-Unofficial-vi.html
+share/doc/fontforge/OFL-Unofficial-el.html
+share/doc/fontforge/OFL-Unofficial-fr.html
+share/doc/fontforge/OFL-Unofficial-pl.html
+share/doc/fontforge/OFL-Unofficial-vi.html
+share/doc/fontforge/OFL-Unofficial.html
+share/doc/fontforge/OutlineInline.png
+share/doc/fontforge/PageSetup.png
+share/doc/fontforge/PathToBind.png
+share/doc/fontforge/PfaEdit-TeX.html
+share/doc/fontforge/PfaEdits.gif
+share/doc/fontforge/PoV.png
+share/doc/fontforge/Print.png
+share/doc/fontforge/QGDlg.png
+share/doc/fontforge/QGList.png
+share/doc/fontforge/RadialGradient.png
+share/doc/fontforge/RadialGradientDlg.png
+share/doc/fontforge/ReviewHints.png
+share/doc/fontforge/SelectByATT.png
+share/doc/fontforge/Shades.png
+share/doc/fontforge/Shades2.png
+share/doc/fontforge/Shades4.png
+share/doc/fontforge/ShadowWireframe.png
+share/doc/fontforge/ShowGridFit.png
+share/doc/fontforge/Sigma13x16.png
+share/doc/fontforge/Sigma28x33.png
+share/doc/fontforge/Sigma54x64.png
+share/doc/fontforge/SmallcapsDlg.png
+share/doc/fontforge/Spacem_1.png
+share/doc/fontforge/Spacem_2.png
+share/doc/fontforge/Styles.html
+share/doc/fontforge/SubSuperDlg.png
+share/doc/fontforge/SuggestDeltas.html
+share/doc/fontforge/TTCvt.png
+share/doc/fontforge/TTPoints.png
+share/doc/fontforge/TTRaster.png
+share/doc/fontforge/TTRegisters.png
+share/doc/fontforge/TTStack.png
+share/doc/fontforge/TTStorage.png
+share/doc/fontforge/TTgloss.png
+share/doc/fontforge/TextBoundDistortedGlyphs.png
+share/doc/fontforge/TextBoundUnitaryGlyph.png
+share/doc/fontforge/TextUnbound.png
+share/doc/fontforge/Tile.png
+share/doc/fontforge/TilePath.png
+share/doc/fontforge/TilePath2.png
+share/doc/fontforge/TilePattern.png
+share/doc/fontforge/TilePatternDlg.png
+share/doc/fontforge/TiledPattern.png
+share/doc/fontforge/TiledPattern45.png
+share/doc/fontforge/To-kerned.png
+share/doc/fontforge/To-unkerned.png
+share/doc/fontforge/Tricolor.png
+share/doc/fontforge/TrueOpenTables.html
+share/doc/fontforge/UniqueID.html
+share/doc/fontforge/VerticalMetrics.png
+share/doc/fontforge/aItalic.png
+share/doc/fontforge/a_dieresis_macron.png
+share/doc/fontforge/a_with_anchor.png
+share/doc/fontforge/aacutebase.png
+share/doc/fontforge/aacutemid.png
+share/doc/fontforge/accented.html
+share/doc/fontforge/acenter.png
+share/doc/fontforge/acorn2sfd.html
+share/doc/fontforge/addlookup-kern.png
+share/doc/fontforge/agetinfo.png
+share/doc/fontforge/agrave_anchored.png
+share/doc/fontforge/ahighest.png
+share/doc/fontforge/alignedBaselines.png
+share/doc/fontforge/allgreek.png
+share/doc/fontforge/alphakappaiota.png
+share/doc/fontforge/alphakappaiotatheta.png
+share/doc/fontforge/anchorcontrol-base.png
+share/doc/fontforge/anchorcontrol-mark.png
+share/doc/fontforge/anchorcontrol.html
+share/doc/fontforge/arabic-seen.png
+share/doc/fontforge/asm1.png
+share/doc/fontforge/asm2.png
+share/doc/fontforge/asm3.png
+share/doc/fontforge/asm4.png
+share/doc/fontforge/autotrace.html
+share/doc/fontforge/autowidth.html
+share/doc/fontforge/autowidth.png
+share/doc/fontforge/baseline.html
+share/doc/fontforge/bdfinfo.html
+share/doc/fontforge/bdfinfo.png
+share/doc/fontforge/bed-script.png
+share/doc/fontforge/bezier.gif
+share/doc/fontforge/bezier.html
+share/doc/fontforge/bibliography.html
+share/doc/fontforge/bitmapchar.png
+share/doc/fontforge/bitmaponlysfnt.html
+share/doc/fontforge/bitmapsavail.png
+share/doc/fontforge/bitmapview.html
+share/doc/fontforge/boustrophedon.png
+share/doc/fontforge/bowlweb.gif
+share/doc/fontforge/bvlayers.png
+share/doc/fontforge/bvtools.png
+share/doc/fontforge/cap-height.png
+share/doc/fontforge/changelog.html
+share/doc/fontforge/charinfo-comment.png
+share/doc/fontforge/charinfo-comp.png
+share/doc/fontforge/charinfo-counters.png
+share/doc/fontforge/charinfo-lig.png
+share/doc/fontforge/charinfo-pos.png
+share/doc/fontforge/charinfo-subs.png
+share/doc/fontforge/charinfo-tex.png
+share/doc/fontforge/charinfo-tilesize.png
+share/doc/fontforge/charinfo-variants.png
+share/doc/fontforge/charinfo.html
+share/doc/fontforge/charinfo.png
+share/doc/fontforge/charview-multilayer.png
+share/doc/fontforge/charview-quadratic.png
+share/doc/fontforge/charview-vert.png
+share/doc/fontforge/charview.html
+share/doc/fontforge/charview2.png
+share/doc/fontforge/charwithhintmask.png
+share/doc/fontforge/cidmapformat.html
+share/doc/fontforge/cidmenu.html
+share/doc/fontforge/cliargs.html
+share/doc/fontforge/colorbutton.png
+share/doc/fontforge/colorpicker.jpeg
+share/doc/fontforge/contextchain-class.png
+share/doc/fontforge/contextchain-classlist.png
+share/doc/fontforge/contextchain-coverage.png
+share/doc/fontforge/contextchain-format.png
+share/doc/fontforge/contextchain-glyphlists.png
+share/doc/fontforge/contextchain-pickglyph.png
+share/doc/fontforge/contextchain-rcover.png
+share/doc/fontforge/contextchain-simpleclasses.png
+share/doc/fontforge/contextchain-simplecoverage.png
+share/doc/fontforge/contextchain-simpleglyph.png
+share/doc/fontforge/contextchain.html
+share/doc/fontforge/copyfeatures.png
+share/doc/fontforge/corpchar.html
+share/doc/fontforge/corpchar.txt
+share/doc/fontforge/cpinfo.png
+share/doc/fontforge/cpodd.png
+share/doc/fontforge/cubic2quad.png
+share/doc/fontforge/cvarrowicon.png
+share/doc/fontforge/cvcornericon.png
+share/doc/fontforge/cvcurveicon.png
+share/doc/fontforge/cvdebug.png
+share/doc/fontforge/cvellipseicon.png
+share/doc/fontforge/cvflipicon.png
+share/doc/fontforge/cvfreehandicon.png
+share/doc/fontforge/cvhandicon.png
+share/doc/fontforge/cvhvcurveicon.png
+share/doc/fontforge/cvknifeicon.png
+share/doc/fontforge/cvmagicon.png
+share/doc/fontforge/cvpenicon.png
+share/doc/fontforge/cvperspectiveicon.png
+share/doc/fontforge/cvpolyicon.png
+share/doc/fontforge/cvrecticon.png
+share/doc/fontforge/cvrotate3dicon.png
+share/doc/fontforge/cvrotateicon.png
+share/doc/fontforge/cvrulericon.png
+share/doc/fontforge/cvscaleicon.png
+share/doc/fontforge/cvskewicon.png
+share/doc/fontforge/cvspiroG2icon.png
+share/doc/fontforge/cvspiroG4icon.png
+share/doc/fontforge/cvspirocornericon.png
+share/doc/fontforge/cvspirolefticon.png
+share/doc/fontforge/cvspiromodeicon.png
+share/doc/fontforge/cvspirorighticon.png
+share/doc/fontforge/cvstaricon.png
+share/doc/fontforge/cvt-to-mac.png
+share/doc/fontforge/cvtangenticon.png
+share/doc/fontforge/definegroups.png
+share/doc/fontforge/delta0.png
+share/doc/fontforge/delta1.png
+share/doc/fontforge/devaBaseline.png
+share/doc/fontforge/devaHangBaseline.png
+share/doc/fontforge/devaLatinBaseline.png
+share/doc/fontforge/diffs.html
+share/doc/fontforge/display.html
+share/doc/fontforge/displaygroups.png
+share/doc/fontforge/donate.png
+share/doc/fontforge/doublestruck-B.png
+share/doc/fontforge/eItalic.png
+share/doc/fontforge/editcvt.png
+share/doc/fontforge/editexample-fr.html
+share/doc/fontforge/editexample.html
+share/doc/fontforge/editexample2.html
+share/doc/fontforge/editexample3.html
+share/doc/fontforge/editexample4.html
+share/doc/fontforge/editexample5.html
+share/doc/fontforge/editexample6-5.html
+share/doc/fontforge/editexample6.html
+share/doc/fontforge/editexample7.html
+share/doc/fontforge/editexample8.html
+share/doc/fontforge/editmenu.html
+share/doc/fontforge/editspiro.html
+share/doc/fontforge/edittransition-context.png
+share/doc/fontforge/edittransition-indic.png
+share/doc/fontforge/edittransition-insert.png
+share/doc/fontforge/edittransition-kern.png
+share/doc/fontforge/elementmenu.html
+share/doc/fontforge/emptyfont-A-sel.png
+share/doc/fontforge/emptyhlig.png
+share/doc/fontforge/encodingmenu.html
+share/doc/fontforge/errrecovery.html
+share/doc/fontforge/exclude-post.png
+share/doc/fontforge/exclude-pre.png
+share/doc/fontforge/expand-joint-post.png
+share/doc/fontforge/expand-joint-pre.png
+share/doc/fontforge/expand-post.png
+share/doc/fontforge/expand-pre.png
+share/doc/fontforge/expandedlines.png
+share/doc/fontforge/expandstroke.png
+share/doc/fontforge/extrema-poi.png
+share/doc/fontforge/f+i.png
+share/doc/fontforge/fItalic.png
+share/doc/fontforge/faq.html
+share/doc/fontforge/faqFS.html
+share/doc/fontforge/faqFrame.html
+share/doc/fontforge/featsetdlg.png
+share/doc/fontforge/featurefile.html
+share/doc/fontforge/ff-history.html
+share/doc/fontforge/ffanvil16.png
+share/doc/fontforge/ffanvil300.png
+share/doc/fontforge/ffanvil32.png
+share/doc/fontforge/ffcartouche.png
+share/doc/fontforge/ffdownload.png
+share/doc/fontforge/ffi-caret.png
+share/doc/fontforge/ffi-moved.png
+share/doc/fontforge/ffi-refs.png
+share/doc/fontforge/ffi-rmoverlap.png
+share/doc/fontforge/ffi-unlink.png
+share/doc/fontforge/fftype16.png
+share/doc/fontforge/fftype300.svg
+share/doc/fontforge/fftype32.png
+share/doc/fontforge/fi.png
+share/doc/fontforge/filemenu.html
+share/doc/fontforge/files.html
+share/doc/fontforge/findprobs-att.png
+share/doc/fontforge/findprobs-bb.png
+share/doc/fontforge/findprobs-cid.png
+share/doc/fontforge/findprobs-hint.png
+share/doc/fontforge/findprobs-paths.png
+share/doc/fontforge/findprobs-random.png
+share/doc/fontforge/findprobs-refs.png
+share/doc/fontforge/findprobs.png
+share/doc/fontforge/flags/BrasilFlag.png
+share/doc/fontforge/flags/English.gif
+share/doc/fontforge/flags/GermanFlag.png
+share/doc/fontforge/flags/Greece.png
+share/doc/fontforge/flags/Nisshoki-Japan.png
+share/doc/fontforge/flags/Polish.png
+share/doc/fontforge/flags/RussianFlag.png
+share/doc/fontforge/flags/StarsStripes.gif
+share/doc/fontforge/flags/Tricolor.gif
+share/doc/fontforge/flags/UnionJack.gif
+share/doc/fontforge/flags/VietnamFlag.png
+share/doc/fontforge/flags/taiwan.png
+share/doc/fontforge/floating-A.png
+share/doc/fontforge/fontcompdlg.png
+share/doc/fontforge/fontcompresults.png
+share/doc/fontforge/fontforge-banner-420.jpeg
+share/doc/fontforge/fontforge-themes.html
+share/doc/fontforge/fontforge-tutorial.pdf
+share/doc/fontforge/fontimage.html
+share/doc/fontforge/fontinfo-charsets.png
+share/doc/fontforge/fontinfo-cid.png
+share/doc/fontforge/fontinfo-comment.png
+share/doc/fontforge/fontinfo-gasp.png
+share/doc/fontforge/fontinfo-general.png
+share/doc/fontforge/fontinfo-layers.png
+share/doc/fontforge/fontinfo-lookups.png
+share/doc/fontforge/fontinfo-macfeat.png
+share/doc/fontforge/fontinfo-macstyle.png
+share/doc/fontforge/fontinfo-markclasses.png
+share/doc/fontforge/fontinfo-marksets.png
+share/doc/fontforge/fontinfo-panose.png
+share/doc/fontforge/fontinfo-private.png
+share/doc/fontforge/fontinfo-psuid.png
+share/doc/fontforge/fontinfo-size.png
+share/doc/fontforge/fontinfo-ssnames.png
+share/doc/fontforge/fontinfo-subsup.png
+share/doc/fontforge/fontinfo-tex.png
+share/doc/fontforge/fontinfo-ttfmetrics.png
+share/doc/fontforge/fontinfo-ttfname-bigedit.png
+share/doc/fontforge/fontinfo-ttfname.png
+share/doc/fontforge/fontinfo-ttfvals.png
+share/doc/fontforge/fontinfo-unicode.png
+share/doc/fontforge/fontinfo-woff.png
+share/doc/fontforge/fontinfo.html
+share/doc/fontforge/fontinfo.png
+share/doc/fontforge/fontlint.html
+share/doc/fontforge/fontstyles.html
+share/doc/fontforge/fontutils.html
+share/doc/fontforge/fontview-cid.png
+share/doc/fontforge/fontview-grouped.png
+share/doc/fontforge/fontview.fr.png
+share/doc/fontforge/fontview.html
+share/doc/fontforge/fontview.ru.png
+share/doc/fontforge/fraktur-A.png
+share/doc/fontforge/freehandctl.png
+share/doc/fontforge/future.html
+share/doc/fontforge/fv-normal.png
+share/doc/fontforge/fv-smallcaps.png
+share/doc/fontforge/fvOutOfDateHinting.png
+share/doc/fontforge/generate-upload.png
+share/doc/fontforge/generate.html
+share/doc/fontforge/generate.png
+share/doc/fontforge/getinfo.html
+share/doc/fontforge/glossary.html
+share/doc/fontforge/glyphinfo-one.png
+share/doc/fontforge/gposgsub.html
+share/doc/fontforge/grave_with_anchor.png
+share/doc/fontforge/greymapedit.png
+share/doc/fontforge/greymapsavail.png
+share/doc/fontforge/groups.html
+share/doc/fontforge/helpmenu.html
+share/doc/fontforge/hexley.png
+share/doc/fontforge/hintboundingbox.png
+share/doc/fontforge/hintdiagonalends.png
+share/doc/fontforge/hintdiagonalinter.png
+share/doc/fontforge/hinting.html
+share/doc/fontforge/hintmaskinfo.png
+share/doc/fontforge/hintsmenu.html
+share/doc/fontforge/histogram.html
+share/doc/fontforge/histogram.png
+share/doc/fontforge/hligaheadruledone.png
+share/doc/fontforge/hligallrulesdone.png
+share/doc/fontforge/hligback.png
+share/doc/fontforge/hligbacknomatch.png
+share/doc/fontforge/hligbackrule.png
+share/doc/fontforge/hligbackruledone.png
+share/doc/fontforge/hligbyclasses.png
+share/doc/fontforge/hliggreekahead.png
+share/doc/fontforge/hliggreekback.png
+share/doc/fontforge/hliggreekclass.png
+share/doc/fontforge/hligiotaclass.png
+share/doc/fontforge/hligkappa.png
+share/doc/fontforge/hligkappaclass.png
+share/doc/fontforge/hligkappaiota.png
+share/doc/fontforge/hligmatchsubs.png
+share/doc/fontforge/hlignewrule.png
+share/doc/fontforge/hligrule.png
+share/doc/fontforge/hligseqdlg.png
+share/doc/fontforge/hotkeys.jpeg
+share/doc/fontforge/i1.png
+share/doc/fontforge/i2.png
+share/doc/fontforge/i3.png
+share/doc/fontforge/i4.png
+share/doc/fontforge/import.png
+share/doc/fontforge/importexample.html
+share/doc/fontforge/index.html
+share/doc/fontforge/intersect-post.png
+share/doc/fontforge/justify.html
+share/doc/fontforge/k1.png
+share/doc/fontforge/k2.png
+share/doc/fontforge/k3.png
+share/doc/fontforge/k4.png
+share/doc/fontforge/k5.png
+share/doc/fontforge/k6.png
+share/doc/fontforge/ka-change.png
+share/doc/fontforge/kanjichar.png
+share/doc/fontforge/kanjifont.png
+share/doc/fontforge/kappa_iota-context.png
+share/doc/fontforge/kappa_iota-lookup.png
+share/doc/fontforge/kappa_iota-subtable.png
+share/doc/fontforge/kappaiota-lookups.png
+share/doc/fontforge/kappaiotatheta.png
+share/doc/fontforge/kern-We-12.png
+share/doc/fontforge/kern-We-150.png
+share/doc/fontforge/kernbyclasses.png
+share/doc/fontforge/kerningclass.png
+share/doc/fontforge/kerningformat.png
+share/doc/fontforge/kernpairclose.png
+share/doc/fontforge/kernpairs.html
+share/doc/fontforge/l1.png
+share/doc/fontforge/l10.png
+share/doc/fontforge/l2.png
+share/doc/fontforge/l3.png
+share/doc/fontforge/l4.png
+share/doc/fontforge/l5.png
+share/doc/fontforge/l6.png
+share/doc/fontforge/l7.png
+share/doc/fontforge/l8.png
+share/doc/fontforge/l9.png
+share/doc/fontforge/lang-dlg.png
+share/doc/fontforge/latinBaseline.png
+share/doc/fontforge/latinHangBaseline.png
+share/doc/fontforge/latinNormalBaseline.png
+share/doc/fontforge/layerdlg.png
+share/doc/fontforge/layers.png
+share/doc/fontforge/lcani.gif
+share/doc/fontforge/lcdigits.png
+share/doc/fontforge/license.html
+share/doc/fontforge/logo3.gif
+share/doc/fontforge/lookup-metadata.png
+share/doc/fontforge/lookups.html
+share/doc/fontforge/lparen-108.png
+share/doc/fontforge/mItalic.png
+share/doc/fontforge/mac-install.html
+share/doc/fontforge/macFeatureSetting.png
+share/doc/fontforge/macfeature.png
+share/doc/fontforge/macformats.html
+share/doc/fontforge/mad.html
+share/doc/fontforge/manual-ja-hover.png
+share/doc/fontforge/manual-ja.png
+share/doc/fontforge/math.html
+share/doc/fontforge/menu_down.png
+share/doc/fontforge/mergepost.png
+share/doc/fontforge/mergepre.png
+share/doc/fontforge/metrics-kappa_iota.png
+share/doc/fontforge/metricsmenu.html
+share/doc/fontforge/metricsview.html
+share/doc/fontforge/misalignedBaselines.png
+share/doc/fontforge/mmappleaxes.png
+share/doc/fontforge/mmaxes.png
+share/doc/fontforge/mmcharview.png
+share/doc/fontforge/mmcounts.png
+share/doc/fontforge/mmdesigns.png
+share/doc/fontforge/mmextrapolate2.png
+share/doc/fontforge/mmfinal.png
+share/doc/fontforge/mmfuncs.png
+share/doc/fontforge/mmmenu.html
+share/doc/fontforge/mmnamedstyles.png
+share/doc/fontforge/mmnamingastyle.png
+share/doc/fontforge/ms-install.html
+share/doc/fontforge/multilayer.html
+share/doc/fontforge/multiplemaster.html
+share/doc/fontforge/newanchor.png
+share/doc/fontforge/newcountermask.png
+share/doc/fontforge/newfont.png
+share/doc/fontforge/nix-install.html
+share/doc/fontforge/non-linear.png
+share/doc/fontforge/non-standard.html
+share/doc/fontforge/nonBMP/index.html
+share/doc/fontforge/nvd.html
+share/doc/fontforge/o-baddir.png
+share/doc/fontforge/o1.png
+share/doc/fontforge/o2.png
+share/doc/fontforge/o3.png
+share/doc/fontforge/o4.png
+share/doc/fontforge/o5.png
+share/doc/fontforge/oldchangelog.html
+share/doc/fontforge/openfont.png
+share/doc/fontforge/otherlinks.html
+share/doc/fontforge/outlinechar.png
+share/doc/fontforge/overlappedlines.png
+share/doc/fontforge/overshoot.png
+share/doc/fontforge/overview.html
+share/doc/fontforge/palmfonts.html
+share/doc/fontforge/pcf-format.html
+share/doc/fontforge/pfaeditchangelog.html
+share/doc/fontforge/pfaeditmath.html
+share/doc/fontforge/phi-hints-filled.png
+share/doc/fontforge/phi-hints-outline.png
+share/doc/fontforge/phi-nohints-filled.png
+share/doc/fontforge/phi-nohints-outline.png
+share/doc/fontforge/plugins.html
+share/doc/fontforge/pnts.gif
+share/doc/fontforge/pointinfo-interp.png
+share/doc/fontforge/pointinfo.png
+share/doc/fontforge/pointmenu.html
+share/doc/fontforge/pointsize.png
+share/doc/fontforge/prefs-accent.png
+share/doc/fontforge/prefs-apps.png
+share/doc/fontforge/prefs-editing.png
+share/doc/fontforge/prefs-font.png
+share/doc/fontforge/prefs-generate.png
+share/doc/fontforge/prefs-generic.png
+share/doc/fontforge/prefs-macfeat.png
+share/doc/fontforge/prefs-macmap.png
+share/doc/fontforge/prefs-navigation.png
+share/doc/fontforge/prefs-newfont.png
+share/doc/fontforge/prefs-openfont.png
+share/doc/fontforge/prefs-opentype.png
+share/doc/fontforge/prefs-pshints.png
+share/doc/fontforge/prefs-script.png
+share/doc/fontforge/prefs-sync.png
+share/doc/fontforge/prefs-tt.png
+share/doc/fontforge/prefs-ttinstrs.png
+share/doc/fontforge/prefs.html
+share/doc/fontforge/privatekey.png
+share/doc/fontforge/privatekeymenu.png
+share/doc/fontforge/problems.html
+share/doc/fontforge/python.html
+share/doc/fontforge/quadbezier.gif
+share/doc/fontforge/quadbezier.png
+share/doc/fontforge/quadraticspline.gif
+share/doc/fontforge/quadraticspline.png
+share/doc/fontforge/quotations.html
+share/doc/fontforge/realindex.html
+share/doc/fontforge/ref-caveats.html
+share/doc/fontforge/removefeature.png
+share/doc/fontforge/resedit.html
+share/doc/fontforge/resedit.png
+share/doc/fontforge/retagfeature.png
+share/doc/fontforge/rgetinfo.png
+share/doc/fontforge/rparen-108.png
+share/doc/fontforge/rplprocess.png
+share/doc/fontforge/rplref.png
+share/doc/fontforge/rplsansserifs.png
+share/doc/fontforge/rplserifs.png
+share/doc/fontforge/ruler.png
+share/doc/fontforge/running.html
+share/doc/fontforge/sans-serif-def.png
+share/doc/fontforge/script-A.png
+share/doc/fontforge/script-lang-dlg.png
+share/doc/fontforge/scripting-alpha.html
+share/doc/fontforge/scripting-tutorial.html
+share/doc/fontforge/scripting.html
+share/doc/fontforge/scriptnotes.html
+share/doc/fontforge/search.html
+share/doc/fontforge/selectbyatt.html
+share/doc/fontforge/selections.html
+share/doc/fontforge/serif-def.png
+share/doc/fontforge/serif.png
+share/doc/fontforge/serif2.png
+share/doc/fontforge/setwidth.png
+share/doc/fontforge/sfd.html
+share/doc/fontforge/sfdchangelog.html
+share/doc/fontforge/sfddiff.html
+share/doc/fontforge/sfdformat.html
+share/doc/fontforge/short-long-s.png
+share/doc/fontforge/showatt.html
+share/doc/fontforge/showatt.png
+share/doc/fontforge/sidebearings.png
+share/doc/fontforge/sm-picture.png
+share/doc/fontforge/source-build.html
+share/doc/fontforge/spacekappaiotaspace.png
+share/doc/fontforge/spacer1x20.png
+share/doc/fontforge/spironextconstraint.png
+share/doc/fontforge/spiropointinfo.png
+share/doc/fontforge/spiroprevconstraint.png
+share/doc/fontforge/splinefont.html
+share/doc/fontforge/splines.gif
+share/doc/fontforge/src.html
+share/doc/fontforge/statemachine-context.png
+share/doc/fontforge/statemachine-indic.png
+share/doc/fontforge/statemachine-insert.png
+share/doc/fontforge/statemachine.html
+share/doc/fontforge/strokechar.png
+share/doc/fontforge/subtable-ffi.png
+share/doc/fontforge/subtable-gpos-anchor.png
+share/doc/fontforge/subtable-gpos-kernpair.png
+share/doc/fontforge/subtable-gpos-singlefull.png
+share/doc/fontforge/subtable-gpos-singlehide.png
+share/doc/fontforge/subtable-gsub-ligature.png
+share/doc/fontforge/subtable-gsub-single.png
+share/doc/fontforge/subtable-oldstyle.png
+share/doc/fontforge/subtable-to.png
+share/doc/fontforge/tilepath-center.png
+share/doc/fontforge/tilepath-final.png
+share/doc/fontforge/tilepath-left.png
+share/doc/fontforge/tilepath-orig.png
+share/doc/fontforge/tilepath-right.png
+share/doc/fontforge/tilepath-scale.png
+share/doc/fontforge/tilepath-selection.png
+share/doc/fontforge/tilepath-tile.png
+share/doc/fontforge/tilepath-ts.png
+share/doc/fontforge/tilepath.html
+share/doc/fontforge/tools.png
+share/doc/fontforge/toolsmenu.html
+share/doc/fontforge/transform.html
+share/doc/fontforge/transform.png
+share/doc/fontforge/transition-context.png
+share/doc/fontforge/transition-indic.png
+share/doc/fontforge/transition-insert.png
+share/doc/fontforge/transition-kern.png
+share/doc/fontforge/ttfinstrs-edit.png
+share/doc/fontforge/ttfinstrs-view.png
+share/doc/fontforge/ttfinstrs.html
+share/doc/fontforge/tutorial-ja-hover.png
+share/doc/fontforge/tutorial-ja.png
+share/doc/fontforge/tutorial-zh_TW-hover.png
+share/doc/fontforge/tutorial-zh_TW.png
+share/doc/fontforge/twolines.png
+share/doc/fontforge/u432Italic.png
+share/doc/fontforge/u433Italic.png
+share/doc/fontforge/ucEItalic.png
+share/doc/fontforge/uitranslationnotes.html
+share/doc/fontforge/uninstall.html
+share/doc/fontforge/vItalic.png
+share/doc/fontforge/validation.html
+share/doc/fontforge/validation.png
+share/doc/fontforge/viewmenu.html
+share/doc/fontforge/views.html
+share/doc/fontforge/vms-install.html
+share/doc/fontforge/wItalic.png
+share/doc/fontforge/wacom.html
+share/doc/fontforge/windowmenu.html
+share/doc/fontforge/x-height.png
+share/doc/fontforge/xItalic.png
+share/doc/fontforge/xim.html
+share/doc/fontforge/xres.html
+share/fontforge/Adobe-CNS1-6.cidmap
+share/fontforge/Adobe-GB1-5.cidmap
+share/fontforge/Adobe-Identity-0.cidmap
+share/fontforge/Adobe-Japan1-5.cidmap
+share/fontforge/Adobe-Japan1-6.cidmap
+share/fontforge/Adobe-Japan2-0.cidmap
+share/fontforge/Adobe-Korea1-2.cidmap
+share/fontforge/hotkeys/default
+share/fontforge/nodejs/collabwebview/client.html
+share/fontforge/nodejs/collabwebview/css/print.css
+share/fontforge/nodejs/collabwebview/css/styles.css
+share/fontforge/nodejs/collabwebview/index.html
+share/fontforge/nodejs/collabwebview/js/constants.js
+share/fontforge/nodejs/collabwebview/js/contentEditable/component.json
+share/fontforge/nodejs/collabwebview/js/contentEditable/contenteditable.jquery.json
+share/fontforge/nodejs/collabwebview/js/contentEditable/example.html
+share/fontforge/nodejs/collabwebview/js/contentEditable/jquery.contenteditable.js
+share/fontforge/nodejs/collabwebview/js/fontdrag.js
+share/fontforge/nodejs/collabwebview/js/jquery-1.9.1.min.js
+share/fontforge/nodejs/collabwebview/js/jquery.masonry.min.js
+share/fontforge/nodejs/collabwebview/js/otfeatures.js
+share/fontforge/nodejs/collabwebview/package.json
+share/fontforge/nodejs/collabwebview/server.js
+share/fontforge/pixmaps/Cantarell-Bold.ttf
+share/fontforge/pixmaps/Cantarell-BoldOblique.ttf
+share/fontforge/pixmaps/Cantarell-Oblique.ttf
+share/fontforge/pixmaps/Cantarell-Regular.ttf
+share/fontforge/pixmaps/Inconsolata-Bold.ttf
+share/fontforge/pixmaps/Inconsolata-Regular.ttf
+share/fontforge/pixmaps/OFL.txt
+share/fontforge/pixmaps/changeweight.png
+share/fontforge/pixmaps/charviewicon.xbm
+share/fontforge/pixmaps/check_off.png
+share/fontforge/pixmaps/check_on.png
 share/fontforge/pixmaps/chooseraudio.png
 share/fontforge/pixmaps/chooserback.png
 share/fontforge/pixmaps/chooserbookmark.png
@@ -89,6 +878,7 @@ share/fontforge/pixmaps/choosermac.png
 share/fontforge/pixmaps/choosermacttf.png
 share/fontforge/pixmaps/choosernobookmark.png
 share/fontforge/pixmaps/chooserobject.png
+share/fontforge/pixmaps/choosersfdir.png
 share/fontforge/pixmaps/choosertar.png
 share/fontforge/pixmaps/choosertextbdf.png
 share/fontforge/pixmaps/choosertextc.png
@@ -106,6 +896,7 @@ share/fontforge/pixmaps/chooserunknown.png
 share/fontforge/pixmaps/chooserupdir.png
 share/fontforge/pixmaps/chooservideo.png
 share/fontforge/pixmaps/colorwheel.png
+share/fontforge/pixmaps/downarrow.png
 share/fontforge/pixmaps/editclear.png
 share/fontforge/pixmaps/editclearback.png
 share/fontforge/pixmaps/editcopy.png
@@ -121,6 +912,7 @@ share/fontforge/pixmaps/editcut.png
 share/fontforge/pixmaps/editfind.png
 share/fontforge/pixmaps/editjoin.png
 share/fontforge/pixmaps/editmerge.png
+share/fontforge/pixmaps/editmergetoline.png
 share/fontforge/pixmaps/editpaste.png
 share/fontforge/pixmaps/editpasteafter.png
 share/fontforge/pixmaps/editpasteinto.png
@@ -166,7 +958,16 @@ share/fontforge/pixmaps/elementtilepattern.png
 share/fontforge/pixmaps/elementtransform.png
 share/fontforge/pixmaps/elementvalidate.png
 share/fontforge/pixmaps/elementvbaselines.png
+share/fontforge/pixmaps/exclude.png
+share/fontforge/pixmaps/extendcondense.png
+share/fontforge/pixmaps/fflogo.png
+share/fontforge/pixmaps/fflogo13.png
+share/fontforge/pixmaps/ffsplash1.png
+share/fontforge/pixmaps/ffsplash2.png
+share/fontforge/pixmaps/ffsplash3.png
 share/fontforge/pixmaps/fileclose.png
+share/fontforge/pixmaps/fileclose2.png
+share/fontforge/pixmaps/filedisplay.png
 share/fontforge/pixmaps/fileexecute.png
 share/fontforge/pixmaps/fileexport.png
 share/fontforge/pixmaps/filegenerate.png
@@ -185,6 +986,10 @@ share/fontforge/pixmaps/filerevertglyph.png
 share/fontforge/pixmaps/filesave.png
 share/fontforge/pixmaps/filesaveall.png
 share/fontforge/pixmaps/filesaveas.png
+share/fontforge/pixmaps/findinter.png
+share/fontforge/pixmaps/fliphor.png
+share/fontforge/pixmaps/flipvert.png
+share/fontforge/pixmaps/fontview2.xbm
 share/fontforge/pixmaps/helpabout.png
 share/fontforge/pixmaps/helphelp.png
 share/fontforge/pixmaps/helpindex.png
@@ -197,12 +1002,17 @@ share/fontforge/pixmaps/hintsclearhstems.png
 share/fontforge/pixmaps/hintsclearvstems.png
 share/fontforge/pixmaps/hintsdontautohint.png
 share/fontforge/pixmaps/hintsreviewhints.png
+share/fontforge/pixmaps/inline.png
+share/fontforge/pixmaps/intersection.png
+share/fontforge/pixmaps/logo.xbm
 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/oblique.png
+share/fontforge/pixmaps/outline.png
 share/fontforge/pixmaps/overlapexclude.png
 share/fontforge/pixmaps/overlapfindinter.png
 share/fontforge/pixmaps/overlapintersection.png
@@ -273,6 +1083,7 @@ share/fontforge/pixmaps/pointshvcurve.png
 share/fontforge/pixmaps/pointsmakearc.png
 share/fontforge/pixmaps/pointsmakeline.png
 share/fontforge/pixmaps/pointsnamecontour.png
+share/fontforge/pixmaps/pointsnamepoint.png
 share/fontforge/pixmaps/pointsspironext.png
 share/fontforge/pixmaps/pointsspiroprev.png
 share/fontforge/pixmaps/pointstangent.png
@@ -281,6 +1092,23 @@ share/fontforge/pixmaps/ptinfocurve.png
 share/fontforge/pixmaps/ptinfohvcurve.png
 share/fontforge/pixmaps/ptinfotangent.png
 share/fontforge/pixmaps/python.png
+share/fontforge/pixmaps/radio_off.png
+share/fontforge/pixmaps/radio_on.png
+share/fontforge/pixmaps/resources
+share/fontforge/pixmaps/rmoverlap.png
+share/fontforge/pixmaps/rotate180.png
+share/fontforge/pixmaps/rotateccw.png
+share/fontforge/pixmaps/rotatecw.png
+share/fontforge/pixmaps/selectblue.png
+share/fontforge/pixmaps/selectcyan.png
+share/fontforge/pixmaps/selectdefault.png
+share/fontforge/pixmaps/selectgreen.png
+share/fontforge/pixmaps/selectmagenta.png
+share/fontforge/pixmaps/selectred.png
+share/fontforge/pixmaps/selectwhite.png
+share/fontforge/pixmaps/selectyellow.png
+share/fontforge/pixmaps/shadow.png
+share/fontforge/pixmaps/skew.png
 share/fontforge/pixmaps/styleschangeweight.png
 share/fontforge/pixmaps/styleschangexheight.png
 share/fontforge/pixmaps/stylesextendcondense.png
@@ -292,6 +1120,7 @@ share/fontforge/pixmaps/stylesshadow.png
 share/fontforge/pixmaps/stylessmallcaps.png
 share/fontforge/pixmaps/stylessubsuper.png
 share/fontforge/pixmaps/styleswireframe.png
+share/fontforge/pixmaps/text12210.png
 share/fontforge/pixmaps/tools3drotate.png
 share/fontforge/pixmaps/toolselipse.png
 share/fontforge/pixmaps/toolsflip.png
@@ -342,7 +1171,29 @@ share/fontforge/pixmaps/viewreplace.png
 share/fontforge/pixmaps/viewsmallersize.png
 share/fontforge/pixmaps/viewzoomin.png
 share/fontforge/pixmaps/viewzoomout.png
+share/fontforge/pixmaps/wireframe.png
+share/fontforge/prefs
+share/fontforge/python/collab/sessionjoin-and-change-c.py
+share/fontforge/python/collab/sessionjoin-and-save-to-out.sfd.py
+share/fontforge/python/collab/sessionstart.py
+share/fontforge/python/collab/web-test-collab.py
 share/fontforge/python/excepthook.py
+share/fontforge/python/gdraw/README
+share/fontforge/python/gdraw/__init__.py
+share/fontforge/python/gdraw/_gdraw.py
+share/fontforge/python/gdraw/gdraw.html
+share/fontforge/python/gdraw/gdraw.py
+share/fontforge/python/simple/expand-a.py
+share/fontforge/python/simple/load-font-and-show-name.py
+share/fontforge/python/test.sfd
+share/fontforge/python/webcollab.py
+share/icons/hicolor/16x16/apps/fontforge.png
+share/icons/hicolor/22x22/apps/fontforge.png
+share/icons/hicolor/24x24/apps/fontforge.png
+share/icons/hicolor/256x256/apps/fontforge.png
+share/icons/hicolor/32x32/apps/fontforge.png
+share/icons/hicolor/48x48/apps/fontforge.png
+share/icons/hicolor/scalable/apps/fontforge.svg
 share/locale/ca/LC_MESSAGES/FontForge.mo
 share/locale/de/LC_MESSAGES/FontForge.mo
 share/locale/el/LC_MESSAGES/FontForge.mo
@@ -351,10 +1202,13 @@ 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/ko/LC_MESSAGES/FontForge.mo
 share/locale/ml/LC_MESSAGES/FontForge.mo
 share/locale/pl/LC_MESSAGES/FontForge.mo
+share/locale/pt/LC_MESSAGES/FontForge.mo
 share/locale/ru/LC_MESSAGES/FontForge.mo
 share/locale/uk/LC_MESSAGES/FontForge.mo
 share/locale/vi/LC_MESSAGES/FontForge.mo
 share/locale/zh_CN/LC_MESSAGES/FontForge.mo
 share/locale/zh_TW/LC_MESSAGES/FontForge.mo
+share/mime/packages/fontforge.xml
diff --git a/fonts/fontforge/distinfo b/fonts/fontforge/distinfo
index 8a0d58d395a..46792316fc6 100644
--- a/fonts/fontforge/distinfo
+++ b/fonts/fontforge/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.60 2015/11/03 20:44:33 agc Exp $
+$NetBSD: distinfo,v 1.61 2016/02/07 14:09:08 adam Exp $
 
-SHA1 (fontforge_full-20120731-b.tar.bz2) = b520f532b48e557c177dffa29120225066cc4e84
-RMD160 (fontforge_full-20120731-b.tar.bz2) = f752e70df3a1433ed2ddd10201c5cf88367f2959
-SHA512 (fontforge_full-20120731-b.tar.bz2) = 2be710332c1186de792a1fe8abf037a2a1e92991a97fa6ca296fe14423bcdb347c1246b91eb571996b907a83f999a8a02cfaae54959b161d1ff852cf60eef19f
-Size (fontforge_full-20120731-b.tar.bz2) = 5541994 bytes
-SHA1 (patch-aa) = 106c5adbeb2cdb7b468ef795cf1fdb973ada89f1
-SHA1 (patch-ab) = ec93a47051186bcb901fd145edffad7c457c33fd
-SHA1 (patch-ae) = 18c976e7723641eda13c70f276113026bae18bc0
-SHA1 (patch-fontforge_macbinary.c) = 263fc55f334d0f3bdd59d4dcca64c4033cb13bad
-SHA1 (patch-gutils_giomime.c) = 77235fc0247dd65066491a44256d6d8531e581ff
+SHA1 (fontforge-20150824.tar.gz) = 2dd442baee9cd16efb5928bf51cc3d6b9c73d9af
+RMD160 (fontforge-20150824.tar.gz) = e26fca6affc11d1ea6c927751a63dae0bfeab47b
+SHA512 (fontforge-20150824.tar.gz) = 82a33b41667b5637706aa11ca56695cf0d7a485c66cb37b8c3346087ca3b738967b77141f9aaaaddd90c8a4c2cec7e4924609de0ff18133a91e5862b1ad1ae2d
+Size (fontforge-20150824.tar.gz) = 20796482 bytes
+SHA1 (patch-Makefile.in) = 5a7cad2f9516540048008a13a257d6c9720a22c9
+SHA1 (patch-configure) = 47cd1d1ff60d40114aa08308d4e73b7c2da4716e
+SHA1 (patch-fontforge_python.c) = 1c1cb83feada6e8588754a728863ee92d7f9368f
+SHA1 (patch-fontforge_splinefont.h) = b518e61e3ba88c7fb86ebe53fb62109447791121
diff --git a/fonts/fontforge/patches/patch-Makefile.in b/fonts/fontforge/patches/patch-Makefile.in
new file mode 100644
index 00000000000..bc6d80cf5d0
--- /dev/null
+++ b/fonts/fontforge/patches/patch-Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.in,v 1.1 2016/02/07 14:09:08 adam Exp $
+
+Do not install OS X bundle.
+
+--- Makefile.in.orig	2016-02-07 11:51:25.000000000 +0000
++++ Makefile.in
+@@ -165,7 +165,7 @@ DIST_COMMON = $(top_srcdir)/mk/layout.am
+ @LIBZMQ_TRUE@am__append_1 = collab
+ @GRAPHICAL_USER_INTERFACE_TRUE@am__append_2 = gdraw
+ @PYTHON_EXTENSION_TRUE@am__append_3 = pyhook
+-@MACINTOSH_TRUE@am__append_4 = mackeys osx
++@MACINTOSH_TRUE@am__append_4 = mackeys
+ @XDG_DESKTOP_TRUE@am__append_5 = desktop
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/fonts/fontforge/patches/patch-aa b/fonts/fontforge/patches/patch-aa
deleted file mode 100644
index b9f2788b1d2..00000000000
--- a/fonts/fontforge/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$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
-@@ -17,7 +17,7 @@ CC = @CC@
- O = @O_EXTENSION@
- 
- X_CFLAGS = @X_CFLAGS@
--X_LIBS = @X_LIBS@
-+X_LIBS = @X_LIBS@ -Wl,-R${X11BASE}/lib
- X_11LIB = @X_11LIB@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
-@@ -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
- 
--all: @FINAL_TARGET@ @MACAPP@ sfddiff fontimage fontlint
-+all: @FINAL_TARGET@ sfddiff fontimage fontlint
- 
- fontforge: $(@exeOBJECTS@) $(fontforge_LIBOBJECTS) exelibstamp.pre libstamp.pre
- 	sed -e '1,$$ s/REPLACE_ME_WITH_MAJOR_VERSION/$(FF_VERSION)/' -e '1,$$ s/REPLACE_ME_WITH_MINOR_VERSION/$(FF_REVISION)/' < exelibstamp.pre > exelibstamp.c
diff --git a/fonts/fontforge/patches/patch-ab b/fonts/fontforge/patches/patch-ab
deleted file mode 100644
index 6495261f16d..00000000000
--- a/fonts/fontforge/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.9 2006/09/12 08:37:05 adam Exp $
-
---- po/ja.po.orig	2006-08-06 22:27:54.000000000 +0200
-+++ po/ja.po
-@@ -5291,7 +5291,7 @@ msgstr "ブリス表意記号"
- msgid "Bopomofo"
- msgstr "注音字母"
- 
--msgid "Br\xc4\x81hm\xc4\xab"
-+msgid "Brāhmī"
- msgstr "ブラーフミー文字"
- 
- msgid "Braille"
-@@ -5432,7 +5432,7 @@ msgstr "マヤ神聖文字"
- msgid "Meroitic"
- msgstr "メロエ文字"
- 
--msgid "Script|Malay\xc4\x81lam"
-+msgid "Script|Malayālam"
- msgstr "マラヤーラム文字"
- 
- msgid "Script|Mongolian"
diff --git a/fonts/fontforge/patches/patch-ae b/fonts/fontforge/patches/patch-ae
deleted file mode 100644
index 6cf54272f5c..00000000000
--- a/fonts/fontforge/patches/patch-ae
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ae,v 1.24 2012/11/23 20:49:03 adam Exp $
-
---- configure.orig	2012-08-02 15:09:08.000000000 +0000
-+++ configure
-@@ -12608,14 +12608,14 @@ if test "x$ac_cv_file__usr_include_libxm
-   CFLAGS="$CFLAGS -I/usr/include/libxml2/"
- else
- 
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/local/include/libxml2/libxml" >&5
--$as_echo_n "checking for /usr/local/include/libxml2/libxml... " >&6; }
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${PREFIX}/include/libxml2/libxml" >&5
-+$as_echo_n "checking for ${PREFIX}/include/libxml2/libxml... " >&6; }
- if test "${ac_cv_file__usr_local_include_libxml2_libxml+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   test "$cross_compiling" = yes &&
-   as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "/usr/local/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
-@@ -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 :
--  CFLAGS="$CFLAGS -I/usr/local/include -I/usr/local/include/libxml2/"
-+  CFLAGS="$CFLAGS -I${PREFIX}/include -I${PREFIX}/include/libxml2/"
- else
-   $as_echo "#define _NO_LIBXML 1" >>confdefs.h
- 
-@@ -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
-- echo 'localedir = $(prefix)/share/locale' >> $ac_confdir/po/Makefile.in
-+ echo 'localedir = ${PREFIX}/${PKGLOCALEDIR}/locale' >> $ac_confdir/po/Makefile.in
-  echo 'INSTALL = @INSTALL@' >> $ac_confdir/po/Makefile.in
-  echo 'INSTALL_DATA = @INSTALL_DATA@' >> $ac_confdir/po/Makefile.in
-  echo '' >> $ac_confdir/po/Makefile.in
diff --git a/fonts/fontforge/patches/patch-configure b/fonts/fontforge/patches/patch-configure
new file mode 100644
index 00000000000..608aca7f6e7
--- /dev/null
+++ b/fonts/fontforge/patches/patch-configure
@@ -0,0 +1,23 @@
+$NetBSD: patch-configure,v 1.1 2016/02/07 14:09:08 adam Exp $
+
+Fix building on OS X.
+
+--- configure.orig	2016-02-07 11:36:39.000000000 +0000
++++ configure
+@@ -15139,7 +15139,6 @@ $as_echo "#define __Mac 1" >>confdefs.h
+        MACAPP=""
+       fi
+ 
+-      RAW_COMPILE_PLATFORM_CFLAGS=" $CFLAGS -arch x86_64 -arch i386 "
+ 
+ 
+ 
+@@ -32762,7 +32761,7 @@ fi
+ #--------------------------------------------------------------------------
+ 
+ # Check whether --enable-breakpad was given.
+-if test "${enable_breakpad+set}" = set; then :
++if test "${enable_breakpad+set}" = set; then
+   enableval=$enable_breakpad; have_breakpad=yes
+ fi
+ 
diff --git a/fonts/fontforge/patches/patch-fontforge_macbinary.c b/fonts/fontforge/patches/patch-fontforge_macbinary.c
deleted file mode 100644
index ad3da13265f..00000000000
--- a/fonts/fontforge/patches/patch-fontforge_macbinary.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$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-fontforge_python.c b/fonts/fontforge/patches/patch-fontforge_python.c
new file mode 100644
index 00000000000..c7710fa11b7
--- /dev/null
+++ b/fonts/fontforge/patches/patch-fontforge_python.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-fontforge_python.c,v 1.1 2016/02/07 14:09:08 adam Exp $
+
+Fix for Python 3.5+.
+
+--- fontforge/python.c.orig	2016-02-07 11:15:18.000000000 +0000
++++ fontforge/python.c
+@@ -18174,7 +18174,11 @@ static PyObject* CreatePyModule( module_
+     mdef->runtime.pymod_def.m_doc = mdef->docstring;
+     mdef->runtime.pymod_def.m_methods = mdef->methods;
+     mdef->runtime.pymod_def.m_size = -1;
++#if PY_MINOR_VERSION >= 5
++    mdef->runtime.pymod_def.m_slots = NULL;
++#else
+     mdef->runtime.pymod_def.m_reload = NULL;
++#endif
+     mdef->runtime.pymod_def.m_traverse = NULL;
+     mdef->runtime.pymod_def.m_clear = NULL;
+     mdef->runtime.pymod_def.m_free = NULL;
diff --git a/fonts/fontforge/patches/patch-fontforge_splinefont.h b/fonts/fontforge/patches/patch-fontforge_splinefont.h
new file mode 100644
index 00000000000..7403a889897
--- /dev/null
+++ b/fonts/fontforge/patches/patch-fontforge_splinefont.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-fontforge_splinefont.h,v 1.1 2016/02/07 14:09:08 adam Exp $
+
+NetBSD does not implement uselocale().
+
+--- fontforge/splinefont.h.orig	2016-02-07 13:01:04.000000000 +0000
++++ fontforge/splinefont.h
+@@ -3548,6 +3548,10 @@ char * delimit_null(const char * input, 
+ 
+ #include "ustring.h"
+ 
++#ifdef __NetBSD__
++#define BAD_LOCALE_HACK
++#endif
++
+ #ifdef _WIN32
+ #define BAD_LOCALE_HACK
+ typedef char* locale_t;
diff --git a/fonts/fontforge/patches/patch-gutils_giomime.c b/fonts/fontforge/patches/patch-gutils_giomime.c
deleted file mode 100644
index ff218579d09..00000000000
--- a/fonts/fontforge/patches/patch-gutils_giomime.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$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) {