13 files changed, 108 insertions, 183 deletions

diff --git a/print/Makefile b/print/Makefile
index f7c7b81278a4..f1376086f269 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -59,6 +59,7 @@
     SUBDIR += epsmerge
     SUBDIR += epsonepl
     SUBDIR += font2svg
+    SUBDIR += fontforge
     SUBDIR += foomatic-db
     SUBDIR += foomatic-db-engine
     SUBDIR += freetype
diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index 248bb77f9115..2093549120a4 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -1,18 +1,18 @@
-# New ports collection makefile for:	pfaedit
+# New ports collection makefile for:	fontforge
 # Date created:		25 March 2001
 # Whom:			KANOU Hiroki <kanou@khdd.net>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	pfaedit
-PORTVERSION=	20${DIST_VER}
-PORTREVISION=	1
+PORTNAME=	fontforge
+PORTVERSION=	20040404
+PORTREVISION=	0
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	pfaedit
+MASTER_SITE_SUBDIR=	fontforge
 DISTFILES=	${EXTRACT_ONLY} ${DOCFILE}
-EXTRACT_ONLY=	${PORTNAME}_full-${DIST_VER}.tgz
+EXTRACT_ONLY=	${PORTNAME}_full-${PORTVERSION}.tgz
 
 MAINTAINER=	kanou@khdd.net
 COMMENT=	Type 1/TrueType/OpenType/bitmap font editor
@@ -23,22 +23,23 @@ LIB_DEPENDS=	uninameslist.0:${PORTSDIR}/textproc/libuninameslist \
 		png.5:${PORTSDIR}/graphics/png \
 		ungif.5:${PORTSDIR}/graphics/libungif \
 		freetype.9:${PORTSDIR}/print/freetype2 \
-		xml2:${PORTSDIR}/textproc/libxml2
+		xml2.5:${PORTSDIR}/textproc/libxml2
 
-DOCFILE=	${PORTNAME}_htdocs-${DIST_VER}.tgz
-DIST_VER=	031210
+DOCFILE=	${PORTNAME}_htdocs-${PORTVERSION}.tgz
 
 USE_GMAKE=	yes
 USE_XLIB=	yes
-USE_AUTOCONF_VER=	253
+USE_ICONV=	yes
 PATCH_STRIP=	-l
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -L${LOCALBASE}/lib"
-WRKSRC=		${WRKDIR}/${PORTNAME}-${DIST_VER}
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" CFLAGS="${CFLAGS} \
+		-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \
+		-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include \
+		-I${LOCALBASE}/include/freetype2"
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL=	yes
 
-MAN1=		pfaedit.1 sfddiff.1
+MAN1=		fontforge.1 sfddiff.1
 
 post-extract:
 	${MKDIR} ${WRKDIR}/html ${WRKSRC}/cidmap
