4 files changed, 40 insertions, 12 deletions

diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index 201b9a040579..b96ab1c8091b 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -26,6 +26,7 @@ USE_GMAKE=	yes
 USE_XLIB=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_SCRIPT=	configure.static
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
 	CFLAGS="$(CFLAGS) -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2"
 WRKSRC=		${WRKDIR}/${PORTNAME}
@@ -33,11 +34,11 @@ ALL_TARGET=	pfaedit
 
 MAN1=		pfaedit.1 sfddiff.1
 
-DIST_VER=	020829
+DIST_VER=	021025
 EXTRACT_ONLY=	${PORTNAME}_full-${DIST_VER}.tgz cidmaps.tgz
 
 .if !defined(NOPORTDOCS)
-DOC_VER=	020818
+DOC_VER=	020910
 DOCFILE=	${PORTNAME}_htdocs-${DOC_VER}.tgz
 .endif
 
@@ -49,7 +50,7 @@ post-extract:
 	${MV} ${WRKDIR}/*.cidmap ${WRKSRC}/cidmap
 .endif
 
-post-patch:
+xxxpost-patch:
 	${REINPLACE_CMD} -e \
 		's,/usr/include/freetype2,${PREFIX}/include/freetype2 -I${PREFIX}/include,g' \
 		${WRKSRC}/configure ${WRKSRC}/configure.in \
diff --git a/print/fontforge/distinfo b/print/fontforge/distinfo
index 0fc7d8f66658..c33b38fe7ad4 100644
--- a/print/fontforge/distinfo
+++ b/print/fontforge/distinfo
@@ -1,3 +1,3 @@
-MD5 (pfaedit_full-020829.tgz) = 6d1ae9b54ce93d1bfdb59e24b08cf715
+MD5 (pfaedit_full-021025.tgz) = b05917d1fb4a0c5282ba1cca76927ee6
 MD5 (cidmaps.tgz) = d40e9a779f620a5358ab782d6d76eb2f
-MD5 (pfaedit_htdocs-020818.tgz) = d110958b73afccd0b3ef9091c6cc5c81
+MD5 (pfaedit_htdocs-020910.tgz) = 2d4b256d4595a9f77d49d47b5a9428c1
diff --git a/print/fontforge/files/patch-Makefile.in b/print/fontforge/files/patch-Makefile.static.in
index d1d751e1f067..0bc0c255329b 100644
--- a/print/fontforge/files/patch-Makefile.in
+++ b/print/fontforge/files/patch-Makefile.static.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Sat Jun 29 10:17:51 2002
-+++ Makefile.in	Sat Jun 29 10:19:57 2002
-@@ -39,15 +39,16 @@
+--- Makefile.static.in.orig	Thu Oct 24 03:34:40 2002
++++ Makefile.static.in	Sat Oct 26 01:55:17 2002
+@@ -39,15 +39,15 @@
  	mkdir -p $(bindir)
  	mkdir -p $(mandir)/man1
  	mkdir -p $(sharedir)
@@ -9,7 +9,6 @@
 -	cp pfaedit/pfaedit-*.ui $(sharedir)
 +	${BSD_INSTALL_PROGRAM} pfaedit/pfaedit $(bindir)
 +	${BSD_INSTALL_PROGRAM} pfaedit/sfddiff $(bindir)
-+	${BSD_INSTALL_PROGRAM} pfaedit/acorn2sfd $(bindir)
 +	${BSD_INSTALL_DATA} pfaedit/pfaedit-*.ui $(sharedir)
  #The next line will fail for most installs. If you have downloaded the cidmaps
  # this will install them. If you haven't it won't. You only need the cidmaps
@@ -17,9 +16,9 @@
 -	-cp $(srcdir)/cidmap/*.cidmap $(sharedir) >/dev/null 2>&1
 -	cp $(srcdir)/pfaedit/pfaedit.1 $(mandir)/man1
 -	cp $(srcdir)/pfaedit/sfddiff.1 $(mandir)/man1
-+	${BSD_INSTALL_DATA} $(srcdir)/cidmap/*.cidmap $(sharedir) >/dev/null 2>&1
-+	${BSD_INSTALL_MAN} $(srcdir)/pfaedit/pfaedit.1 $(mandir)/man1
-+	${BSD_INSTALL_MAN} $(srcdir)/pfaedit/sfddiff.1 $(mandir)/man1
++	${BSD_INSTALL_MAN}  $(srcdir)/cidmap/*.cidmap $(sharedir) >/dev/null 2>&1
++	${BSD_INSTALL_MAN}  $(srcdir)/pfaedit/pfaedit.1 $(mandir)/man1
++	${BSD_INSTALL_MAN}  $(srcdir)/pfaedit/sfddiff.1 $(mandir)/man1
  
  uninstall:
  	-rm $(bindir)/pfaedit
diff --git a/print/fontforge/pkg-plist b/print/fontforge/pkg-plist
index abe5ba79509b..de1b941f5b3f 100644
--- a/print/fontforge/pkg-plist
+++ b/print/fontforge/pkg-plist
@@ -27,6 +27,7 @@ bin/acorn2sfd
 %%PORTDOCS%%share/doc/pfaedit/Constrain2_1.png
 %%PORTDOCS%%share/doc/pfaedit/Constrain2_2.png
 %%PORTDOCS%%share/doc/pfaedit/CyrilItalicComp.png
+%%PORTDOCS%%share/doc/pfaedit/DisplayFonts.png
 %%PORTDOCS%%share/doc/pfaedit/Eback.png
 %%PORTDOCS%%share/doc/pfaedit/EbackTtf.png
 %%PORTDOCS%%share/doc/pfaedit/Efore.png
@@ -52,6 +53,7 @@ bin/acorn2sfd
 %%PORTDOCS%%share/doc/pfaedit/LICENSE
 %%PORTDOCS%%share/doc/pfaedit/MetaFont.html
 %%PORTDOCS%%share/doc/pfaedit/MetricsView.png
+%%PORTDOCS%%share/doc/pfaedit/MultiPrint.png
 %%PORTDOCS%%share/doc/pfaedit/NoPointHint.png
 %%PORTDOCS%%share/doc/pfaedit/PageSetup.png
 %%PORTDOCS%%share/doc/pfaedit/PfaEdits.gif
@@ -63,6 +65,7 @@ bin/acorn2sfd
 %%PORTDOCS%%share/doc/pfaedit/Shades4.png
 %%PORTDOCS%%share/doc/pfaedit/Spacem_1.png
 %%PORTDOCS%%share/doc/pfaedit/Spacem_2.png
+%%PORTDOCS%%share/doc/pfaedit/TilePath.png
 %%PORTDOCS%%share/doc/pfaedit/aacutebase.png
 %%PORTDOCS%%share/doc/pfaedit/aacutemid.png
 %%PORTDOCS%%share/doc/pfaedit/accented.html
@@ -83,12 +86,14 @@ bin/acorn2sfd
 %%PORTDOCS%%share/doc/pfaedit/charview-vert.png
 %%PORTDOCS%%share/doc/pfaedit/charview.html
 %%PORTDOCS%%share/doc/pfaedit/charview2.png
+%%PORTDOCS%%share/doc/pfaedit/changelog.html
 %%PORTDOCS%%share/doc/pfaedit/cidmenu.html
 %%PORTDOCS%%share/doc/pfaedit/cliargs.html
 %%PORTDOCS%%share/doc/pfaedit/corpchar.html
 %%PORTDOCS%%share/doc/pfaedit/corpchar.txt
 %%PORTDOCS%%share/doc/pfaedit/cpodd.png
 %%PORTDOCS%%share/doc/pfaedit/diffs.html
+%%PORTDOCS%%share/doc/pfaedit/display.html
 %%PORTDOCS%%share/doc/pfaedit/document.nvd
 %%PORTDOCS%%share/doc/pfaedit/editexample.html
 %%PORTDOCS%%share/doc/pfaedit/editmenu.html
@@ -102,6 +107,10 @@ bin/acorn2sfd
 %%PORTDOCS%%share/doc/pfaedit/faqFrame.html
 %%PORTDOCS%%share/doc/pfaedit/filemenu.html
 %%PORTDOCS%%share/doc/pfaedit/findprobs.png
+%%PORTDOCS%%share/doc/pfaedit/findprobs-cid.png
+%%PORTDOCS%%share/doc/pfaedit/findprobs-hint.png
+%%PORTDOCS%%share/doc/pfaedit/findprobs-paths.png
+%%PORTDOCS%%share/doc/pfaedit/findprobs-random.png
 %%PORTDOCS%%share/doc/pfaedit/fontinfo-cid.png
 %%PORTDOCS%%share/doc/pfaedit/fontinfo-comment.png
 %%PORTDOCS%%share/doc/pfaedit/fontinfo-encoding.png
@@ -118,6 +127,8 @@ bin/acorn2sfd
 %%PORTDOCS%%share/doc/pfaedit/fontview.ru.png
 %%PORTDOCS%%share/doc/pfaedit/future.html
 %%PORTDOCS%%share/doc/pfaedit/getinfo.html
+%%PORTDOCS%%share/doc/pfaedit/generate.html
+%%PORTDOCS%%share/doc/pfaedit/generate.png
 %%PORTDOCS%%share/doc/pfaedit/greymapedit.png
 %%PORTDOCS%%share/doc/pfaedit/greymapsavail.png
 %%PORTDOCS%%share/doc/pfaedit/helpmenu.html
@@ -133,6 +144,7 @@ bin/acorn2sfd
 %%PORTDOCS%%share/doc/pfaedit/locale.html
 %%PORTDOCS%%share/doc/pfaedit/logo3.gif
 %%PORTDOCS%%share/doc/pfaedit/macformats.html
+%%PORTDOCS%%share/doc/pfaedit/mad.html
 %%PORTDOCS%%share/doc/pfaedit/metricsmenu.html
 %%PORTDOCS%%share/doc/pfaedit/metricsview.html
 %%PORTDOCS%%share/doc/pfaedit/newfont.png
@@ -149,6 +161,11 @@ bin/acorn2sfd
 %%PORTDOCS%%share/doc/pfaedit/pnts.gif
 %%PORTDOCS%%share/doc/pfaedit/pointinfo.png
 %%PORTDOCS%%share/doc/pfaedit/pointmenu.html
+%%PORTDOCS%%share/doc/pfaedit/prefs-apps.png
+%%PORTDOCS%%share/doc/pfaedit/prefs-font.png
+%%PORTDOCS%%share/doc/pfaedit/prefs-generic.png
+%%PORTDOCS%%share/doc/pfaedit/prefs-script.png
+%%PORTDOCS%%share/doc/pfaedit/prefs.html
 %%PORTDOCS%%share/doc/pfaedit/print.html
 %%PORTDOCS%%share/doc/pfaedit/privatekey.png
 %%PORTDOCS%%share/doc/pfaedit/privatekeymenu.png
@@ -170,6 +187,16 @@ bin/acorn2sfd
 %%PORTDOCS%%share/doc/pfaedit/splines.gif
 %%PORTDOCS%%share/doc/pfaedit/src.html
 %%PORTDOCS%%share/doc/pfaedit/strokechar.png
+%%PORTDOCS%%share/doc/pfaedit/tilepath-center.png
+%%PORTDOCS%%share/doc/pfaedit/tilepath-final.png
+%%PORTDOCS%%share/doc/pfaedit/tilepath-left.png
+%%PORTDOCS%%share/doc/pfaedit/tilepath-orig.png
+%%PORTDOCS%%share/doc/pfaedit/tilepath-right.png
+%%PORTDOCS%%share/doc/pfaedit/tilepath-scale.png
+%%PORTDOCS%%share/doc/pfaedit/tilepath-selection.png
+%%PORTDOCS%%share/doc/pfaedit/tilepath-tile.png
+%%PORTDOCS%%share/doc/pfaedit/tilepath-ts.png
+%%PORTDOCS%%share/doc/pfaedit/tilepath.html
 %%PORTDOCS%%share/doc/pfaedit/tools.png
 %%PORTDOCS%%share/doc/pfaedit/transform.html
 %%PORTDOCS%%share/doc/pfaedit/transform.png
@@ -187,6 +214,7 @@ share/pfaedit/Adobe-Japan2-0.cidmap
 share/pfaedit/Adobe-Korea1-2.cidmap
 share/pfaedit/pfaedit-de.ui
 share/pfaedit/pfaedit-en.ui
+share/pfaedit/pfaedit-es.ui
 share/pfaedit/pfaedit-fr.ui
 share/pfaedit/pfaedit-ja.ui
 share/pfaedit/pfaedit-ru.ui