3 files changed, 23 insertions, 7 deletions

diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index 9aacfd80fbc3..007e38997cb4 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -15,7 +15,7 @@ DISTFILES=	${EXTRACT_ONLY}
 .if !defined(NOPORTDOCS)
 DISTFILES+=	${DOCFILE}
 .endif
-EXTRACT_ONLY=	${PORTNAME}_full-${DIST_VER}.tgz \
+EXTRACT_ONLY=	${PORTNAME}_full-${DIST_VER}.tgz cidmaps.tgz \
 		libuninameslist_src-${LIBUNINAMESLIST_VER}.tgz
 
 MAINTAINER=	kanou@khdd.net
@@ -39,9 +39,24 @@ INSTALLS_SHLIB=	yes
 
 MAN1=		pfaedit.1 sfddiff.1
 
-DIST_VER=	031012
+DIST_VER=	031020
 LIBUNINAMESLIST_VER=	030713
 
+.if !defined (NOPORTDOCS)
+DOCFILE=	${PORTNAME}_htdocs-${DIST_VER}.tgz
+.endif
+
+.if !defined (NOPORTDOCS)
+post-extract:
+	${MKDIR} ${WRKDIR}/html ${WRKSRC}/cidmap
+	${TAR} -xzC ${WRKDIR}/html -f ${DISTDIR}/${DOCFILE}
+	${RM} ${WRKDIR}/html/cidmaps.tgz
+	${MV} ${WRKDIR}/*.cidmap ${WRKSRC}/cidmap
+.else
+	${MKDIR} ${WRKSRC}/cidmap
+	${MV} ${WRKDIR}/*.cidmap ${WRKSRC}/cidmap
+.endif
+
 post-configure:
 	(cd ${WRKDIR}/libuninameslist ; ./configure ${CONFIGURE_ARGS} )
 
@@ -52,8 +67,7 @@ post-install:
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}
 .if !defined(NOPORTDOCS)
-	${RM} -rf ${WRKSRC}/htdocs/*/ ${WRKSRC}/htdocs/cidmaps.tgz
-	${INSTALL_DATA} ${WRKSRC}/htdocs/* ${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/html/* ${DOCSDIR}
 	(cd ${WRKDIR}/libuninameslist ; ${GMAKE} install )
 .endif
 
diff --git a/print/fontforge/distinfo b/print/fontforge/distinfo
index 2c8330e9b72c..9cae0c7daab0 100644
--- a/print/fontforge/distinfo
+++ b/print/fontforge/distinfo
@@ -1,2 +1,4 @@
-MD5 (pfaedit_full-031012.tgz) = 4320e6f36c4ae94c2e9ca8b07931afe7
+MD5 (pfaedit_full-031020.tgz) = 27e9f5ef370481319acec9d4b9e5cd08
+MD5 (cidmaps.tgz) = 542c4ddaaa6689de217d3a96678b4e69
 MD5 (libuninameslist_src-030713.tgz) = 051a0377d8e1674de9dc8da062b32646
+MD5 (pfaedit_htdocs-031020.tgz) = 324575ef99af3d6b7d2d3acfbf47a04c
diff --git a/print/fontforge/pkg-plist b/print/fontforge/pkg-plist
index 7dcfb94cb264..bf3f0a6f1a53 100644
--- a/print/fontforge/pkg-plist
+++ b/print/fontforge/pkg-plist
@@ -90,6 +90,7 @@ lib/libuninameslist.so.0
 %%PORTDOCS%%share/doc/pfaedit/Shades.png
 %%PORTDOCS%%share/doc/pfaedit/Shades2.png
 %%PORTDOCS%%share/doc/pfaedit/Shades4.png
+%%PORTDOCS%%share/doc/pfaedit/Shadow.png
 %%PORTDOCS%%share/doc/pfaedit/ShadowWireframe.png
 %%PORTDOCS%%share/doc/pfaedit/ShowGridFit.png
 %%PORTDOCS%%share/doc/pfaedit/Spacem_1.png
@@ -289,6 +290,7 @@ lib/libuninameslist.so.0
 %%PORTDOCS%%share/doc/pfaedit/macFeatureSetting.png
 %%PORTDOCS%%share/doc/pfaedit/macfeature.png
 %%PORTDOCS%%share/doc/pfaedit/macformats.html
+%%PORTDOCS%%share/doc/pfaedit/mad.html
 %%PORTDOCS%%share/doc/pfaedit/mergepost.png
 %%PORTDOCS%%share/doc/pfaedit/mergepre.png
 %%PORTDOCS%%share/doc/pfaedit/metricsmenu.html
@@ -331,7 +333,6 @@ lib/libuninameslist.so.0
 %%PORTDOCS%%share/doc/pfaedit/privatekeymenu.png
 %%PORTDOCS%%share/doc/pfaedit/problems.html
 %%PORTDOCS%%share/doc/pfaedit/quadbezier.gif
-%%PORTDOCS%%share/doc/pfaedit/quadbezier.png
 %%PORTDOCS%%share/doc/pfaedit/quadraticspline.png
 %%PORTDOCS%%share/doc/pfaedit/quotations.html
 %%PORTDOCS%%share/doc/pfaedit/realindex.html
@@ -390,7 +391,6 @@ lib/libuninameslist.so.0
 %%PORTDOCS%%share/doc/pfaedit/ttfinstrs.html
 %%PORTDOCS%%share/doc/pfaedit/ttfinstrs-edit.png
 %%PORTDOCS%%share/doc/pfaedit/ttfinstrs-view.png
-%%PORTDOCS%%share/doc/pfaedit/tutorial.tgz
 %%PORTDOCS%%share/doc/pfaedit/twolines.png
 %%PORTDOCS%%share/doc/pfaedit/typofeat.html
 %%PORTDOCS%%share/doc/pfaedit/viewmenu.html