@@ -47,9 +48,9 @@ post-extract:
 	${RM} ${WRKDIR}/html/cidmaps.tgz
 
 post-install:
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}
+.if !defined(NOPORTDOCS)
 	${INSTALL_DATA} ${WRKDIR}/html/* ${DOCSDIR}
 .endif
 
diff --git a/print/fontforge/distinfo b/print/fontforge/distinfo
index 41a6072a8ced..8c101564b11a 100644
--- a/print/fontforge/distinfo
+++ b/print/fontforge/distinfo
@@ -1,4 +1,4 @@
-MD5 (pfaedit_full-031210.tgz) = e193fab1297831a6cd67e6f25eff63ca
-SIZE (pfaedit_full-031210.tgz) = 3703711
-MD5 (pfaedit_htdocs-031210.tgz) = 7ce8e56ced033c3b9abd3869db4b64c3
-SIZE (pfaedit_htdocs-031210.tgz) = 1748222
+MD5 (fontforge_full-20040404.tgz) = f2fb9c9b6ad494ecce59060c02e80435
+SIZE (fontforge_full-20040404.tgz) = 3995057
+MD5 (fontforge_htdocs-20040404.tgz) = 7dbd845267e40b06d1b7f0bb91fdd042
+SIZE (fontforge_htdocs-20040404.tgz) = 2008009
diff --git a/print/fontforge/files/patch-Makefile.dynamic.in b/print/fontforge/files/patch-Makefile.dynamic.in
index 1a9bd801c48b..9c8aca62eab7 100644
--- a/print/fontforge/files/patch-Makefile.dynamic.in
+++ b/print/fontforge/files/patch-Makefile.dynamic.in
@@ -1,25 +1,25 @@
---- Makefile.dynamic.in.orig	Tue Dec  3 10:07:14 2002
-+++ Makefile.dynamic.in	Sun Apr 20 16:11:41 2003
+--- Makefile.dynamic.in.orig	Wed Mar  3 04:23:46 2004
++++ Makefile.dynamic.in	Tue Apr 20 00:17:10 2004
 @@ -53,15 +53,16 @@
  	mkdir -p $(bindir)
  	mkdir -p $(mandir)/man1
  	mkdir -p $(sharedir)
--	$(LIBTOOL) $(INSTALL) -c pfaedit/pfaedit $(bindir)
--	$(LIBTOOL) $(INSTALL) -c pfaedit/sfddiff $(bindir)
--	cp pfaedit/pfaedit-*.ui $(sharedir)
-+	${BSD_INSTALL_PROGRAM} pfaedit/.libs/pfaedit $(bindir)
-+	${BSD_INSTALL_PROGRAM} pfaedit/.libs/sfddiff $(bindir)
-+	${BSD_INSTALL_PROGRAM} pfaedit/.libs/acorn2sfd $(bindir)
-+	${BSD_INSTALL_DATA} pfaedit/pfaedit-*.ui $(sharedir)
+-	$(LIBTOOL) $(INSTALL) -c fontforge/fontforge $(bindir)
+-	$(LIBTOOL) $(INSTALL) -c fontforge/sfddiff $(bindir)
+-	cp fontforge/pfaedit-*.ui $(sharedir)
++	${BSD_INSTALL_PROGRAM} -c fontforge/.libs/fontforge $(bindir)
++	${BSD_INSTALL_PROGRAM} -c fontforge/.libs/sfddiff $(bindir)
++	${BSD_INSTALL_PROGRAM} -c fontforge/.libs/acorn2sfd $(bindir)
++	${BSD_INSTALL_DATA} fontforge/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
  # if you are editing CID keyed files (and even then you can live without them
 -	-cp $(srcdir)/cidmap/*.cidmap $(sharedir) >/dev/null 2>&1
--	cp $(srcdir)/pfaedit/pfaedit.1 $(mandir)/man1
--	cp $(srcdir)/pfaedit/sfddiff.1 $(mandir)/man1
+-	cp $(srcdir)/fontforge/fontforge.1 $(mandir)/man1
+-	cp $(srcdir)/fontforge/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)/fontforge/fontforge.1 $(mandir)/man1
++	${BSD_INSTALL_MAN} $(srcdir)/fontforge/sfddiff.1 $(mandir)/man1
  
  uninstall:
- 	-rm $(bindir)/pfaedit
+ 	-rm $(bindir)/fontforge
diff --git a/print/fontforge/files/patch-Makefile.static.in b/print/fontforge/files/patch-Makefile.static.in
deleted file mode 100644
index a740eef7b0bf..000000000000
--- a/print/fontforge/files/patch-Makefile.static.in
+++ /dev/null
@@ -1,25 +0,0 @@
---- Makefile.static.in.orig	Thu Oct 24 03:34:40 2002
-+++ Makefile.static.in	Sat Oct 26 01:55:17 2002
-@@ -39,15 +39,16 @@
- 	mkdir -p $(bindir)
- 	mkdir -p $(mandir)/man1
- 	mkdir -p $(sharedir)
--	cp pfaedit/pfaedit $(bindir)
--	cp pfaedit/sfddiff $(bindir)
--	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
- # if you are editing CID keyed files (and even then you can live without them
--	-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
- 
- uninstall:
- 	-rm $(bindir)/pfaedit
diff --git a/print/fontforge/files/patch-configure.dynamic.in b/print/fontforge/files/patch-configure.dynamic.in
deleted file mode 100644
index 33e4e850b965..000000000000
--- a/print/fontforge/files/patch-configure.dynamic.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.dynamic.in.orig	Sat Dec  6 02:20:19 2003
-+++ configure.dynamic.in	Wed Jan 21 09:51:24 2004
-@@ -47,7 +47,6 @@
- 
- AC_SEARCH_LIBS(dlopen, dl) dnl some systems have this in libc (Darwin uses dyld)
- AC_SEARCH_LIBS(inet_aton, resolv) dnl some systems have this in libc
--AC_SEARCH_LIBS(libiconv, iconv) dnl linux has iconv in libc, mac has libiconv in libiconv, and a define to map iconv() to libiconv(), so we can't do the obvious check
- 
- dnl Is there a better way to add a directory to the include path?
- 
-@@ -89,8 +88,6 @@
- AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, :  ,AC_DEFINE(_NO_LIBJPEG)) 
- AC_CHECK_LIB(tiff, TIFFOpen, : , AC_DEFINE(_NO_LIBTIFF), -lm )
- AC_CHECK_LIB(xml2, xmlParseFile, : , AC_DEFINE(_NO_LIBXML))
--
--AC_CHECK_HEADERS([iconv.h])
- 
- gww_hasbytecode="no"
- AC_ARG_WITH(freetype-bytecode,
diff --git a/print/fontforge/files/patch-configure.in b/print/fontforge/files/patch-configure.in
deleted file mode 100644
index 55c6597733d2..000000000000
--- a/print/fontforge/files/patch-configure.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.in.orig	Thu Dec  4 02:51:54 2003
-+++ configure.in	Tue Jan 20 21:45:56 2004
-@@ -47,7 +47,6 @@
- 
- AC_SEARCH_LIBS(dlopen, dl) dnl some systems have this in libc (Darwin uses dyld)
- AC_SEARCH_LIBS(inet_aton, resolv) dnl some systems have this in libc
--AC_SEARCH_LIBS(libiconv, iconv) dnl linux has iconv in libc, mac has libiconv in libiconv, and a define to map iconv() to libiconv(), so we can't do the obvious check
- 
- dnl Is there a better way to add a directory to the include path?
- 
-@@ -89,8 +88,6 @@
- AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, :  ,AC_DEFINE(_NO_LIBJPEG)) 
- AC_CHECK_LIB(tiff, TIFFOpen, : , AC_DEFINE(_NO_LIBTIFF), -lm )
- AC_CHECK_LIB(xml2, xmlParseFile, : , AC_DEFINE(_NO_LIBXML))
--
--AC_CHECK_HEADERS([iconv.h])
- 
- gww_hasbytecode="no"
- AC_ARG_WITH(freetype-bytecode,
diff --git a/print/fontforge/files/patch-configure.static.in b/print/fontforge/files/patch-configure.static.in
deleted file mode 100644
index ffd525fcb656..000000000000
--- a/print/fontforge/files/patch-configure.static.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.static.in.orig	Thu Dec  4 02:51:54 2003
-+++ configure.static.in	Wed Jan 21 09:50:26 2004
-@@ -33,7 +33,6 @@
- 
- AC_SEARCH_LIBS(dlopen, dl) dnl some systems have this in libc
- AC_SEARCH_LIBS(inet_aton, resolv) dnl some systems have this in libc
--AC_SEARCH_LIBS(libiconv, iconv) dnl linux has iconv in libc, mac has libiconv in libiconv, and a define to map iconv() to libiconv(), so we can't do the obvious check
- 
- dnl Is there a better way to add a directory to the include path?
- 
-@@ -75,8 +74,6 @@
- AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, :  ,AC_DEFINE(_NO_LIBJPEG)) 
- AC_CHECK_LIB(tiff, TIFFOpen, : , AC_DEFINE(_NO_LIBTIFF), -lm )
- AC_CHECK_LIB(xml2, xmlParseFile, : , AC_DEFINE(_NO_LIBXML))
--
--AC_CHECK_HEADERS([iconv.h])
- 
- gww_hasbytecode="no"
- AC_CHECK_LIB(freetype, FT_New_Memory_Face, [
diff --git a/print/fontforge/files/patch-fontforge::Makefile.dynamic.in b/print/fontforge/files/patch-fontforge::Makefile.dynamic.in
index ab9e6dc4963b..a3e57b01ddb0 100644
--- a/print/fontforge/files/patch-fontforge::Makefile.dynamic.in
+++ b/print/fontforge/files/patch-fontforge::Makefile.dynamic.in
@@ -1,11 +1,20 @@
---- pfaedit/Makefile.dynamic.in.orig	Thu Mar  6 04:31:05 2003
-+++ pfaedit/Makefile.dynamic.in	Sun Apr 20 16:58:21 2003
-@@ -47,7 +47,7 @@
+--- fontforge/Makefile.dynamic.in.orig	Mon Apr 19 07:05:48 2004
++++ fontforge/Makefile.dynamic.in	Mon Apr 19 07:06:42 2004
+@@ -44,7 +44,7 @@
+ 
+ WFLAGS = -Wmissing-prototypes -Wunused -Wimplicit -Wreturn-type -Wparentheses \
+ 	-Wformat -Wchar-subscripts 
+-_CFLAGS = -I$(top_srcdir)/inc -I$(srcdir) -I. $(WFLAGS) $(X_CFLAGS) \
++_CFLAGS = -I$(top_srcdir)/inc -I$(srcdir) -I$(PREFIX)/include -I. $(WFLAGS) $(X_CFLAGS) \
+     @DEFS@ '-DSHAREDIR="$(sharedir)"' -DLIBDIR='"$(libdir)"'
+ CFLAGS = @CFLAGS@ $(_CFLAGS)
+ 
+@@ -52,7 +52,7 @@
      $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -L/usr/lib -lm
- DLIBS = -rpath $(libdir) ../libgunicode.la -lm
+ DLIBS = -rpath $(libdir) ../libgunicode.la @LIBS@ -lm
  
--all: pfaedit-en.ui pfaedit sfddiff
-+all: pfaedit-en.ui pfaedit sfddiff acorn2sfd
+-all: pfaedit-en.ui fontforge sfddiff
++all: pfaedit-en.ui fontforge sfddiff acorn2sfd
  
- pfaedit: nomen.h $(pfaedit_OBJECTS)
- 	$(LIBTOOL) $(CC) -o pfaedit $(pfaedit_OBJECTS) $(LIBS)
+ fontforge: nomen.h $(fontforge_OBJECTS)
+ 	$(LIBTOOL) $(CC) -o fontforge $(fontforge_OBJECTS) $(LIBS)
diff --git a/print/fontforge/files/patch-fontforge::configure-pfaedit.h b/print/fontforge/files/patch-fontforge::configure-pfaedit.h
index 2f2d01191cdf..29c7d0562b25 100644
--- a/print/fontforge/files/patch-fontforge::configure-pfaedit.h
+++ b/print/fontforge/files/patch-fontforge::configure-pfaedit.h
@@ -1,11 +1,11 @@
---- pfaedit/configure-pfaedit.h.orig	Tue May 13 03:20:08 2003
-+++ pfaedit/configure-pfaedit.h	Tue May 13 10:24:58 2003
+--- fontforge/configure-pfaedit.h.orig	Tue May 13 03:20:08 2003
++++ fontforge/configure-pfaedit.h	Tue May 13 10:24:58 2003
 @@ -31,7 +31,7 @@
  /*  don't include code for it by default, but if you do want it simply define */
  /*  the following macro							      */
  /*									      */
