3 files changed, 136 insertions, 27 deletions

diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index 4c2f678c81be..1031d78e50f2 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -6,34 +6,31 @@
 #
 
 PORTNAME=	fontforge
-PORTVERSION=	20110222
-PORTREVISION=	5
+DISTVERSION=	20120731-b
 CATEGORIES=	print
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-source
 DISTFILES=	${EXTRACT_ONLY}
-EXTRACT_ONLY=	${PORTNAME}_full-${PORTVERSION}.tar.bz2
+EXTRACT_ONLY=	${PORTNAME}_full-${DISTVERSION}.tar.bz2
 
 MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	Type 1/TrueType/OpenType/bitmap font editor
 
-LIB_DEPENDS=	uninameslist.0:${PORTSDIR}/textproc/libuninameslist \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		jpeg.11:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS=	uninameslist:${PORTSDIR}/textproc/libuninameslist \
+		tiff:${PORTSDIR}/graphics/tiff \
+		jpeg:${PORTSDIR}/graphics/jpeg \
 		png15:${PORTSDIR}/graphics/png \
-		gif.5:${PORTSDIR}/graphics/giflib \
-		freetype.9:${PORTSDIR}/print/freetype2 \
-		xml2.5:${PORTSDIR}/textproc/libxml2 \
-		spiro.0:${PORTSDIR}/graphics/libspiro
+		gif:${PORTSDIR}/graphics/giflib \
+		freetype:${PORTSDIR}/print/freetype2 \
+		xml2:${PORTSDIR}/textproc/libxml2 \
+		spiro:${PORTSDIR}/graphics/libspiro
 
 .if defined(FONTFORGE_WITH_TTF_DEBUGGER)
-FREETYPE_VERSION=	2.4.4
+FREETYPE_VERSION=	2.4.9
 EXTRACT_ONLY+=	freetype-${FREETYPE_VERSION}.tar.bz2
 .endif
 
 .if !defined(NOPORTDOCS)
-#DOC_VERSION=	${PORTVERSION}
-# This version of Fontforge has a different version number for the docs as opposed to the actual source
-DOC_VERSION=	20110221
+DOC_VERSION=	${DISTVERSION}
 MASTER_SITES+=	SF/${PORTNAME}/${PORTNAME}-docs:docs
 DOCFILES=	${PORTNAME}_htdocs-${DOC_VERSION}.tar.bz2
 DISTFILES+=	${DOCFILES:C/$/:docs/}
@@ -88,7 +85,7 @@ CONFIGURE_ARGS+=	--without-python
 .endif
 
 .if defined(WITH_CAIRO)
-LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
+LIB_DEPENDS+=	cairo:${PORTSDIR}/graphics/cairo
 CONFIGURE_ARGS+=	--with-cairo
 .else
 CONFIGURE_ARGS+=	--without-cairo
diff --git a/print/fontforge/distinfo b/print/fontforge/distinfo
index 45b82a099f5c..c75a1d6da64c 100644
--- a/print/fontforge/distinfo
+++ b/print/fontforge/distinfo
@@ -1,6 +1,6 @@
-SHA256 (fontforge_full-20110222.tar.bz2) = 8fa2818026f84bb7b8a77451d21cab7e9dea8aa904e5218afa158be6a320433e
-SIZE (fontforge_full-20110222.tar.bz2) = 5126031
-SHA256 (freetype-2.4.4.tar.bz2) = 4b8281c7dc4d375c6b65d3c6f4808e488a313fab47d7be82aad2c871c8480fef
-SIZE (freetype-2.4.4.tar.bz2) = 1442053
-SHA256 (fontforge_htdocs-20110221.tar.bz2) = 7a81b9a30fa8f287e63abcfee568d7fcfd1a21c75c5c69effe95fe677d963fec
-SIZE (fontforge_htdocs-20110221.tar.bz2) = 3129839
+SHA256 (fontforge_full-20120731-b.tar.bz2) = 1b6184caff211e315783a029256f56cf05f1d4fd3cbcb41820d21c7745040fb6
+SIZE (fontforge_full-20120731-b.tar.bz2) = 5541994
+SHA256 (freetype-2.4.9.tar.bz2) = c4204ac1d48e99d4375a2f32bf4f3f92780a9d9f015e64e57e852f6c004859b9
+SIZE (freetype-2.4.9.tar.bz2) = 1504819
+SHA256 (fontforge_htdocs-20120731-b.tar.bz2) = 6c3f178484d21814762c52859ffead25564a93e88cd5fe7cc9877e4b7e85105d
+SIZE (fontforge_htdocs-20120731-b.tar.bz2) = 3506833
diff --git a/print/fontforge/pkg-plist b/print/fontforge/pkg-plist
index 4fd5594d1601..f2ba8cca73e2 100644
--- a/print/fontforge/pkg-plist
+++ b/print/fontforge/pkg-plist
@@ -160,6 +160,7 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/FVVMetrics.png
 %%PORTDOCS%%%%DOCSDIR%%/FlatSerif.png
 %%PORTDOCS%%%%DOCSDIR%%/FontDisplay.png
