6 files changed, 17 insertions, 30 deletions

diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index 836a54cf654f..76b47cf525f7 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	fontforge
-PORTVERSION=	20050624
+PORTVERSION=	20050909
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fontforge
 DISTFILES=	${EXTRACT_ONLY} ${DOCFILE}
-EXTRACT_ONLY=	${PORTNAME}_full-${PORTVERSION}.tgz
+EXTRACT_ONLY=	${PORTNAME}_full-${PORTVERSION}.tar.bz2
 
 MAINTAINER=	kanou@khdd.net
 COMMENT=	Type 1/TrueType/OpenType/bitmap font editor
@@ -30,6 +30,7 @@ DOCFILE=	${PORTNAME}_htdocs-${DOC_VERSION}.tgz
 USE_GMAKE=	yes
 USE_XLIB=	yes
 USE_ICONV=	yes
+USE_BZIP2=	yes
 PATCH_STRIP=	-l
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 .if !defined(FONTFORGE_NO_MULTILAYER)
diff --git a/print/fontforge/distinfo b/print/fontforge/distinfo
index 9f97ca45e525..1b9a2e99aac6 100644
--- a/print/fontforge/distinfo
+++ b/print/fontforge/distinfo
@@ -1,4 +1,4 @@
-MD5 (fontforge_full-20050624.tgz) = 43c3586abae30b350cdedb08bb5452aa
-SIZE (fontforge_full-20050624.tgz) = 4392875
-MD5 (fontforge_htdocs-20050624.tgz) = 4c689753bd2ed3cc07ad65629de540cf
-SIZE (fontforge_htdocs-20050624.tgz) = 2156589
+MD5 (fontforge_full-20050909.tar.bz2) = 8bb93d8c047c2ac4c8635080af61bc39
+SIZE (fontforge_full-20050909.tar.bz2) = 3175627
+MD5 (fontforge_htdocs-20050909.tgz) = 0484d971d9f9433eff98d55e578ccddc
+SIZE (fontforge_htdocs-20050909.tgz) = 2137899
diff --git a/print/fontforge/files/patch-Makefile.dynamic.in b/print/fontforge/files/patch-Makefile.dynamic.in
index 05307d111803..72b0623b8a1a 100644
--- a/print/fontforge/files/patch-Makefile.dynamic.in
+++ b/print/fontforge/files/patch-Makefile.dynamic.in
@@ -1,6 +1,6 @@
 --- Makefile.dynamic.in.orig	Thu Jun  9 02:20:04 2005
 +++ Makefile.dynamic.in	Thu Jun 30 13:51:27 2005
-@@ -48,34 +48,35 @@
+@@ -48,34 +48,34 @@
  	$(LIBTOOL) $(INSTALL) -c libgunicode.la $(libdir)/libgunicode.la
  	#cp .libs/*.so.*.* $(libdir)
  	$(LIBTOOL) --finish $(libdir)
@@ -30,7 +30,6 @@
 -	$(LIBTOOL) $(INSTALL) -c fontforge/sfddiff $(bindir)
 +	${BSD_INSTALL_PROGRAM} -c fontforge/.libs/fontforge $(bindir)
 +	${BSD_INSTALL_PROGRAM} -c fontforge/.libs/sfddiff $(bindir)
-+	${BSD_INSTALL_PROGRAM} -c fontforge/.libs/acorn2sfd $(bindir)
  	-rm -f $(bindir)/pfaedit
  	(cd $(bindir) ; ln -s fontforge pfaedit)
 -	cp fontforge/pfaedit-*.ui $(sharedir)
diff --git a/print/fontforge/files/patch-configure b/print/fontforge/files/patch-configure
deleted file mode 100644
index 8b8bb5b13c44..000000000000
--- a/print/fontforge/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Tue Jun 14 02:31:59 2005
-+++ configure	Thu Jun 30 19:17:27 2005
-@@ -9743,7 +9743,7 @@
- 
-     if test "$withval" != "no" >/dev/null 2>&1 ; then
- 	FreeType2_TT_BUILD_INC="$withval/src/truetype"
--	if test "${FreeType2_TT_BUILD_INC/ttobjs.h:0:1}" != "/" ; then
-+	if test `echo ${FreeType2_TT_BUILD_INC}|sed 's/\(.\).*/\1/'` != "/" ; then
-		FreeType2_TT_BUILD_INC=`pwd`/$FreeType2_TT_BUILD_INC
-	fi
- 	echo "$as_me:$LINENO: checking for valid freetype tree" >&5
diff --git a/print/fontforge/files/patch-fontforge::Makefile.dynamic.in b/print/fontforge/files/patch-fontforge::Makefile.dynamic.in
index 65b567407fab..b6a788563966 100644
--- a/print/fontforge/files/patch-fontforge::Makefile.dynamic.in
+++ b/print/fontforge/files/patch-fontforge::Makefile.dynamic.in
@@ -9,12 +9,3 @@
      @DEFS@ '-DSHAREDIR="$(sharedir)"' -DLIBDIR='"$(libdir)"'
  CFLAGS = @CFLAGS@ $(_CFLAGS)
  
