diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index 20756e850af0..c01de8c6abac 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	fontforge
-PORTVERSION=	20060117
-PORTREVISION=	1
+PORTVERSION=	20060406
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fontforge
@@ -29,16 +28,17 @@ LIB_DEPENDS=	uninameslist.0:${PORTSDIR}/textproc/libuninameslist \
 		freetype.9:${PORTSDIR}/print/freetype2 \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 
-DOC_VERSION=	20060114
-DOCFILES=	${DOCFILE_IN_TAR_GZ} ${DOCFILE_IN_TAR_BZ2}
-DOCFILE_IN_TAR_GZ=	${PORTNAME}_htdocs-${DOC_VERSION}.tgz
-DOCFILE_IN_TAR_BZ2=	${PORTNAME}_ja_htdocs-${DOC_VERSION}.tar.bz2
+DOC_VERSION=	${PORTVERSION}
+DOCFILES=	${PORTNAME}_htdocs-${DOC_VERSION}.tar.bz2
+.if !defined(NOPORTDOCS)
+DOCFILES+=	${PORTNAME}_ja_htdocs-${DOC_VERSION}.tar.bz2
+.endif
 
+USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_XLIB=	yes
 USE_ICONV=	yes
-USE_BZIP2=	yes
+USE_XLIB=	yes
 PATCH_STRIP=	-l
 
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
@@ -87,23 +87,30 @@ pre-everything::
 
 post-extract:
 	${MKDIR} ${WRKDIR}/html ${WRKSRC}/cidmap
-	for doc in ${DOCFILE_IN_TAR_GZ} ; \
+	for doc in ${DOCFILES} ; \
 		do ${TAR} -xzC ${WRKDIR}/html -f ${DISTDIR}/$${doc} ; \
 	done
-	for doc in ${DOCFILE_IN_TAR_BZ2} ; \
-		do ${TAR} -xyC ${WRKDIR}/html -f ${DISTDIR}/$${doc} ; \
-	done
 	${TAR} -xzC ${WRKSRC}/cidmap -f ${WRKDIR}/html/cidmaps.tgz
 	${RM} ${WRKDIR}/html/cidmaps.tgz
 