+%%PORTDOCS%%%%DOCSDIR%%/FontForge.css
 %%PORTDOCS%%%%DOCSDIR%%/FontForgeSplash.png
 %%PORTDOCS%%%%DOCSDIR%%/FontImage.png
 %%PORTDOCS%%%%DOCSDIR%%/FontSample.png
@@ -227,6 +228,8 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/MassRename.png
 %%PORTDOCS%%%%DOCSDIR%%/MenuWithMacIcons.png
 %%PORTDOCS%%%%DOCSDIR%%/MenuWithoutMacIcons.png
+%%PORTDOCS%%%%DOCSDIR%%/Metal-fontforge-600.jpeg
+%%PORTDOCS%%%%DOCSDIR%%/MetalType.jpeg
 %%PORTDOCS%%%%DOCSDIR%%/MetricsView-features.png
 %%PORTDOCS%%%%DOCSDIR%%/MetricsView.png
 %%PORTDOCS%%%%DOCSDIR%%/MultiPrint.png
@@ -354,6 +357,7 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/cidmenu.html
 %%PORTDOCS%%%%DOCSDIR%%/cliargs.html
 %%PORTDOCS%%%%DOCSDIR%%/colorbutton.png
+%%PORTDOCS%%%%DOCSDIR%%/colorpicker.jpeg
 %%PORTDOCS%%%%DOCSDIR%%/contextchain-class.png
 %%PORTDOCS%%%%DOCSDIR%%/contextchain-classlist.png
 %%PORTDOCS%%%%DOCSDIR%%/contextchain-coverage.png
@@ -361,6 +365,9 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/contextchain-glyphlists.png
 %%PORTDOCS%%%%DOCSDIR%%/contextchain-pickglyph.png
 %%PORTDOCS%%%%DOCSDIR%%/contextchain-rcover.png
+%%PORTDOCS%%%%DOCSDIR%%/contextchain-simpleclasses.png
+%%PORTDOCS%%%%DOCSDIR%%/contextchain-simplecoverage.png
+%%PORTDOCS%%%%DOCSDIR%%/contextchain-simpleglyph.png
 %%PORTDOCS%%%%DOCSDIR%%/contextchain.html
 %%PORTDOCS%%%%DOCSDIR%%/copyfeatures.png
 %%PORTDOCS%%%%DOCSDIR%%/corpchar.html
@@ -459,6 +466,9 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/ffi-refs.png
 %%PORTDOCS%%%%DOCSDIR%%/ffi-rmoverlap.png
 %%PORTDOCS%%%%DOCSDIR%%/ffi-unlink.png
+%%PORTDOCS%%%%DOCSDIR%%/fftype16.png
+%%PORTDOCS%%%%DOCSDIR%%/fftype300.svg
+%%PORTDOCS%%%%DOCSDIR%%/fftype32.png
 %%PORTDOCS%%%%DOCSDIR%%/fi.png
 %%PORTDOCS%%%%DOCSDIR%%/filemenu.html
 %%PORTDOCS%%%%DOCSDIR%%/files.html