--/* #define PFAEDIT_CONFIG_TILEPATH					      */
-+#define PFAEDIT_CONFIG_TILEPATH
+-/* #define FONTFORGE_CONFIG_TILEPATH					      */
++#define FONTFORGE_CONFIG_TILEPATH
  /*									      */
  /* The tile path command uses the contents of the clipboard as a tile which is*/
  /*  applied to any selected paths, replacing them. It could be used to make a */
@@ -13,8 +13,8 @@
  /*  routine. I'm not sure that it's very useful though. It can be used to do  */
  /*  perspective transformations and such				      */
  /*									      */
--/* #define PFAEDIT_CONFIG_NONLINEAR					      */
-+#define PFAEDIT_CONFIG_NONLINEAR
+-/* #define FONTFORGE_CONFIG_NONLINEAR					      */
++#define FONTFORGE_CONFIG_NONLINEAR
  /*									      */
  /* This command takes two strings which specify general expressions in x and y*/
  /*  and applies the specified transformations to the splines.  Note: Each     */
diff --git a/print/fontforge/files/patch-pfaedit::Makefile.dynamic.in b/print/fontforge/files/patch-pfaedit::Makefile.dynamic.in
deleted file mode 100644
index ab9e6dc4963b..000000000000
--- a/print/fontforge/files/patch-pfaedit::Makefile.dynamic.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- pfaedit/Makefile.dynamic.in.orig	Thu Mar  6 04:31:05 2003
-+++ pfaedit/Makefile.dynamic.in	Sun Apr 20 16:58:21 2003
-@@ -47,7 +47,7 @@
-     $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -L/usr/lib -lm
- DLIBS = -rpath $(libdir) ../libgunicode.la -lm
- 
--all: pfaedit-en.ui pfaedit sfddiff
-+all: pfaedit-en.ui pfaedit sfddiff acorn2sfd
- 
- pfaedit: nomen.h $(pfaedit_OBJECTS)
- 	$(LIBTOOL) $(CC) -o pfaedit $(pfaedit_OBJECTS) $(LIBS)
diff --git a/print/fontforge/files/patch-pfaedit::configure-pfaededit.h b/print/fontforge/files/patch-pfaedit::configure-pfaededit.h
deleted file mode 100644
index 2f2d01191cdf..000000000000
--- a/print/fontforge/files/patch-pfaedit::configure-pfaededit.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- pfaedit/configure-pfaedit.h.orig	Tue May 13 03:20:08 2003
-+++ pfaedit/configure-pfaedit.h	Tue May 13 10:24:58 2003
-@@ -31,7 +31,7 @@
- /*  don't include code for it by default, but if you do want it simply define */
- /*  the following macro							      */
- /*									      */
--/* #define PFAEDIT_CONFIG_TILEPATH					      */
-+#define PFAEDIT_CONFIG_TILEPATH
- /*									      */
- /* The tile path command uses the contents of the clipboard as a tile which is*/
- /*  applied to any selected paths, replacing them. It could be used to make a */
-@@ -42,7 +42,7 @@
- /*  routine. I'm not sure that it's very useful though. It can be used to do  */
- /*  perspective transformations and such				      */
- /*									      */
--/* #define PFAEDIT_CONFIG_NONLINEAR					      */
-+#define PFAEDIT_CONFIG_NONLINEAR
- /*									      */
- /* This command takes two strings which specify general expressions in x and y*/
- /*  and applies the specified transformations to the splines.  Note: Each     */
diff --git a/print/fontforge/pkg-plist b/print/fontforge/pkg-plist
index cd68ae7de680..a5d4e6a59603 100644
--- a/print/fontforge/pkg-plist
+++ b/print/fontforge/pkg-plist
@@ -1,4 +1,4 @@
-bin/pfaedit
+bin/fontforge
 bin/sfddiff
 bin/acorn2sfd
 lib/libgdraw.la
