3 files changed, 38 insertions, 11 deletions

diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index a5b90eb9871b..c0aa7e69046f 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	fontforge
-PORTVERSION=	20090622
+PORTVERSION=	20090914
 PORTREVISION=	1
 CATEGORIES=	print
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-source
 DISTFILES=	${EXTRACT_ONLY}
 EXTRACT_ONLY=	${PORTNAME}_full-${PORTVERSION}.tar.bz2
 
@@ -32,7 +32,7 @@ EXTRACT_ONLY+=	freetype-${FREETYPE_VERSION}.tar.bz2
 
 .if !defined(NOPORTDOCS)
 DOC_VERSION=	${PORTVERSION}
-MASTER_SITES+=	SF/${PORTNAME}/${PORTNAME}-docs/${DOC_VERSION}:docs
+MASTER_SITES+=	SF/${PORTNAME}/${PORTNAME}-docs:docs
 DOCFILES=	${PORTNAME}_htdocs-${DOC_VERSION}.tar.bz2
 DISTFILES+=	${DOCFILES:C/$/:docs/}
 .endif
@@ -51,9 +51,11 @@ WITH_MULTILAYER=	--disable-type3
 .endif
 
 .if !defined(WITHOUT_TTF_BYTECODE_ENABLED) && defined(FONTFORGE_WITH_TTF_DEBUGGER)
-WITH_FREETYPE_SRC=	--with-freetype-bytecode --with-freetype-src=${WRKDIR}/freetype-${FREETYPE_VERSION}
+WITH_FREETYPE_SRC=	--enable-freetype --with-freetype-bytecode \
+			--with-freetype-src=${WRKDIR}/freetype-${FREETYPE_VERSION}
 .else
-WITH_FREETYPE_SRC=	--without-freetype-bytecode --without-freetype-src
+WITH_FREETYPE_SRC=	--disable-freetype --without-freetype-bytecode \
+			--without-freetype-src
 .endif
 
 CONFIGURE_ARGS=	${WITH_MULTILAYER} --enable-devicetables ${WITH_FREETYPE_SRC} \
diff --git a/print/fontforge/distinfo b/print/fontforge/distinfo
index 17fa5ae6eb34..98989cee1b86 100644
--- a/print/fontforge/distinfo
+++ b/print/fontforge/distinfo
@@ -1,9 +1,9 @@
-MD5 (fontforge_full-20090622.tar.bz2) = 3f4ff2d2dab200f47595bff38baa13ca
-SHA256 (fontforge_full-20090622.tar.bz2) = bf0f1fd76f47646252853c1d86d119a9638a9a6be5c42d12e2f35b6b5c120d3f
-SIZE (fontforge_full-20090622.tar.bz2) = 5359385
+MD5 (fontforge_full-20090914.tar.bz2) = 16a744e42e8944c4298f7e004f95dd31
+SHA256 (fontforge_full-20090914.tar.bz2) = 94803b29d1562fe6af3c7c389adeca15c75b10b99ed4cc31a45e55cb9569ea3f
+SIZE (fontforge_full-20090914.tar.bz2) = 5504747
 MD5 (freetype-2.3.9.tar.bz2) = d76233108aca9c9606cdbd341562ad9a
 SHA256 (freetype-2.3.9.tar.bz2) = 51a033bce9904d73e0821e8e2bba24bd319619d7d1b2e9eeccac611580242ab6
 SIZE (freetype-2.3.9.tar.bz2) = 1363190
-MD5 (fontforge_htdocs-20090622.tar.bz2) = db6003b077e9fe6b9ba1d9f64dbe3569
-SHA256 (fontforge_htdocs-20090622.tar.bz2) = 44c7b8fdbf2472a15ceeda4d827557c04c7559f3bcd3ab2800eebcd293324763
-SIZE (fontforge_htdocs-20090622.tar.bz2) = 2764464
+MD5 (fontforge_htdocs-20090914.tar.bz2) = 8979b8b38e3653c452dbe310f17a996d
+SHA256 (fontforge_htdocs-20090914.tar.bz2) = 3f9e6ed8dfb9d1a67c1311289bbe6538b8f20439cbe8bb6e56de6c688ad5ab57
+SIZE (fontforge_htdocs-20090914.tar.bz2) = 2828545
diff --git a/print/fontforge/pkg-plist b/print/fontforge/pkg-plist
index 4663c9c0f09d..49b1b9e7c5a0 100644
--- a/print/fontforge/pkg-plist
+++ b/print/fontforge/pkg-plist
@@ -12,6 +12,7 @@ include/fontforge/chardata.h
 include/fontforge/charset.h
 include/fontforge/config.h
 include/fontforge/configure-pfaedit.h