@@ -473,7 +483,9 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/floating-A.png
 %%PORTDOCS%%%%DOCSDIR%%/fontcompdlg.png
 %%PORTDOCS%%%%DOCSDIR%%/fontcompresults.png
+%%PORTDOCS%%%%DOCSDIR%%/fontforge-banner-420.jpeg
 %%PORTDOCS%%%%DOCSDIR%%/fontforge-themes.html
+%%PORTDOCS%%%%DOCSDIR%%/fontforge-tutorial.pdf
 %%PORTDOCS%%%%DOCSDIR%%/fontimage.html
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-charsets.png
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-cid.png
@@ -654,10 +666,6 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/oldchangelog.html
 %%PORTDOCS%%%%DOCSDIR%%/openfont.png
 %%PORTDOCS%%%%DOCSDIR%%/otherlinks.html
-%%PORTDOCS%%%%DOCSDIR%%/ott2.png
-%%PORTDOCS%%%%DOCSDIR%%/ott2_5.png
-%%PORTDOCS%%%%DOCSDIR%%/ott3.png
-%%PORTDOCS%%%%DOCSDIR%%/ott5.png
 %%PORTDOCS%%%%DOCSDIR%%/outlinechar.png
 %%PORTDOCS%%%%DOCSDIR%%/overlappedlines.png
 %%PORTDOCS%%%%DOCSDIR%%/overshoot.png
@@ -807,6 +815,37 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/xItalic.png
 %%PORTDOCS%%%%DOCSDIR%%/xim.html
 %%PORTDOCS%%%%DOCSDIR%%/xres.html
+%%DATADIR%%/pixmaps/chooseraudio.png
+%%DATADIR%%/pixmaps/chooserback.png
+%%DATADIR%%/pixmaps/chooserbookmark.png
+%%DATADIR%%/pixmaps/choosercid.png
+%%DATADIR%%/pixmaps/choosercompressed.png
+%%DATADIR%%/pixmaps/chooserconfigtool.png
+%%DATADIR%%/pixmaps/choosercore.png
+%%DATADIR%%/pixmaps/chooserdir.png
+%%DATADIR%%/pixmaps/chooserforward.png
+%%DATADIR%%/pixmaps/chooserhomefolder.png
+%%DATADIR%%/pixmaps/chooserimage.png
+%%DATADIR%%/pixmaps/choosermac.png
+%%DATADIR%%/pixmaps/choosermacttf.png
+%%DATADIR%%/pixmaps/choosernobookmark.png
+%%DATADIR%%/pixmaps/chooserobject.png
+%%DATADIR%%/pixmaps/choosertar.png
+%%DATADIR%%/pixmaps/choosertextbdf.png
+%%DATADIR%%/pixmaps/choosertextc.png
+%%DATADIR%%/pixmaps/choosertextcss.png
+%%DATADIR%%/pixmaps/choosertextfontps.png
+%%DATADIR%%/pixmaps/choosertextfontsfd.png
+%%DATADIR%%/pixmaps/choosertexthtml.png
+%%DATADIR%%/pixmaps/choosertextjava.png
+%%DATADIR%%/pixmaps/choosertextmake.png
+%%DATADIR%%/pixmaps/choosertextplain.png
+%%DATADIR%%/pixmaps/choosertextps.png
+%%DATADIR%%/pixmaps/choosertextxml.png
+%%DATADIR%%/pixmaps/chooserttf.png
+%%DATADIR%%/pixmaps/chooserunknown.png
+%%DATADIR%%/pixmaps/chooserupdir.png
+%%DATADIR%%/pixmaps/chooservideo.png
 %%DATADIR%%/pixmaps/colorwheel.png
 %%DATADIR%%/pixmaps/editclear.png
 %%DATADIR%%/pixmaps/editclearback.png
@@ -840,7 +879,7 @@ libdata/pkgconfig/fontforge.pc
 %%DATADIR%%/pixmaps/elementbdfinfo.png
 %%DATADIR%%/pixmaps/elementbitmapsavail.png
 %%DATADIR%%/pixmaps/elementbuildaccent.png