@@ -15,7 +15,6 @@ lib/libgunicode.so.2
 %%PORTDOCS%%%%DOCSDIR%%/BDFgrey.html
 %%PORTDOCS%%%%DOCSDIR%%/BethSans.png
 %%PORTDOCS%%%%DOCSDIR%%/BethSerif.png
-%%PORTDOCS%%%%DOCSDIR%%/Bezier.gif
 %%PORTDOCS%%%%DOCSDIR%%/Big5.txt
 %%PORTDOCS%%%%DOCSDIR%%/BitmapView.png
 %%PORTDOCS%%%%DOCSDIR%%/C1.png
@@ -30,7 +29,6 @@ lib/libgunicode.so.2
 %%PORTDOCS%%%%DOCSDIR%%/C9.png
 %%PORTDOCS%%%%DOCSDIR%%/CaslonOriginality.png
 %%PORTDOCS%%%%DOCSDIR%%/CharPrint.png
-%%PORTDOCS%%%%DOCSDIR%%/CharView.png
 %%PORTDOCS%%%%DOCSDIR%%/Constrain1_1.png
 %%PORTDOCS%%%%DOCSDIR%%/Constrain1_2.png
 %%PORTDOCS%%%%DOCSDIR%%/Constrain2_1.png
@@ -46,6 +44,7 @@ lib/libgunicode.so.2
 %%PORTDOCS%%%%DOCSDIR%%/Encodings.ps.gz
 %%PORTDOCS%%%%DOCSDIR%%/FVHMetrics.png
 %%PORTDOCS%%%%DOCSDIR%%/FVVMetrics.png
