3 files changed, 31 insertions, 18 deletions

diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index e4f9a4d83362..1b9b52b523e6 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -24,7 +24,6 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 
 USE_GMAKE=	yes
 USE_XLIB=	yes
-USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	configure.static
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
@@ -34,11 +33,11 @@ ALL_TARGET=	pfaedit
 
 MAN1=		pfaedit.1 sfddiff.1
 
-DIST_VER=	021125
+DIST_VER=	021229
 EXTRACT_ONLY=	${PORTNAME}_full-${DIST_VER}.tgz cidmaps.tgz
 
 .if !defined(NOPORTDOCS)
-DOC_VER=	020910
+DOC_VER=	021229
 DOCFILE=	${PORTNAME}_htdocs-${DOC_VER}.tgz
 .endif
 
@@ -50,17 +49,6 @@ post-extract:
 	${MV} ${WRKDIR}/*.cidmap ${WRKSRC}/cidmap
 .endif
 
-xxxpost-patch:
-	${REINPLACE_CMD} -e \
-		's,/usr/include/freetype2,${PREFIX}/include/freetype2 -I${PREFIX}/include,g' \
-		${WRKSRC}/configure ${WRKSRC}/configure.in \
-		${WRKSRC}/configure.pfaedit ${WRKSRC}/configure.pfaedit.in \
-		${WRKSRC}/configure.static.in \
-		${WRKSRC}/configure.ttfmod ${WRKSRC}/configure.ttfmod.in
-	${REINPLACE_CMD} -e 's,/usr/share/,${PREFIX}/share/,g' \
-		${WRKSRC}/pfaedit/pfaedit.1
-	${REINPLACE_CMD} -e 's,/usr/pkg/,${PREFIX}/,g' ${WRKSRC}/*/[mM]akefile.*
-
 post-install:
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}
diff --git a/print/fontforge/distinfo b/print/fontforge/distinfo
index c82916ad6fe2..6974584b99ac 100644
--- a/print/fontforge/distinfo
+++ b/print/fontforge/distinfo
@@ -1,3 +1,3 @@
-MD5 (pfaedit_full-021125.tgz) = 0087abb4d62cfeac67e6c81a0169ab1c
-MD5 (cidmaps.tgz) = d40e9a779f620a5358ab782d6d76eb2f
-MD5 (pfaedit_htdocs-020910.tgz) = 2d4b256d4595a9f77d49d47b5a9428c1
+MD5 (pfaedit_full-021229.tgz) = 151431c7ecb97dba2a083709499753bf
+MD5 (cidmaps.tgz) = 435b64b8c47c1640d219ebb27d9082fb
+MD5 (pfaedit_htdocs-021229.tgz) = 5382928e7348abd0438165702fc7f67b
diff --git a/print/fontforge/pkg-plist b/print/fontforge/pkg-plist
index de1b941f5b3f..2cc602933c15 100644
--- a/print/fontforge/pkg-plist
+++ b/print/fontforge/pkg-plist
@@ -39,6 +39,7 @@ bin/acorn2sfd
 %%PORTDOCS%%share/doc/pfaedit/FontSample.png
 %%PORTDOCS%%share/doc/pfaedit/FVHMetrics.png
 %%PORTDOCS%%share/doc/pfaedit/FVVMetrics.png
+%%PORTDOCS%%share/doc/pfaedit/GenerateFamily.png
 %%PORTDOCS%%share/doc/pfaedit/GridFitM.png
 %%PORTDOCS%%share/doc/pfaedit/H-bm.png
 %%PORTDOCS%%share/doc/pfaedit/H-gm.png
@@ -51,6 +52,7 @@ bin/acorn2sfd
 %%PORTDOCS%%share/doc/pfaedit/ItalicCompGalliard.png
 %%PORTDOCS%%share/doc/pfaedit/KernPairs.png
 %%PORTDOCS%%share/doc/pfaedit/LICENSE
+%%PORTDOCS%%share/doc/pfaedit/MacOSX.html 
 %%PORTDOCS%%share/doc/pfaedit/MetaFont.html
 %%PORTDOCS%%share/doc/pfaedit/MetricsView.png
 %%PORTDOCS%%share/doc/pfaedit/MultiPrint.png
