Update to 20041014.

PR:		ports/73440
Submitted by:	KANOU Hiroki <kanou@khdd.net> (maintainer)

4 files changed, 30 insertions, 12 deletions

diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index d73be0e08f02..8616eecbf55b 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fontforge
-PORTVERSION=	20040808
+PORTVERSION=	20041014
 PORTREVISION=	0
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -31,6 +31,9 @@ USE_GMAKE=	yes
 USE_XLIB=	yes
 USE_ICONV=	yes
 PATCH_STRIP=	-l
+.if !defined(FONTFORGE_NO_MULTILAYER)
+CONFIGURE_ARGS=	--with-multilayer
+.endif
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" CFLAGS="${CFLAGS} \
 		-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \
 		-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include \
diff --git a/print/fontforge/distinfo b/print/fontforge/distinfo
index 621417eb67e6..3f655ffd93d6 100644
--- a/print/fontforge/distinfo
+++ b/print/fontforge/distinfo
@@ -1,4 +1,4 @@
-MD5 (fontforge_full-20040808.tgz) = 2c9da86bdadc97f450d9bab8075f4390
-SIZE (fontforge_full-20040808.tgz) = 3955365
-MD5 (fontforge_htdocs-20040808.tgz) = 17bf8acca5c6c1edd277e6f89d862613
-SIZE (fontforge_htdocs-20040808.tgz) = 2022058
+MD5 (fontforge_full-20041014.tgz) = 1fb3aeaa094a7eab4a6752bf373cf20a
+SIZE (fontforge_full-20041014.tgz) = 4288784
+MD5 (fontforge_htdocs-20041014.tgz) = 9280c06218d14054054b226f82873c66
+SIZE (fontforge_htdocs-20041014.tgz) = 2046008
diff --git a/print/fontforge/pkg-descr b/print/fontforge/pkg-descr
index 049cf6e9a791..064ba6a8f544 100644
--- a/print/fontforge/pkg-descr
+++ b/print/fontforge/pkg-descr
@@ -1,12 +1,15 @@
-PfaEdit is a PostScript font editor which can create and modify outline
-fonts in Type 1, CID-Keyed Fonts, TrueType, or OpenType format. It can
-generate bitmaps and save in BDF format or embedded bitmaps in TrueType/
-OpenType fonts. 
+FontForge (formerly called PfaEdit) is a PostScript font editor which can 
+create and modify outline fonts in Type 1, CID-Keyed, TrueType, OpenType 
+format. It can generate bitmaps and save in BDF format or embedded bitmaps
+in TrueType/OpenType fonts. 
 
-If you have installed AutoTrace Version 0.28 or newer (older versions
-are incompatible to this version of PfaEdit), you can generate outlines
+It can generate Type3 and SVG fonts if built with multilayer feature.
+If you feel the shortage of memory, rebuilding multilayer-disabled
+FontForge with FONTFORGE_NO_MULTILAYER defined will save some memory.
+
+If you have installed AutoTrace or Potrace, you can generate outlines
 from imported bitmap images. 
 
 For more information, see 
 
-WWW: http://PfaEdit.sourceforge.net/
+WWW: http://fontforge.sourceforge.net/
diff --git a/print/fontforge/pkg-plist b/print/fontforge/pkg-plist
index 2f0c2cf94bd3..3a147e5a9f60 100644
--- a/print/fontforge/pkg-plist
+++ b/print/fontforge/pkg-plist
@@ -17,6 +17,7 @@ lib/libgunicode.so.2
 %%PORTDOCS%%%%DOCSDIR%%/BethSerif.png
 %%PORTDOCS%%%%DOCSDIR%%/Big5.txt
 %%PORTDOCS%%%%DOCSDIR%%/BitmapView.png
+%%PORTDOCS%%%%DOCSDIR%%/Bperspective.png
 %%PORTDOCS%%%%DOCSDIR%%/C1.png
 %%PORTDOCS%%%%DOCSDIR%%/C10.png
 %%PORTDOCS%%%%DOCSDIR%%/C2.png
@@ -42,6 +43,7 @@ lib/libgunicode.so.2
 %%PORTDOCS%%%%DOCSDIR%%/Ehinted.png
 %%PORTDOCS%%%%DOCSDIR%%/EhintedTtf.png
 %%PORTDOCS%%%%DOCSDIR%%/Encodings.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/Eperspective.png
 %%PORTDOCS%%%%DOCSDIR%%/FVHMetrics.png
 %%PORTDOCS%%%%DOCSDIR%%/FVVMetrics.png
 %%PORTDOCS%%%%DOCSDIR%%/FontForgeSplash.png