+%%PORTDOCS%%%%DOCSDIR%%/FontForgeSplash.png
 %%PORTDOCS%%%%DOCSDIR%%/FontDisplay.png
 %%PORTDOCS%%%%DOCSDIR%%/FontSample.png
 %%PORTDOCS%%%%DOCSDIR%%/GSUB-Order.png
@@ -60,6 +59,7 @@ lib/libgunicode.so.2
 %%PORTDOCS%%%%DOCSDIR%%/HI.hints.png
 %%PORTDOCS%%%%DOCSDIR%%/HI.nohints.png
 %%PORTDOCS%%%%DOCSDIR%%/HebrewMetrics.png
+%%PORTDOCS%%%%DOCSDIR%%/HebrewSerifs.png
 %%PORTDOCS%%%%DOCSDIR%%/Hints.png
 %%PORTDOCS%%%%DOCSDIR%%/HotKeys.html
 %%PORTDOCS%%%%DOCSDIR%%/IndexFS.html
@@ -67,7 +67,6 @@ lib/libgunicode.so.2
 %%PORTDOCS%%%%DOCSDIR%%/ItalicCompCaslon.png
 %%PORTDOCS%%%%DOCSDIR%%/ItalicCompGalliard.png
 %%PORTDOCS%%%%DOCSDIR%%/KernPairs.png
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/MacFeatName.png
 %%PORTDOCS%%%%DOCSDIR%%/MacMapping.png
 %%PORTDOCS%%%%DOCSDIR%%/MacOSX.html