@@ -66,15 +68,20 @@ bin/acorn2sfd
 %%PORTDOCS%%share/doc/pfaedit/Spacem_1.png
 %%PORTDOCS%%share/doc/pfaedit/Spacem_2.png
 %%PORTDOCS%%share/doc/pfaedit/TilePath.png
+%%PORTDOCS%%share/doc/pfaedit/a_dieresis_macron.png
+%%PORTDOCS%%share/doc/pfaedit/a_with_anchor.png
 %%PORTDOCS%%share/doc/pfaedit/aacutebase.png
 %%PORTDOCS%%share/doc/pfaedit/aacutemid.png
 %%PORTDOCS%%share/doc/pfaedit/accented.html
 %%PORTDOCS%%share/doc/pfaedit/acenter.png
 %%PORTDOCS%%share/doc/pfaedit/acorn2sfd.html
+%%PORTDOCS%%share/doc/pfaedit/agetinfo.png
+%%PORTDOCS%%share/doc/pfaedit/agrave_anchored.png
 %%PORTDOCS%%share/doc/pfaedit/ahighest.png
 %%PORTDOCS%%share/doc/pfaedit/autokern.png
 %%PORTDOCS%%share/doc/pfaedit/autowidth.html
 %%PORTDOCS%%share/doc/pfaedit/autowidth.png
+%%PORTDOCS%%share/doc/pfaedit/autowidthmenu.png
 %%PORTDOCS%%share/doc/pfaedit/bezier.gif
 %%PORTDOCS%%share/doc/pfaedit/bezier.html
 %%PORTDOCS%%share/doc/pfaedit/bitmapchar.png
@@ -82,6 +89,10 @@ bin/acorn2sfd
 %%PORTDOCS%%share/doc/pfaedit/bitmapview.html
 %%PORTDOCS%%share/doc/pfaedit/bvlayers.png
 %%PORTDOCS%%share/doc/pfaedit/bvtools.png
+%%PORTDOCS%%share/doc/pfaedit/cap-height.png
+%%PORTDOCS%%share/doc/pfaedit/charinfo-comment.png
+%%PORTDOCS%%share/doc/pfaedit/charinfo-lig.png
+%%PORTDOCS%%share/doc/pfaedit/charinfo.html
 %%PORTDOCS%%share/doc/pfaedit/charinfo.png
 %%PORTDOCS%%share/doc/pfaedit/charview-vert.png
 %%PORTDOCS%%share/doc/pfaedit/charview.html
@@ -106,6 +117,7 @@ bin/acorn2sfd
 %%PORTDOCS%%share/doc/pfaedit/faqFS.html
 %%PORTDOCS%%share/doc/pfaedit/faqFrame.html
 %%PORTDOCS%%share/doc/pfaedit/filemenu.html
+%%PORTDOCS%%share/doc/pfaedit/files.html
 %%PORTDOCS%%share/doc/pfaedit/findprobs.png
 %%PORTDOCS%%share/doc/pfaedit/findprobs-cid.png
 %%PORTDOCS%%share/doc/pfaedit/findprobs-hint.png
@@ -121,14 +133,19 @@ bin/acorn2sfd
 %%PORTDOCS%%share/doc/pfaedit/fontinfo-ttfvals.png
 %%PORTDOCS%%share/doc/pfaedit/fontinfo.html
 %%PORTDOCS%%share/doc/pfaedit/fontinfo.png
+%%PORTDOCS%%share/doc/pfaedit/fontinfo-anchors.png
 %%PORTDOCS%%share/doc/pfaedit/fontview-cid.png
 %%PORTDOCS%%share/doc/pfaedit/fontview.fr.png
 %%PORTDOCS%%share/doc/pfaedit/fontview.html
 %%PORTDOCS%%share/doc/pfaedit/fontview.ru.png
