4 files changed, 14 insertions, 27 deletions

diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index d3a842ce6f53..25fa5c960492 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libwmf
-PORTVERSION=	0.2.2
-PORTREVISION=	1
+PORTVERSION=	0.2.5
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wvware
diff --git a/graphics/libwmf/distinfo b/graphics/libwmf/distinfo
index 442792e3c58e..ee17d38f6202 100644
--- a/graphics/libwmf/distinfo
+++ b/graphics/libwmf/distinfo
@@ -1 +1 @@
-MD5 (libwmf-0.2.2.tar.gz) = 49fc8a235b09cdb62f0cf03ec514669f
+MD5 (libwmf-0.2.5.tar.gz) = 86b7f808a7809af991bfa90ec64c9dd2
diff --git a/graphics/libwmf/files/patch-font.h b/graphics/libwmf/files/patch-font.h
deleted file mode 100644
index e9e83cc0e268..000000000000
--- a/graphics/libwmf/files/patch-font.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/ipa/ipa/font.h.orig	Sat Mar 30 21:02:34 2002
-+++ src/ipa/ipa/font.h	Sat Mar 30 21:02:47 2002
-@@ -851,8 +851,8 @@
- 
- #ifdef HAVE_XML2
- 
--#include <parser.h>
--#include <parserInternals.h>
-+#include <libxml2/libxml/parser.h>
-+#include <libxml2/libxml/parserInternals.h>
- 
- static void xml2_start (void* user_data,const char* tag,const char** attributes)
- {	const char** attr;
diff --git a/graphics/libwmf/pkg-plist b/graphics/libwmf/pkg-plist
index 8530fa8467e2..7a444a6ec212 100644
--- a/graphics/libwmf/pkg-plist
+++ b/graphics/libwmf/pkg-plist
@@ -11,6 +11,7 @@ include/libwmf/color.h
 include/libwmf/defs.h
 include/libwmf/eps.h
 include/libwmf/fig.h
+include/libwmf/font.h
 include/libwmf/foreign.h
 include/libwmf/fund.h
 include/libwmf/gd/gd.h
@@ -130,27 +131,22 @@ lib/libwmf.so.2
 %%PORTDOCS%%share/doc/libwmf/html/fig_2bmp_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/fig_2device_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/fig_2draw_8h.html
-%%PORTDOCS%%share/doc/libwmf/html/fig_2font_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/fig_8c.html
 %%PORTDOCS%%share/doc/libwmf/html/fig_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/files.html
+%%PORTDOCS%%share/doc/libwmf/html/font_8c.html
 %%PORTDOCS%%share/doc/libwmf/html/foreign_8c.html
 %%PORTDOCS%%share/doc/libwmf/html/foreign_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/functions.html
 %%PORTDOCS%%share/doc/libwmf/html/fund_8h.html
-%%PORTDOCS%%share/doc/libwmf/html/gd_2bmp_8h.html
-%%PORTDOCS%%share/doc/libwmf/html/gd_2device_8h.html
-%%PORTDOCS%%share/doc/libwmf/html/gd_2draw_8h.html
-%%PORTDOCS%%share/doc/libwmf/html/gd_8c.html
 %%PORTDOCS%%share/doc/libwmf/html/gd_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/globals.html
 %%PORTDOCS%%share/doc/libwmf/html/include_2libwmf_2color_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/include_2libwmf_2font_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/index.html
 %%PORTDOCS%%share/doc/libwmf/html/ipa_2bmp_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/ipa_2eps_2region_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/ipa_2fig_2region_8h.html
-%%PORTDOCS%%share/doc/libwmf/html/ipa_2font_8h.html
-%%PORTDOCS%%share/doc/libwmf/html/ipa_2gd_2region_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/ipa_2magick_2region_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/ipa_2plot_2region_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/ipa_2svg_2region_8h.html
@@ -174,12 +170,16 @@ lib/libwmf.so.2
 %%PORTDOCS%%share/doc/libwmf/html/plot_8c.html
 %%PORTDOCS%%share/doc/libwmf/html/plot_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/record_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/src_2font_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/src_2ipa_2fig_2color_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/src_2ipa_2fig_2font_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/src_2ipa_2ipa_2color_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/src_2ipa_2ipa_2font_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/src_2ipa_2x_2color_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/src_2ipa_2x_2font_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/src_2ipa_2xgd_2font_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/src_2player_2color_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/stream_8c.html
-%%PORTDOCS%%share/doc/libwmf/html/struct__gd__t.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfAPI.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfAPI__Options.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfBMP.html
@@ -201,16 +201,19 @@ lib/libwmf.so.2
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfFont.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfFontData.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfFontMap.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfFontmapData.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfFunctionReference.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfGS__FontData.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfGS__FontInfo.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfHead.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfIPAFont.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfImage.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfMapping.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfMetaHeader.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfPen.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfPlaceableMetaHeader.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfPolyLine__t.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfPolyPoly__t.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfPolyRectangle__t.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfRGB.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfROP__Draw__t.html
@@ -239,18 +242,16 @@ lib/libwmf.so.2
 %%PORTDOCS%%share/doc/libwmf/html/template_8c.html
 %%PORTDOCS%%share/doc/libwmf/html/template_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/types_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/wmf_8c.html
 %%PORTDOCS%%share/doc/libwmf/html/x_2bmp_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/x_2device_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/x_2draw_8h.html
-%%PORTDOCS%%share/doc/libwmf/html/x_2font_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/x_8c.html
 %%PORTDOCS%%share/doc/libwmf/html/x_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/xgd_2bmp_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/xgd_2device_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/xgd_2draw_8h.html
-%%PORTDOCS%%share/doc/libwmf/html/xgd_2font_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/xgd_8c.html
-%%PORTDOCS%%share/doc/libwmf/html/xgd_8h.html
 %%PORTDOCS%%share/doc/libwmf/index.html
 %%PORTDOCS%%share/doc/libwmf/smlogo2.gif
 %%PORTDOCS%%share/doc/libwmf/tutapi.html