@@ -80,13 +79,11 @@ lib/libgunicode.so.2
 %%PORTDOCS%%%%DOCSDIR%%/PfaEdit-TeX.html
 %%PORTDOCS%%%%DOCSDIR%%/PfaEdits.gif
 %%PORTDOCS%%%%DOCSDIR%%/Print.png
-%%PORTDOCS%%%%DOCSDIR%%/Problems-MacOSX.html
 %%PORTDOCS%%%%DOCSDIR%%/ReviewHints.png
 %%PORTDOCS%%%%DOCSDIR%%/SelectByATT.png
 %%PORTDOCS%%%%DOCSDIR%%/Shades.png
 %%PORTDOCS%%%%DOCSDIR%%/Shades2.png
 %%PORTDOCS%%%%DOCSDIR%%/Shades4.png
-%%PORTDOCS%%%%DOCSDIR%%/Shadow.png
 %%PORTDOCS%%%%DOCSDIR%%/ShadowWireframe.png
 %%PORTDOCS%%%%DOCSDIR%%/ShowGridFit.png
 %%PORTDOCS%%%%DOCSDIR%%/Spacem_1.png
@@ -101,6 +98,7 @@ lib/libgunicode.so.2
 %%PORTDOCS%%%%DOCSDIR%%/Sxiti.png
 %%PORTDOCS%%%%DOCSDIR%%/Sxiti2.png
 %%PORTDOCS%%%%DOCSDIR%%/Sxiti3.png
+%%PORTDOCS%%%%DOCSDIR%%/TTCvt.png
 %%PORTDOCS%%%%DOCSDIR%%/TTPoints.png
 %%PORTDOCS%%%%DOCSDIR%%/TTRegisters.png
 %%PORTDOCS%%%%DOCSDIR%%/TTStack.png
@@ -121,6 +119,7 @@ lib/libgunicode.so.2
 %%PORTDOCS%%%%DOCSDIR%%/agrave_anchored.png
 %%PORTDOCS%%%%DOCSDIR%%/ahighest.png
 %%PORTDOCS%%%%DOCSDIR%%/autokern.png
+%%PORTDOCS%%%%DOCSDIR%%/autotrace.html
 %%PORTDOCS%%%%DOCSDIR%%/autowidth.html
 %%PORTDOCS%%%%DOCSDIR%%/autowidth.png
 %%PORTDOCS%%%%DOCSDIR%%/autowidthmenu.png
@@ -138,14 +137,17 @@ lib/libgunicode.so.2
 %%PORTDOCS%%%%DOCSDIR%%/charinfo-akhn.png
 %%PORTDOCS%%%%DOCSDIR%%/charinfo-comment.png
 %%PORTDOCS%%%%DOCSDIR%%/charinfo-comp.png
+%%PORTDOCS%%%%DOCSDIR%%/charinfo-counters.png
 %%PORTDOCS%%%%DOCSDIR%%/charinfo-lig.png
 %%PORTDOCS%%%%DOCSDIR%%/charinfo-pos.png
 %%PORTDOCS%%%%DOCSDIR%%/charinfo-subs.png
 %%PORTDOCS%%%%DOCSDIR%%/charinfo.html
 %%PORTDOCS%%%%DOCSDIR%%/charinfo.png
+%%PORTDOCS%%%%DOCSDIR%%/charview-multilayer.png
 %%PORTDOCS%%%%DOCSDIR%%/charview-vert.png
 %%PORTDOCS%%%%DOCSDIR%%/charview.html
 %%PORTDOCS%%%%DOCSDIR%%/charview2.png
+%%PORTDOCS%%%%DOCSDIR%%/charwithhintmask.png
 %%PORTDOCS%%%%DOCSDIR%%/cidmenu.html
 %%PORTDOCS%%%%DOCSDIR%%/cliargs.html
 %%PORTDOCS%%%%DOCSDIR%%/contextchain.html
@@ -167,6 +169,7 @@ lib/libgunicode.so.2
 %%PORTDOCS%%%%DOCSDIR%%/diffs.html
 %%PORTDOCS%%%%DOCSDIR%%/display.html
 %%PORTDOCS%%%%DOCSDIR%%/document.nvd
+%%PORTDOCS%%%%DOCSDIR%%/editcvt.png
 %%PORTDOCS%%%%DOCSDIR%%/editexample.html
 %%PORTDOCS%%%%DOCSDIR%%/editexample2.html
 %%PORTDOCS%%%%DOCSDIR%%/editexample3.html