+%%PORTDOCS%%share/doc/pfaedit/freehandctl.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/glossary.html
+%%PORTDOCS%%share/doc/pfaedit/gposgsub.html
+%%PORTDOCS%%share/doc/pfaedit/grave_with_anchor.png
 %%PORTDOCS%%share/doc/pfaedit/greymapedit.png
 %%PORTDOCS%%share/doc/pfaedit/greymapsavail.png
 %%PORTDOCS%%share/doc/pfaedit/helpmenu.html
@@ -140,6 +157,7 @@ bin/acorn2sfd
 %%PORTDOCS%%share/doc/pfaedit/kanjifont.png
 %%PORTDOCS%%share/doc/pfaedit/kernpairs.html
 %%PORTDOCS%%share/doc/pfaedit/layers.png
+%%PORTDOCS%%share/doc/pfaedit/lcani.gif
 %%PORTDOCS%%share/doc/pfaedit/license.html
 %%PORTDOCS%%share/doc/pfaedit/locale.html
 %%PORTDOCS%%share/doc/pfaedit/logo3.gif
@@ -152,6 +170,7 @@ bin/acorn2sfd
 %%PORTDOCS%%share/doc/pfaedit/otherlinks.html
 %%PORTDOCS%%share/doc/pfaedit/outlinechar.png
 %%PORTDOCS%%share/doc/pfaedit/overlappedlines.png
+%%PORTDOCS%%share/doc/pfaedit/overshoot.png
 %%PORTDOCS%%share/doc/pfaedit/overview.html
 %%PORTDOCS%%share/doc/pfaedit/pcf-format.html
 %%PORTDOCS%%share/doc/pfaedit/phi-hints-filled.png
@@ -162,6 +181,7 @@ bin/acorn2sfd
 %%PORTDOCS%%share/doc/pfaedit/pointinfo.png
 %%PORTDOCS%%share/doc/pfaedit/pointmenu.html
 %%PORTDOCS%%share/doc/pfaedit/prefs-apps.png
+%%PORTDOCS%%share/doc/pfaedit/prefs-editing.png
 %%PORTDOCS%%share/doc/pfaedit/prefs-font.png
 %%PORTDOCS%%share/doc/pfaedit/prefs-generic.png
 %%PORTDOCS%%share/doc/pfaedit/prefs-script.png
@@ -174,8 +194,11 @@ bin/acorn2sfd
 %%PORTDOCS%%share/doc/pfaedit/rgetinfo.png
 %%PORTDOCS%%share/doc/pfaedit/rplref.png
 %%PORTDOCS%%share/doc/pfaedit/rplserifs.png
+%%PORTDOCS%%share/doc/pfaedit/sans-serif-def.png
 %%PORTDOCS%%share/doc/pfaedit/scripting.html
 %%PORTDOCS%%share/doc/pfaedit/search.html
+%%PORTDOCS%%share/doc/pfaedit/selections.html
+%%PORTDOCS%%share/doc/pfaedit/serif-def.png
 %%PORTDOCS%%share/doc/pfaedit/serif.png
 %%PORTDOCS%%share/doc/pfaedit/serif2.png
 %%PORTDOCS%%share/doc/pfaedit/setwidth.png
@@ -203,13 +226,15 @@ bin/acorn2sfd
 %%PORTDOCS%%share/doc/pfaedit/twolines.png
 %%PORTDOCS%%share/doc/pfaedit/viewmenu.html
 %%PORTDOCS%%share/doc/pfaedit/views.html
+%%PORTDOCS%%share/doc/pfaedit/wacom.html
 %%PORTDOCS%%share/doc/pfaedit/windowmenu.html
+%%PORTDOCS%%share/doc/pfaedit/x-height.png
 %%PORTDOCS%%share/doc/pfaedit/xim.html
 %%PORTDOCS%%share/doc/pfaedit/xres.html
 share/pfaedit/Adobe-CNS1-4.cidmap
 share/pfaedit/Adobe-GB1-4.cidmap
 share/pfaedit/Adobe-Identity-0.cidmap
-share/pfaedit/Adobe-Japan1-4.cidmap
+share/pfaedit/Adobe-Japan1-5.cidmap
 share/pfaedit/Adobe-Japan2-0.cidmap
 share/pfaedit/Adobe-Korea1-2.cidmap
 share/pfaedit/pfaedit-de.ui