+.if !defined(FONTFORGE_NO_PLUGINS)
+post-build:
+	cd ${WRKSRC}/plugins; ${GMAKE}
+.endif
+
 post-install:
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}
+.if !defined(FONTFORGE_NO_PLUGINS)
+	${MKDIR} ${PREFIX}/share/fontforge/plugins
+	(cd ${WRKSRC}/plugins; ${INSTALL_DATA} .libs/* ${PREFIX}/share/fontforge/plugins )
+.endif
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}/flags ${DOCSDIR}/ja
+	${MKDIR} ${DOCSDIR}/flags ${DOCSDIR}/ja ${DOCSDIR}/ja/nonBMP/
 	${INSTALL_DATA} ${WRKDIR}/html/*.* ${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/html/flags/* ${DOCSDIR}/flags
-	${INSTALL_DATA} ${WRKDIR}/html/ja/* ${DOCSDIR}/ja
+	${INSTALL_DATA} ${WRKDIR}/html/ja/*.* ${DOCSDIR}/ja
+	${INSTALL_DATA} ${WRKDIR}/html/ja/nonBMP/*.* ${DOCSDIR}/ja/nonBMP
 .endif
 
 .include <bsd.port.mk>
diff --git a/print/fontforge/distinfo b/print/fontforge/distinfo
index a885241717d8..44b166633586 100644
--- a/print/fontforge/distinfo
+++ b/print/fontforge/distinfo
@@ -1,8 +1,12 @@
-MD5 (fontforge_full-20051028.tar.bz2) = 3d385a58cb37c544cfef9a0434072dd6
-MD5 (fontforge_full-20060117.tar.bz2) = d26919a63d605d2364dc7c8cb26c51ec
-SIZE (fontforge_full-20060117.tar.bz2) = 3215162
-MD5 (fontforge_htdocs-20060114.tgz) = 78a9f24e14c3e89afb5b88622f675546
-SIZE (fontforge_htdocs-20060114.tgz) = 2190544
-MD5 (fontforge_ja_htdocs-20060114.tar.bz2) = d8b75323a76c83b2538d8dcd8c7f5bb9
-SIZE (fontforge_ja_htdocs-20060114.tar.bz2) = 2588746
-SIZE (fontforge_htdocs-20051028.tgz) = 2156822
+MD5 (fontforge_full-20060406.tar.bz2) = 33aabad96a007b90679c392807e6eb7d
+SHA256 (fontforge_full-20060406.tar.bz2) = 2dd9083bd7c3044e24595a272434919ed2f150b773a31fdac08d747c331703b0
+SIZE (fontforge_full-20060406.tar.bz2) = 3168350
+MD5 (freetype-2.1.10.tar.bz2) = a4012e7d1f6400df44a16743b11b8423
+SHA256 (freetype-2.1.10.tar.bz2) = fed2ed148d7d105b95493c5e95561c8b05ee7909e00f828f036d8ed1be6a5e53
+SIZE (freetype-2.1.10.tar.bz2) = 1037107
+MD5 (fontforge_htdocs-20060406.tar.bz2) = 03ab55ad1298592e8e15137362dee99c
+SHA256 (fontforge_htdocs-20060406.tar.bz2) = 5f6fa6e86f683af91e5ffefc71a68a0daa8a7fb10ccd661afe1db53952f241b7
+SIZE (fontforge_htdocs-20060406.tar.bz2) = 2119657
+MD5 (fontforge_ja_htdocs-20060406.tar.bz2) = 56c3cabcb75dde840cb6ff251242da4e
+SHA256 (fontforge_ja_htdocs-20060406.tar.bz2) = 7712b116c746de2a741337c196da3aec15d4b95afcd74a81a246b650eb17d18a
+SIZE (fontforge_ja_htdocs-20060406.tar.bz2) = 2794098
diff --git a/print/fontforge/files/patch-Makefile.dynamic.in b/print/fontforge/files/patch-Makefile.dynamic.in
index b8e4ccfc02b6..0cc2c8e8ad75 100644
--- a/print/fontforge/files/patch-Makefile.dynamic.in
+++ b/print/fontforge/files/patch-Makefile.dynamic.in
@@ -1,34 +1,31 @@
---- Makefile.dynamic.in.orig	Thu Nov 17 05:56:25 2005
-+++ Makefile.dynamic.in	Sun Dec  4 16:19:03 2005
-@@ -52,17 +52,17 @@
+--- Makefile.dynamic.in.orig	Fri Apr  7 22:22:55 2006
++++ Makefile.dynamic.in	Sun Apr  9 02:07:36 2006
+@@ -54,8 +54,8 @@
  	$(LIBTOOL) --mode=install $(INSTALL) -c libgunicode.la $(libdir)/libgunicode.la
  	#cp .libs/*.so.*.* $(libdir)
  	$(LIBTOOL) --mode=finish $(libdir)
 -	mkdir -p $(libdir)/pkgconfig
 -	$(LIBTOOL) --mode=install $(INSTALL) -c fontforge.pc $(libdir)/pkgconfig
 +	mkdir -p ${PREFIX}/libdata/pkgconfig
-+	${BSD_INSTALL_DATA} -c fontforge.pc ${PREFIX}/libdata/pkgconfig
++	$(LIBTOOL) --mode=install $(INSTALL) -c fontforge.pc ${PREFIX}/libdata/pkgconfig
  
  install_docs:
  	mkdir -p $(docdir)
- 	mkdir -p $(docdir)/flags $(docdir)/ja
- #explicit use of sh to make sure we don't invoke csh with different "if" syntax
- 	-sh -c "if test -d htdocs/ja >/dev/null ; then mkdir -p $(docdir)/ja ; fi"
--	-cp htdocs/*.{html,png,gif,pdf} $(docdir)
--	-cp htdocs/flags/* $(docdir)/flags
--	-cp htdocs/ja/* $(docdir)/ja
-+	${BSD_INSTALL_DATA} htdocs/*.{html,png,gif,pdf} $(docdir)
-+	${BSD_INSTALL_DATA} htdocs/flags/* $(docdir)/flags
-+	${BSD_INSTALL_DATA} htdocs/ja/* $(docdir)/ja
- 
- install_po:
- 	( cd po ; make install )
-@@ -73,7 +73,7 @@
+@@ -75,7 +75,7 @@
  	mkdir -p $(mandir)/man1
  	mkdir -p $(sharedir)
  	$(LIBTOOL) --mode=install $(INSTALL) -c fontforge/fontforge $(bindir)
--	-$(LIBTOOL) --mode=install $(INSTALL) -c fontforge/sfddiff $(bindir)
+-#	-$(LIBTOOL) --mode=install $(INSTALL) -c fontforge/sfddiff $(bindir)
 +	$(LIBTOOL) --mode=install $(INSTALL) -c fontforge/sfddiff $(bindir)
  #	-rm -f $(bindir)/pfaedit
  #	(cd $(bindir) ; ln -s fontforge pfaedit)
- #	cp fontforge/pfaedit-*.ui $(sharedir)
+ #	$(INSTALL_DATA) fontforge/pfaedit-*.ui $(sharedir)
+@@ -84,7 +84,7 @@
+ # if you are editing CID keyed files (and even then you can live without them
+ 	-$(INSTALL_DATA) $(srcdir)/cidmap/*.cidmap $(sharedir) >/dev/null 2>&1
+ 	$(INSTALL_DATA) $(srcdir)/fontforge/fontforge.1 $(mandir)/man1
+-#	-$(INSTALL_DATA) $(srcdir)/fontforge/sfddiff.1 $(mandir)/man1
++	$(INSTALL_DATA) $(srcdir)/fontforge/sfddiff.1 $(mandir)/man1
+ #explicit use of sh to make sure we don't invoke csh with different "if" syntax
+ 	sh -c "if test -d $(srcdir)/htdocs >/dev/null ; then $(MAKE) install_docs ; fi"
+ 	sh < systemspecific
diff --git a/print/fontforge/files/patch-fontforge-fontinfo.c b/print/fontforge/files/patch-fontforge-fontinfo.c
deleted file mode 100644
index 7d7d286e3382..000000000000
--- a/print/fontforge/files/patch-fontforge-fontinfo.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- fontforge/fontinfo.c.orig	Wed Jan 11 20:00:54 2006
-+++ fontforge/fontinfo.c	Tue Jan 24 12:55:39 2006
-@@ -5311,6 +5311,7 @@
- 		 (sf->xuid!=NULL && uc_strcmp(txt,sf->xuid)==0) ||
- 		 ttfuniqueidmatch(sf,d)) ) {
- 	    char *buts[4];
-+	    int ans;
- 	    buts[0] = _("Change");
- 	    buts[1] = _("Retain");
- #if defined(FONTFORGE_CONFIG_GDRAW)
-@@ -5319,7 +5320,7 @@
- 	    buts[2] = GTK_STOCK_CANCEL;
- #endif
- 	    buts[3] = NULL;
--	    int ans = gwwv_ask(_("Change UniqueID?"),(const char **) buts,0,2,_("You have changed this font's name without changing the UniqueID (or XUID).\nThis is probably not a good idea, would you like me to\ngenerate a random new value?"));
-+	    ans = gwwv_ask(_("Change UniqueID?"),(const char **) buts,0,2,_("You have changed this font's name without changing the UniqueID (or XUID).\nThis is probably not a good idea, would you like me to\ngenerate a random new value?"));
- 	    if ( ans==2 ) {
- 		GDrawSetCursor(gw,ct_pointer);
- return(true);
diff --git a/print/fontforge/files/patch-fontforge-parsettf.c b/print/fontforge/files/patch-fontforge-parsettf.c
deleted file mode 100644
index 8b8e71bcde1c..000000000000
--- a/print/fontforge/files/patch-fontforge-parsettf.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- fontforge/parsettf.c.orig	Sun Jan 15 00:40:17 2006
-+++ fontforge/parsettf.c	Tue Jan 24 13:04:32 2006
-@@ -4277,18 +4277,19 @@
-     if ( !info->onlystrikes &&
- 	    info->glyphlocations_start!=0 && info->glyph_start!=0 &&
- 	    info->cff_start!=0 ) {
-+	int choice;
- 	char *buts[4];
- 	buts[0] = _("TTF 'glyf'");
- 	buts[1] = _("OTF 'CFF '");
- 	buts[3] = NULL;
- #if defined(FONTFORGE_CONFIG_GDRAW)
- 	buts[2] = _("_Cancel");
--	int choice = gwwv_ask(_("Pick a font, any font..."),(const char **) buts,0,2,_("This font contains both a TrueType 'glyf' table and an OpenType 'CFF ' table. FontForge can only deal with one at a time, please pick which one you want to use"));
-+	choice = gwwv_ask(_("Pick a font, any font..."),(const char **) buts,0,2,_("This font contains both a TrueType 'glyf' table and an OpenType 'CFF ' table. FontForge can only deal with one at a time, please pick which one you want to use"));
- #elif defined(FONTFORGE_CONFIG_GTK)
- 	buts[2] = GTK_STOCK_CANCEL;
--	int choice = gwwv_ask(_("Pick a font, any font..."),(const char **) buts,0,2,_("This font contains both a TrueType 'glyf' table and an OpenType 'CFF ' table. FontForge can only deal with one at a time, please pick which one you want to use"));
-+	choice = gwwv_ask(_("Pick a font, any font..."),(const char **) buts,0,2,_("This font contains both a TrueType 'glyf' table and an OpenType 'CFF ' table. FontForge can only deal with one at a time, please pick which one you want to use"));
- #else
--	int choice = 0;
-+	choice = 0;
- #endif
- 	if ( choice==2 ) {
- 	    setlocale(LC_NUMERIC,oldloc);
diff --git a/print/fontforge/files/patch-fontforge::Makefile.dynamic.in b/print/fontforge/files/patch-fontforge::Makefile.dynamic.in
index 414c65afbdb7..680d9f665289 100644
--- a/print/fontforge/files/patch-fontforge::Makefile.dynamic.in
+++ b/print/fontforge/files/patch-fontforge::Makefile.dynamic.in
@@ -1,7 +1,7 @@
---- fontforge/Makefile.dynamic.in.orig	Fri Nov 11 11:41:01 2005
-+++ fontforge/Makefile.dynamic.in	Sun Dec  4 16:59:47 2005
-@@ -45,16 +45,16 @@
- DIFFOBJS = sfddiff.o sfd.o diffstubs.o stamp.o
+--- fontforge/Makefile.dynamic.in.orig	Tue Mar 14 09:30:39 2006
++++ fontforge/Makefile.dynamic.in	Tue Mar 14 15:59:46 2006
+@@ -45,17 +45,17 @@
+ DIFFOBJS = sfddiff.o sfd.o diffstubs.o stamp.o namelist.o pua.o
  ACORNOBJS = acorn2sfd.o sfd.o diffstubs.o psunicodenames.o stamp.o
  
 -_CFLAGS = -I$(top_srcdir)/inc -I$(srcdir) -I. @WFLAGS@ $(X_CFLAGS) \
@@ -10,10 +10,11 @@
      @CPPFLAGS@ '-DPREFIX="@prefix@"'
  CFLAGS = @CFLAGS@ $(_CFLAGS)
  
+ #I used to include -L/usr/lib explicitly after static_libs. Not sure why. Should be implied & breaks 64bit compiles
  LIBS = -rpath $(libdir) $(X_LIBS) ../libgdraw.la ../libgunicode.la \
--    $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -L/usr/lib -lm
+-    $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -lm
 -DLIBS = -rpath $(libdir) ../libgunicode.la @LIBS@ $(STATIC_LIBS) -lm
-+    $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -L/usr/lib -lm -lintl
++    $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -lm -lintl
 +DLIBS = -rpath $(libdir) ../libgunicode.la @LIBS@ $(STATIC_LIBS) -lm -lintl
  
 -all: fontforge
diff --git a/print/fontforge/files/patch-plugins-Makefile.in b/print/fontforge/files/patch-plugins-Makefile.in
new file mode 100644
index 000000000000..8ecdfd0fb44e
--- /dev/null
+++ b/print/fontforge/files/patch-plugins-Makefile.in
@@ -0,0 +1,11 @@
+--- plugins/Makefile.in.orig	Fri Nov 11 10:46:50 2005
++++ plugins/Makefile.in	Wed Mar  1 10:40:02 2006
+@@ -28,7 +28,7 @@
+ CFLAGS = @CFLAGS@ $(_CFLAGS)
+ 
+ LIBS = -rpath $(libdir) $(X_LIBS) ../libgdraw.la ../libgunicode.la \
+-    $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -L/usr/lib -lm
++    $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -L/usr/lib -L/usr/local/lib -lm
+ 
+ PLUGINS = gb12345.la
+ 
diff --git a/print/fontforge/pkg-plist b/print/fontforge/pkg-plist
index 84c07ca1967f..b113b45771aa 100644
--- a/print/fontforge/pkg-plist
+++ b/print/fontforge/pkg-plist
@@ -19,6 +19,10 @@ share/locale/ru/LC_MESSAGES/FontForge.mo
 %%DATADIR%%/Adobe-Japan1-6.cidmap
 %%DATADIR%%/Adobe-Japan2-0.cidmap
 %%DATADIR%%/Adobe-Korea1-2.cidmap
+%%DATADIR%%/plugins/gb12345.la
+%%DATADIR%%/plugins/gb12345.lai
+%%DATADIR%%/plugins/gb12345.so
+%%DATADIR%%/plugins/gb12345.so.0
 %%PORTDOCS%%%%DOCSDIR%%/AA-Comparison.html
 %%PORTDOCS%%%%DOCSDIR%%/AmbrosiaFV-bm.png
 %%PORTDOCS%%%%DOCSDIR%%/AmbrosiaFV.png
@@ -196,6 +200,7 @@ share/locale/ru/LC_MESSAGES/FontForge.mo
 %%PORTDOCS%%%%DOCSDIR%%/corpchar.html
 %%PORTDOCS%%%%DOCSDIR%%/corpchar.txt
 %%PORTDOCS%%%%DOCSDIR%%/cpodd.png
+%%PORTDOCS%%%%DOCSDIR%%/cubic2quad.png
 %%PORTDOCS%%%%DOCSDIR%%/cvarrowicon.png
 %%PORTDOCS%%%%DOCSDIR%%/cvcornericon.png
 %%PORTDOCS%%%%DOCSDIR%%/cvcurveicon.png
@@ -251,6 +256,7 @@ share/locale/ru/LC_MESSAGES/FontForge.mo
 %%PORTDOCS%%%%DOCSDIR%%/expand-pre.png
 %%PORTDOCS%%%%DOCSDIR%%/expandedlines.png
 %%PORTDOCS%%%%DOCSDIR%%/expandstroke.png
+%%PORTDOCS%%%%DOCSDIR%%/extrema-poi.png
 %%PORTDOCS%%%%DOCSDIR%%/f+i.png
 %%PORTDOCS%%%%DOCSDIR%%/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/faqFS.html
@@ -276,6 +282,8 @@ share/locale/ru/LC_MESSAGES/FontForge.mo
 %%PORTDOCS%%%%DOCSDIR%%/findprobs-random.png
 %%PORTDOCS%%%%DOCSDIR%%/findprobs-refs.png
 %%PORTDOCS%%%%DOCSDIR%%/findprobs.png
+%%PORTDOCS%%%%DOCSDIR%%/fontcompdlg.png
+%%PORTDOCS%%%%DOCSDIR%%/fontcompresults.png
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-anchors.png
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-cid.png
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-comment.png
@@ -404,6 +412,7 @@ share/locale/ru/LC_MESSAGES/FontForge.mo
 %%PORTDOCS%%%%DOCSDIR%%/o4.png
 %%PORTDOCS%%%%DOCSDIR%%/o5.png
 %%PORTDOCS%%%%DOCSDIR%%/oldchangelog.html
+%%PORTDOCS%%%%DOCSDIR%%/openfont.png
 %%PORTDOCS%%%%DOCSDIR%%/otherlinks.html
 %%PORTDOCS%%%%DOCSDIR%%/ott1.png
 %%PORTDOCS%%%%DOCSDIR%%/ott2.png
@@ -426,6 +435,7 @@ share/locale/ru/LC_MESSAGES/FontForge.mo
 %%PORTDOCS%%%%DOCSDIR%%/plugins.html
 %%PORTDOCS%%%%DOCSDIR%%/pnts.gif
 %%PORTDOCS%%%%DOCSDIR%%/pointinfo.png
+%%PORTDOCS%%%%DOCSDIR%%/pointinfo-interp.png
 %%PORTDOCS%%%%DOCSDIR%%/pointmenu.html
 %%PORTDOCS%%%%DOCSDIR%%/pointsize.png
 %%PORTDOCS%%%%DOCSDIR%%/prefs-apps.png
@@ -543,9 +553,12 @@ share/locale/ru/LC_MESSAGES/FontForge.mo
 %%PORTDOCS%%%%DOCSDIR%%/ja/HotKeys.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/IndexFS.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/IndexFrame.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/MacFeatName.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/MacMapping.png
 %%PORTDOCS%%%%DOCSDIR%%/ja/MacOSX.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/MetaFont.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/MetricsView.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/PageSetup.png
 %%PORTDOCS%%%%DOCSDIR%%/ja/PfaEdit-TeX.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/TrueOpenTables.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/UniqueID.html
@@ -556,6 +569,7 @@ share/locale/ru/LC_MESSAGES/FontForge.mo
 %%PORTDOCS%%%%DOCSDIR%%/ja/anchorcontrol.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/autotrace.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/autowidth.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/bdfinfo.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/bezier.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/bibliography.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/bitmapsavail.png
@@ -591,6 +605,8 @@ share/locale/ru/LC_MESSAGES/FontForge.mo
 %%PORTDOCS%%%%DOCSDIR%%/ja/faqFrame.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/filemenu.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/files.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/fontcompdlg.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/fontcompresults.png
 %%PORTDOCS%%%%DOCSDIR%%/ja/fontinfo-comment.png
 %%PORTDOCS%%%%DOCSDIR%%/ja/fontinfo-macstyle.png
 %%PORTDOCS%%%%DOCSDIR%%/ja/fontinfo-panose.png
@@ -621,9 +637,12 @@ share/locale/ru/LC_MESSAGES/FontForge.mo
 %%PORTDOCS%%%%DOCSDIR%%/ja/histogram.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/index.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/kernpairs.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/layerdlg.png
 %%PORTDOCS%%%%DOCSDIR%%/ja/license.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/locale.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/mac-install.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/macFeatureSetting.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/macfeature.png
 %%PORTDOCS%%%%DOCSDIR%%/ja/macformats.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/mad.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/metricsmenu.html
@@ -644,8 +663,16 @@ share/locale/ru/LC_MESSAGES/FontForge.mo
 %%PORTDOCS%%%%DOCSDIR%%/ja/pfaeditmath.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/plugins.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/pointinfo.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/pointinfo-interp.png
 %%PORTDOCS%%%%DOCSDIR%%/ja/pointmenu.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/prefs.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/prefs-apps.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/prefs-editing.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/prefs-font.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/prefs-generic.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/prefs-macfeat.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/prefs-macmap.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/prefs-script.png
 %%PORTDOCS%%%%DOCSDIR%%/ja/print.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/privatekey.png
 %%PORTDOCS%%%%DOCSDIR%%/ja/privatekeymenu.png
@@ -679,8 +706,11 @@ share/locale/ru/LC_MESSAGES/FontForge.mo
 %%PORTDOCS%%%%DOCSDIR%%/ja/windowmenu.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/xim.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/xres.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/nonBMP/index.html
+@dirrm %%DATADIR%%/plugins
 @dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%/flags
+@dirrm %%DOCSDIR%%/ja/nonBMP
 @dirrm %%DOCSDIR%%/ja
 @dirrm %%DOCSDIR%%
 @dirrmtry share/locale/es/LC_MESSAGES