@@ -174,10 +177,12 @@ lib/libgunicode.so.2
 %%PORTDOCS%%%%DOCSDIR%%/editexample5.html
 %%PORTDOCS%%%%DOCSDIR%%/editexample6.html
 %%PORTDOCS%%%%DOCSDIR%%/editexample7.html
+%%PORTDOCS%%%%DOCSDIR%%/editexample-fr.html
 %%PORTDOCS%%%%DOCSDIR%%/editmenu.html
 %%PORTDOCS%%%%DOCSDIR%%/edittransition-context.png
 %%PORTDOCS%%%%DOCSDIR%%/edittransition-indic.png
 %%PORTDOCS%%%%DOCSDIR%%/edittransition-insert.png
+%%PORTDOCS%%%%DOCSDIR%%/edittransition-kern.png
 %%PORTDOCS%%%%DOCSDIR%%/elementmenu.html
 %%PORTDOCS%%%%DOCSDIR%%/englishkernpairs.txt
 %%PORTDOCS%%%%DOCSDIR%%/errrecovery.html
@@ -196,6 +201,7 @@ lib/libgunicode.so.2
 %%PORTDOCS%%%%DOCSDIR%%/featsetdlg.png
 %%PORTDOCS%%%%DOCSDIR%%/feature-tag-pos.png
 %%PORTDOCS%%%%DOCSDIR%%/feature-tag-sub.png
+%%PORTDOCS%%%%DOCSDIR%%/ffanvil32.png
 %%PORTDOCS%%%%DOCSDIR%%/ffi-caret.png
 %%PORTDOCS%%%%DOCSDIR%%/ffi-moved.png
 %%PORTDOCS%%%%DOCSDIR%%/ffi-refs.png
@@ -217,6 +223,7 @@ lib/libgunicode.so.2
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-context.png
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-encoding.png
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-macfeat.png
+%%PORTDOCS%%%%DOCSDIR%%/fontinfo-macstyle.png
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-panose.png
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-private.png
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-ps.png
@@ -244,6 +251,7 @@ lib/libgunicode.so.2
 %%PORTDOCS%%%%DOCSDIR%%/helpmenu.html
 %%PORTDOCS%%%%DOCSDIR%%/hexley.png
 %%PORTDOCS%%%%DOCSDIR%%/hinting.html
+%%PORTDOCS%%%%DOCSDIR%%/hintmaskinfo.png
 %%PORTDOCS%%%%DOCSDIR%%/hintsmenu.html
 %%PORTDOCS%%%%DOCSDIR%%/histogram.html
 %%PORTDOCS%%%%DOCSDIR%%/histogram.png
@@ -276,6 +284,7 @@ lib/libgunicode.so.2
 %%PORTDOCS%%%%DOCSDIR%%/l8.png
 %%PORTDOCS%%%%DOCSDIR%%/l9.png
 %%PORTDOCS%%%%DOCSDIR%%/langdlg.png
+%%PORTDOCS%%%%DOCSDIR%%/layerdlg.png
 %%PORTDOCS%%%%DOCSDIR%%/layers.png
 %%PORTDOCS%%%%DOCSDIR%%/lcani.gif
 %%PORTDOCS%%%%DOCSDIR%%/lcdigits.png
@@ -292,7 +301,21 @@ lib/libgunicode.so.2
 %%PORTDOCS%%%%DOCSDIR%%/mergepre.png
 %%PORTDOCS%%%%DOCSDIR%%/metricsmenu.html
 %%PORTDOCS%%%%DOCSDIR%%/metricsview.html
+%%PORTDOCS%%%%DOCSDIR%%/mmappleaxes.png
+%%PORTDOCS%%%%DOCSDIR%%/mmaxes.png
+%%PORTDOCS%%%%DOCSDIR%%/mmcharview.png
+%%PORTDOCS%%%%DOCSDIR%%/mmcounts.png
+%%PORTDOCS%%%%DOCSDIR%%/mmdesigns.png
+%%PORTDOCS%%%%DOCSDIR%%/mmextrapolate2.png
+%%PORTDOCS%%%%DOCSDIR%%/mmfinal.png
+%%PORTDOCS%%%%DOCSDIR%%/mmfuncs.png
+%%PORTDOCS%%%%DOCSDIR%%/mmmenu.html
+%%PORTDOCS%%%%DOCSDIR%%/mmnamedstyles.png
+%%PORTDOCS%%%%DOCSDIR%%/mmnamingastyle.png
+%%PORTDOCS%%%%DOCSDIR%%/multilayer.html
+%%PORTDOCS%%%%DOCSDIR%%/multiplemaster.html
 %%PORTDOCS%%%%DOCSDIR%%/newanchor.png