-%%DATADIR%%/pixmaps/elementbuildcomposit.png
+%%DATADIR%%/pixmaps/elementbuildcomposite.png
 %%DATADIR%%/pixmaps/elementclockwise.png
 %%DATADIR%%/pixmaps/elementcomparefonts.png
 %%DATADIR%%/pixmaps/elementcomparelayers.png
@@ -909,6 +948,64 @@ libdata/pkgconfig/fontforge.pc
 %%DATADIR%%/pixmaps/overlapfindinter.png
 %%DATADIR%%/pixmaps/overlapintersection.png
 %%DATADIR%%/pixmaps/overlaprm.png
+%%DATADIR%%/pixmaps/palette3drotate.png
+%%DATADIR%%/pixmaps/palettecorner.png
+%%DATADIR%%/pixmaps/palettecurve.png
+%%DATADIR%%/pixmaps/paletteelipse.png
+%%DATADIR%%/pixmaps/paletteflip.png
+%%DATADIR%%/pixmaps/palettefreehand.png
+%%DATADIR%%/pixmaps/palettehand.png
+%%DATADIR%%/pixmaps/palettehvcurve.png
+%%DATADIR%%/pixmaps/paletteknife.png
+%%DATADIR%%/pixmaps/paletteline.png
+%%DATADIR%%/pixmaps/palettemagnify.png
+%%DATADIR%%/pixmaps/palettepen.png
+%%DATADIR%%/pixmaps/palettepencil.png
+%%DATADIR%%/pixmaps/paletteperspective.png
+%%DATADIR%%/pixmaps/palettepointer.png
+%%DATADIR%%/pixmaps/palettepoly.png
+%%DATADIR%%/pixmaps/paletterect.png
+%%DATADIR%%/pixmaps/paletterotate.png
+%%DATADIR%%/pixmaps/paletteruler.png
+%%DATADIR%%/pixmaps/palettescale.png
+%%DATADIR%%/pixmaps/paletteshift.png
+%%DATADIR%%/pixmaps/paletteskew.png
+%%DATADIR%%/pixmaps/palettesmall3drotate.png
+%%DATADIR%%/pixmaps/palettesmallcorner.png
+%%DATADIR%%/pixmaps/palettesmallcurve.png
+%%DATADIR%%/pixmaps/palettesmallelipse.png
+%%DATADIR%%/pixmaps/palettesmallflip.png
+%%DATADIR%%/pixmaps/palettesmallhand.png
+%%DATADIR%%/pixmaps/palettesmallhvcurve.png
+%%DATADIR%%/pixmaps/palettesmallknife.png
+%%DATADIR%%/pixmaps/palettesmallmag.png
+%%DATADIR%%/pixmaps/palettesmallpen.png
+%%DATADIR%%/pixmaps/palettesmallpencil.png
+%%DATADIR%%/pixmaps/palettesmallperspective.png
+%%DATADIR%%/pixmaps/palettesmallpointer.png
+%%DATADIR%%/pixmaps/palettesmallpoly.png
+%%DATADIR%%/pixmaps/palettesmallrect.png
+%%DATADIR%%/pixmaps/palettesmallrotate.png
+%%DATADIR%%/pixmaps/palettesmallruler.png
+%%DATADIR%%/pixmaps/palettesmallscale.png
+%%DATADIR%%/pixmaps/palettesmallskew.png
+%%DATADIR%%/pixmaps/palettesmallspirocorner.png
+%%DATADIR%%/pixmaps/palettesmallspirocurve.png
+%%DATADIR%%/pixmaps/palettesmallspirog2curve.png
+%%DATADIR%%/pixmaps/palettesmallspiroleft.png
+%%DATADIR%%/pixmaps/palettesmallspiroright.png
+%%DATADIR%%/pixmaps/palettesmallstar.png
+%%DATADIR%%/pixmaps/palettesmalltangent.png
+%%DATADIR%%/pixmaps/palettespirocorner.png
+%%DATADIR%%/pixmaps/palettespirocurve.png
+%%DATADIR%%/pixmaps/palettespirodisabled.png
+%%DATADIR%%/pixmaps/palettespirodown.png
+%%DATADIR%%/pixmaps/palettespirog2curve.png
+%%DATADIR%%/pixmaps/palettespiroleft.png
+%%DATADIR%%/pixmaps/palettespiroright.png
+%%DATADIR%%/pixmaps/palettespiroup.png
+%%DATADIR%%/pixmaps/palettestar.png
+%%DATADIR%%/pixmaps/palettetangent.png
 %%DATADIR%%/pixmaps/pointsG2curve.png
 %%DATADIR%%/pixmaps/pointsaddanchor.png
 %%DATADIR%%/pixmaps/pointscorner.png