@@ -78,6 +80,7 @@ lib/libgunicode.so.2
 %%PORTDOCS%%%%DOCSDIR%%/PageSetup.png
 %%PORTDOCS%%%%DOCSDIR%%/PfaEdit-TeX.html
 %%PORTDOCS%%%%DOCSDIR%%/PfaEdits.gif
+%%PORTDOCS%%%%DOCSDIR%%/PoV.png
 %%PORTDOCS%%%%DOCSDIR%%/Print.png
 %%PORTDOCS%%%%DOCSDIR%%/ReviewHints.png
 %%PORTDOCS%%%%DOCSDIR%%/SelectByATT.png
@@ -176,8 +179,10 @@ lib/libgunicode.so.2
 %%PORTDOCS%%%%DOCSDIR%%/cvknifeicon.png
 %%PORTDOCS%%%%DOCSDIR%%/cvmagicon.png
 %%PORTDOCS%%%%DOCSDIR%%/cvpenicon.png
+%%PORTDOCS%%%%DOCSDIR%%/cvperspectiveicon.png
 %%PORTDOCS%%%%DOCSDIR%%/cvpolyicon.png
 %%PORTDOCS%%%%DOCSDIR%%/cvrecticon.png
+%%PORTDOCS%%%%DOCSDIR%%/cvrotate3dicon.png
 %%PORTDOCS%%%%DOCSDIR%%/cvrotateicon.png
 %%PORTDOCS%%%%DOCSDIR%%/cvrulericon.png
 %%PORTDOCS%%%%DOCSDIR%%/cvscaleicon.png
@@ -188,6 +193,7 @@ lib/libgunicode.so.2
 %%PORTDOCS%%%%DOCSDIR%%/diffs.html
 %%PORTDOCS%%%%DOCSDIR%%/display.html
 %%PORTDOCS%%%%DOCSDIR%%/document.nvd
+%%PORTDOCS%%%%DOCSDIR%%/doublestruck-B.png
 %%PORTDOCS%%%%DOCSDIR%%/editcvt.png
 %%PORTDOCS%%%%DOCSDIR%%/editexample.html
 %%PORTDOCS%%%%DOCSDIR%%/editexample2.html
@@ -258,8 +264,11 @@ lib/libgunicode.so.2
 %%PORTDOCS%%%%DOCSDIR%%/fontview.fr.png
 %%PORTDOCS%%%%DOCSDIR%%/fontview.html
 %%PORTDOCS%%%%DOCSDIR%%/fontview.ru.png
+%%PORTDOCS%%%%DOCSDIR%%/fraktur-A.png
 %%PORTDOCS%%%%DOCSDIR%%/freehandctl.png
 %%PORTDOCS%%%%DOCSDIR%%/future.html
+%%PORTDOCS%%%%DOCSDIR%%/fv-normal.png
+%%PORTDOCS%%%%DOCSDIR%%/fv-smallcaps.png
 %%PORTDOCS%%%%DOCSDIR%%/generate.html
 %%PORTDOCS%%%%DOCSDIR%%/generate.png
 %%PORTDOCS%%%%DOCSDIR%%/getinfo.html
@@ -337,6 +346,7 @@ lib/libgunicode.so.2
 %%PORTDOCS%%%%DOCSDIR%%/newanchor.png
 %%PORTDOCS%%%%DOCSDIR%%/newcountermask.png
 %%PORTDOCS%%%%DOCSDIR%%/newfont.png
+%%PORTDOCS%%%%DOCSDIR%%/non-linear.png
 %%PORTDOCS%%%%DOCSDIR%%/non-standard.html
 %%PORTDOCS%%%%DOCSDIR%%/o-baddir.png
 %%PORTDOCS%%%%DOCSDIR%%/o1.png
@@ -386,6 +396,7 @@ lib/libgunicode.so.2
 %%PORTDOCS%%%%DOCSDIR%%/rplref.png
 %%PORTDOCS%%%%DOCSDIR%%/rplserifs.png
 %%PORTDOCS%%%%DOCSDIR%%/sans-serif-def.png
+%%PORTDOCS%%%%DOCSDIR%%/script-A.png
 %%PORTDOCS%%%%DOCSDIR%%/scripting.html
 %%PORTDOCS%%%%DOCSDIR%%/scriptlist-pulldown.png
 %%PORTDOCS%%%%DOCSDIR%%/scriptlist.png
@@ -452,6 +463,7 @@ share/fontforge/Adobe-Japan2-0.cidmap
 share/fontforge/Adobe-Korea1-2.cidmap
 share/fontforge/pfaedit-de.ui
 share/fontforge/pfaedit-en.ui
+share/fontforge/pfaedit-es.ui
 share/fontforge/pfaedit-fr.ui
 share/fontforge/pfaedit-gr.ui
 share/fontforge/pfaedit-it.ui