+%%PORTDOCS%%%%DOCSDIR%%/newcountermask.png
 %%PORTDOCS%%%%DOCSDIR%%/newfont.png
 %%PORTDOCS%%%%DOCSDIR%%/non-standard.html
 %%PORTDOCS%%%%DOCSDIR%%/o-baddir.png
@@ -308,6 +331,7 @@ lib/libgunicode.so.2
 %%PORTDOCS%%%%DOCSDIR%%/overshoot.png
 %%PORTDOCS%%%%DOCSDIR%%/overview.html
 %%PORTDOCS%%%%DOCSDIR%%/pcf-format.html
+%%PORTDOCS%%%%DOCSDIR%%/pfaeditchangelog.html
 %%PORTDOCS%%%%DOCSDIR%%/pfaeditmath.html
 %%PORTDOCS%%%%DOCSDIR%%/phi-hints-filled.png
 %%PORTDOCS%%%%DOCSDIR%%/phi-hints-outline.png
@@ -316,13 +340,13 @@ lib/libgunicode.so.2
 %%PORTDOCS%%%%DOCSDIR%%/pnts.gif
 %%PORTDOCS%%%%DOCSDIR%%/pointinfo.png
 %%PORTDOCS%%%%DOCSDIR%%/pointmenu.html
+%%PORTDOCS%%%%DOCSDIR%%/pointsize.png
 %%PORTDOCS%%%%DOCSDIR%%/prefs-apps.png
 %%PORTDOCS%%%%DOCSDIR%%/prefs-editing.png
 %%PORTDOCS%%%%DOCSDIR%%/prefs-font.png
 %%PORTDOCS%%%%DOCSDIR%%/prefs-generic.png
 %%PORTDOCS%%%%DOCSDIR%%/prefs-macfeat.png
 %%PORTDOCS%%%%DOCSDIR%%/prefs-macmap.png
-%%PORTDOCS%%%%DOCSDIR%%/prefs-macset.png
 %%PORTDOCS%%%%DOCSDIR%%/prefs-script.png
 %%PORTDOCS%%%%DOCSDIR%%/prefs.html
 %%PORTDOCS%%%%DOCSDIR%%/print.html
@@ -330,6 +354,7 @@ lib/libgunicode.so.2
 %%PORTDOCS%%%%DOCSDIR%%/privatekeymenu.png
 %%PORTDOCS%%%%DOCSDIR%%/problems.html
 %%PORTDOCS%%%%DOCSDIR%%/quadbezier.gif
+%%PORTDOCS%%%%DOCSDIR%%/quadbezier.png
 %%PORTDOCS%%%%DOCSDIR%%/quadraticspline.png
 %%PORTDOCS%%%%DOCSDIR%%/quotations.html
 %%PORTDOCS%%%%DOCSDIR%%/realindex.html
@@ -382,6 +407,7 @@ lib/libgunicode.so.2
 %%PORTDOCS%%%%DOCSDIR%%/tools.png
 %%PORTDOCS%%%%DOCSDIR%%/transform.html
 %%PORTDOCS%%%%DOCSDIR%%/transform.png
+%%PORTDOCS%%%%DOCSDIR%%/transition-kern.png
 %%PORTDOCS%%%%DOCSDIR%%/transition-context.png
 %%PORTDOCS%%%%DOCSDIR%%/transition-indic.png
 %%PORTDOCS%%%%DOCSDIR%%/transition-insert.png
@@ -397,18 +423,19 @@ lib/libgunicode.so.2
 %%PORTDOCS%%%%DOCSDIR%%/x-height.png
 %%PORTDOCS%%%%DOCSDIR%%/xim.html
 %%PORTDOCS%%%%DOCSDIR%%/xres.html
-share/pfaedit/Adobe-CNS1-4.cidmap
-share/pfaedit/Adobe-GB1-4.cidmap
-share/pfaedit/Adobe-Identity-0.cidmap
-share/pfaedit/Adobe-Japan1-5.cidmap
-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-it.ui
-share/pfaedit/pfaedit-ja.ui
-share/pfaedit/pfaedit-ru.ui
-@dirrm share/pfaedit
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%DOCSDIR%%/LICENSE
+share/fontforge/Adobe-CNS1-4.cidmap
+share/fontforge/Adobe-GB1-4.cidmap
+share/fontforge/Adobe-Identity-0.cidmap
+share/fontforge/Adobe-Japan1-5.cidmap
+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-it.ui
+share/fontforge/pfaedit-ja.ui
+share/fontforge/pfaedit-ru.ui
+@dirrm share/fontforge
+@dirrm %%DOCSDIR%%