4 files changed, 16 insertions, 14 deletions

diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index 72283c501837..d73be0e08f02 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fontforge
-PORTVERSION=	20040529
+PORTVERSION=	20040808
 PORTREVISION=	0
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/print/fontforge/distinfo b/print/fontforge/distinfo
index b572434de349..621417eb67e6 100644
--- a/print/fontforge/distinfo
+++ b/print/fontforge/distinfo
@@ -1,4 +1,4 @@
-MD5 (fontforge_full-20040529.tgz) = fe8ac291927b5a8ad3f692f8007f1db7
-SIZE (fontforge_full-20040529.tgz) = 4113026
-MD5 (fontforge_htdocs-20040529.tgz) = 7adb3e5a35d141ea025fc25cfab7a2cd
-SIZE (fontforge_htdocs-20040529.tgz) = 2018163
+MD5 (fontforge_full-20040808.tgz) = 2c9da86bdadc97f450d9bab8075f4390
+SIZE (fontforge_full-20040808.tgz) = 3955365
+MD5 (fontforge_htdocs-20040808.tgz) = 17bf8acca5c6c1edd277e6f89d862613
+SIZE (fontforge_htdocs-20040808.tgz) = 2022058
diff --git a/print/fontforge/files/patch-fontforge::Makefile.dynamic.in b/print/fontforge/files/patch-fontforge::Makefile.dynamic.in
index a3e57b01ddb0..bde67c94725c 100644
--- a/print/fontforge/files/patch-fontforge::Makefile.dynamic.in
+++ b/print/fontforge/files/patch-fontforge::Makefile.dynamic.in
@@ -1,15 +1,15 @@
---- 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 @@
+--- fontforge/Makefile.dynamic.in.orig	Fri Jul 30 01:26:29 2004
++++ fontforge/Makefile.dynamic.in	Wed Aug 25 19:48:55 2004
+@@ -42,7 +42,7 @@
+ DIFFOBJS = sfddiff.o sfd.o diffstubs.o stamp.o
+ ACORNOBJS = acorn2sfd.o sfd.o diffstubs.o psunicodenames.o stamp.o
  
- 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) \
+-_CFLAGS = -I$(top_srcdir)/inc -I$(srcdir) -I. @WFLAGS@ $(X_CFLAGS) \
++_CFLAGS = -I$(LOCALBASE)/include -I$(LOCALBASE)/include/freetype2 -I$(top_srcdir)/inc -I$(srcdir) -I. @WFLAGS@ $(X_CFLAGS) \
      @DEFS@ '-DSHAREDIR="$(sharedir)"' -DLIBDIR='"$(libdir)"'
  CFLAGS = @CFLAGS@ $(_CFLAGS)
  
-@@ -52,7 +52,7 @@
+@@ -50,7 +50,7 @@
      $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -L/usr/lib -lm
  DLIBS = -rpath $(libdir) ../libgunicode.la @LIBS@ -lm
  
diff --git a/print/fontforge/pkg-plist b/print/fontforge/pkg-plist
index c40c07a84489..2f0c2cf94bd3 100644
--- a/print/fontforge/pkg-plist
+++ b/print/fontforge/pkg-plist
@@ -106,6 +106,7 @@ lib/libgunicode.so.2
 %%PORTDOCS%%%%DOCSDIR%%/TilePath.png
 %%PORTDOCS%%%%DOCSDIR%%/To-kerned.png
 %%PORTDOCS%%%%DOCSDIR%%/To-unkerned.png
+%%PORTDOCS%%%%DOCSDIR%%/Tricolor.png
 %%PORTDOCS%%%%DOCSDIR%%/TrueOpenTables.html
 %%PORTDOCS%%%%DOCSDIR%%/VerticalMetrics.png
 %%PORTDOCS%%%%DOCSDIR%%/a_dieresis_macron.png
@@ -219,6 +220,7 @@ lib/libgunicode.so.2
 %%PORTDOCS%%%%DOCSDIR%%/featsetdlg.png
 %%PORTDOCS%%%%DOCSDIR%%/feature-tag-pos.png
 %%PORTDOCS%%%%DOCSDIR%%/feature-tag-sub.png
+%%PORTDOCS%%%%DOCSDIR%%/ffanvil16.png
 %%PORTDOCS%%%%DOCSDIR%%/ffanvil32.png
 %%PORTDOCS%%%%DOCSDIR%%/ffi-caret.png
 %%PORTDOCS%%%%DOCSDIR%%/ffi-moved.png
@@ -450,8 +452,8 @@ 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-gr.ui
 share/fontforge/pfaedit-it.ui
 share/fontforge/pfaedit-ja.ui
 share/fontforge/pfaedit-ru.ui