-@@ -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
- 
--all: pfaedit-en.ui fontforge sfddiff
-+all: pfaedit-en.ui fontforge sfddiff acorn2sfd
- 
- fontforge: nomen.h $(fontforge_OBJECTS)
- 	$(LIBTOOL) $(CC) -o fontforge $(fontforge_OBJECTS) $(LIBS)
diff --git a/print/fontforge/pkg-plist b/print/fontforge/pkg-plist
index 20d667e673a3..050477f1db5d 100644
--- a/print/fontforge/pkg-plist
+++ b/print/fontforge/pkg-plist
@@ -1,6 +1,5 @@
 bin/fontforge
 bin/sfddiff
-bin/acorn2sfd
 bin/pfaedit
 lib/libgdraw.a
 lib/libgdraw.la
@@ -167,6 +166,7 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/charview.html
 %%PORTDOCS%%%%DOCSDIR%%/charview2.png
 %%PORTDOCS%%%%DOCSDIR%%/charwithhintmask.png
+%%PORTDOCS%%%%DOCSDIR%%/cidmapformat.html
 %%PORTDOCS%%%%DOCSDIR%%/cidmenu.html
 %%PORTDOCS%%%%DOCSDIR%%/cliargs.html
 %%PORTDOCS%%%%DOCSDIR%%/contextchain.html
@@ -205,8 +205,10 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/cvstaricon.png
 %%PORTDOCS%%%%DOCSDIR%%/cvtangenticon.png
 %%PORTDOCS%%%%DOCSDIR%%/cvt-to-mac.png
+%%PORTDOCS%%%%DOCSDIR%%/definegroups.png
 %%PORTDOCS%%%%DOCSDIR%%/diffs.html
 %%PORTDOCS%%%%DOCSDIR%%/display.html
+%%PORTDOCS%%%%DOCSDIR%%/displaygroups.png
 %%PORTDOCS%%%%DOCSDIR%%/document.nvd
 %%PORTDOCS%%%%DOCSDIR%%/doublestruck-B.png
 %%PORTDOCS%%%%DOCSDIR%%/editcvt.png
@@ -225,6 +227,7 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/edittransition-insert.png
 %%PORTDOCS%%%%DOCSDIR%%/edittransition-kern.png
 %%PORTDOCS%%%%DOCSDIR%%/elementmenu.html
+%%PORTDOCS%%%%DOCSDIR%%/encodingmenu.html
 %%PORTDOCS%%%%DOCSDIR%%/englishkernpairs.txt
 %%PORTDOCS%%%%DOCSDIR%%/errrecovery.html
 %%PORTDOCS%%%%DOCSDIR%%/exclude-post.png
@@ -264,7 +267,7 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-cid.png
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-comment.png
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-context.png
-%%PORTDOCS%%%%DOCSDIR%%/fontinfo-encoding.png
+%%PORTDOCS%%%%DOCSDIR%%/fontview-grouped.png
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-macfeat.png
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-macstyle.png
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-markclasses.png
@@ -273,7 +276,10 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-ps.png
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-size.png
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-statemach.png
+%%PORTDOCS%%%%DOCSDIR%%/fontinfo-subsup.png
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-tex.png
+%%PORTDOCS%%%%DOCSDIR%%/fontinfo-ttfmetrics.png
+%%PORTDOCS%%%%DOCSDIR%%/fontinfo-ttfname-bigedit.png
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-ttfname.png
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-ttfvals.png
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo.html
@@ -296,6 +302,7 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/grave_with_anchor.png
 %%PORTDOCS%%%%DOCSDIR%%/greymapedit.png
 %%PORTDOCS%%%%DOCSDIR%%/greymapsavail.png
+%%PORTDOCS%%%%DOCSDIR%%/groups.html
 %%PORTDOCS%%%%DOCSDIR%%/helpmenu.html
 %%PORTDOCS%%%%DOCSDIR%%/hexley.png
 %%PORTDOCS%%%%DOCSDIR%%/hinting.html