@@ -920,6 +1017,10 @@ libdata/pkgconfig/fontforge.pc
 %%DATADIR%%/pixmaps/pointsspironext.png
 %%DATADIR%%/pixmaps/pointsspiroprev.png
 %%DATADIR%%/pixmaps/pointstangent.png
+%%DATADIR%%/pixmaps/ptinfocorner.png
+%%DATADIR%%/pixmaps/ptinfocurve.png
+%%DATADIR%%/pixmaps/ptinfohvcurve.png
+%%DATADIR%%/pixmaps/ptinfotangent.png
 %%DATADIR%%/pixmaps/python.png
 %%DATADIR%%/pixmaps/styleschangeweight.png
 %%DATADIR%%/pixmaps/styleschangexheight.png
@@ -941,7 +1042,7 @@ libdata/pkgconfig/fontforge.pc
 %%DATADIR%%/pixmaps/toolspen.png
 %%DATADIR%%/pixmaps/toolsperspective.png
 %%DATADIR%%/pixmaps/toolspointer.png
-%%DATADIR%%/pixmaps/toolspoly.png
+%%DATADIR%%/pixmaps/toolspolygon.png
 %%DATADIR%%/pixmaps/toolsrect.png
 %%DATADIR%%/pixmaps/toolsrotate.png
 %%DATADIR%%/pixmaps/toolsruler.png
@@ -956,6 +1057,15 @@ libdata/pkgconfig/fontforge.pc
 %%DATADIR%%/pixmaps/transformrotateccw.png
 %%DATADIR%%/pixmaps/transformrotatecw.png
 %%DATADIR%%/pixmaps/transformskew.png
+%%DATADIR%%/pixmaps/ttdebugcontinue.png
+%%DATADIR%%/pixmaps/ttdebugexit.png
+%%DATADIR%%/pixmaps/ttdebugmenudelta.png
+%%DATADIR%%/pixmaps/ttdebugstepinto.png
+%%DATADIR%%/pixmaps/ttdebugstepout.png
+%%DATADIR%%/pixmaps/ttdebugstepover.png
+%%DATADIR%%/pixmaps/ttdebugstop.png
+%%DATADIR%%/pixmaps/ttdebugstopped.png
+%%DATADIR%%/pixmaps/ttdebugwatchpnt.png
 %%DATADIR%%/pixmaps/viewbiggersize.png
 %%DATADIR%%/pixmaps/viewfindinfont.png
 %%DATADIR%%/pixmaps/viewfit.png
@@ -963,6 +1073,7 @@ libdata/pkgconfig/fontforge.pc
 %%DATADIR%%/pixmaps/viewgoto.png
 %%DATADIR%%/pixmaps/viewinsertafter.png
 %%DATADIR%%/pixmaps/viewinsertbefore.png
+%%DATADIR%%/pixmaps/viewlayers.png
 %%DATADIR%%/pixmaps/viewnext.png
 %%DATADIR%%/pixmaps/viewnextdef.png
 %%DATADIR%%/pixmaps/viewpalettes.png
@@ -979,6 +1090,7 @@ libdata/pkgconfig/fontforge.pc
 %%NO_PLUGINS%%%%DATADIR%%/plugins/gb12345.so
 %%NO_PLUGINS%%%%DATADIR%%/plugins/gb12345.so.0
 %%DATADIR%%/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