+include/fontforge/delta.h
 include/fontforge/dynamic.h
 include/fontforge/edgelist.h
 include/fontforge/edgelist2.h
@@ -39,6 +40,7 @@ include/fontforge/intl.h
 include/fontforge/libffstamp.h
 include/fontforge/lookups.h
 include/fontforge/mm.h
+include/fontforge/namehash.h
 include/fontforge/nonlineartrans.h
 include/fontforge/ofl.h
 include/fontforge/pfaedit.h
@@ -177,6 +179,7 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/GTextField.png
 %%PORTDOCS%%%%DOCSDIR%%/GenerateFamily.png
 %%PORTDOCS%%%%DOCSDIR%%/GenerateOptions.png
+%%PORTDOCS%%%%DOCSDIR%%/GenerateTTC.png
 %%PORTDOCS%%%%DOCSDIR%%/GlossaryFS.html
 %%PORTDOCS%%%%DOCSDIR%%/GlossaryFrame.html
 %%PORTDOCS%%%%DOCSDIR%%/GradientDlg.png
@@ -197,6 +200,7 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/ItalicCompCaslon.png
 %%PORTDOCS%%%%DOCSDIR%%/ItalicCompGalliard.png
 %%PORTDOCS%%%%DOCSDIR%%/ItalicDlg.png
+%%PORTDOCS%%%%DOCSDIR%%/JustOutside.png
 %%PORTDOCS%%%%DOCSDIR%%/JustifyDlg.png
 %%PORTDOCS%%%%DOCSDIR%%/JustifyExtenderDlg.png
 %%PORTDOCS%%%%DOCSDIR%%/JustifyLangDlg.png
@@ -240,6 +244,8 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/PfaEdits.gif
 %%PORTDOCS%%%%DOCSDIR%%/PoV.png
 %%PORTDOCS%%%%DOCSDIR%%/Print.png
+%%PORTDOCS%%%%DOCSDIR%%/QGDlg.png
+%%PORTDOCS%%%%DOCSDIR%%/QGList.png
 %%PORTDOCS%%%%DOCSDIR%%/RadialGradient.png
 %%PORTDOCS%%%%DOCSDIR%%/RadialGradientDlg.png
 %%PORTDOCS%%%%DOCSDIR%%/ReviewHints.png
@@ -260,6 +266,7 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/Sti6.png
 %%PORTDOCS%%%%DOCSDIR%%/Styles.html
 %%PORTDOCS%%%%DOCSDIR%%/SubSuperDlg.png
+%%PORTDOCS%%%%DOCSDIR%%/SuggestDeltas.html
 %%PORTDOCS%%%%DOCSDIR%%/Sxi.png
 %%PORTDOCS%%%%DOCSDIR%%/Sxiti.png
 %%PORTDOCS%%%%DOCSDIR%%/Sxiti2.png
@@ -936,6 +943,24 @@ libdata/pkgconfig/fontforge.pc
 %%DATADIR%%/pixmaps/stylessmallcaps.png
 %%DATADIR%%/pixmaps/stylessubsuper.png
 %%DATADIR%%/pixmaps/styleswireframe.png
+%%DATADIR%%/pixmaps/tools3drotate.png
+%%DATADIR%%/pixmaps/toolselipse.png
+%%DATADIR%%/pixmaps/toolsflip.png
+%%DATADIR%%/pixmaps/toolsfreehand.png
+%%DATADIR%%/pixmaps/toolsknife.png
+%%DATADIR%%/pixmaps/toolsmagnify.png
+%%DATADIR%%/pixmaps/toolspen.png
+%%DATADIR%%/pixmaps/toolsperspective.png
+%%DATADIR%%/pixmaps/toolspointer.png
+%%DATADIR%%/pixmaps/toolspoly.png
+%%DATADIR%%/pixmaps/toolsrect.png
+%%DATADIR%%/pixmaps/toolsrotate.png
+%%DATADIR%%/pixmaps/toolsruler.png
+%%DATADIR%%/pixmaps/toolsscale.png
+%%DATADIR%%/pixmaps/toolsscroll.png
+%%DATADIR%%/pixmaps/toolsskew.png
+%%DATADIR%%/pixmaps/toolsspiro.png
+%%DATADIR%%/pixmaps/toolsstar.png
 %%DATADIR%%/pixmaps/transformfliphor.png
 %%DATADIR%%/pixmaps/transformflipvert.png
 %%DATADIR%%/pixmaps/transformrotate180.png