Update libwmf package to 0.2.2.

Changes from 0.2.1 are here:

v. 0.2.2
	* fix wmf2x arg detection bug (Bob Friesenhahn)
	* added --with-layers option (fjf)
	* de-necessitate GD, add libpng support (highly experimental);
	  rename config.h* to wmfconfig.h*; libxml2 fix (fjf)
	* release builds: configure-time Darwin-detection & lt-patching;
	  make magick device layer optional; rewrite xml2 detection (wv);
	  make secondary IPA functions static (fjf)
	* change copyright on include/libwmf/magick.h
	* add paranoid check for xmlChar**attributes==NULL
	* add one of many missing consts (Bob Friesenhahn)
	* add check for vsnprintf in libdb (David C Sterratt)
	* add 'foreign' device layer for non-wmf stuff
	* x,gd: better placement of text
	* x,gd: beginnings of a ROP implementation
	* change gd-layer source file names to 'xgd' root
	* use X-layer style text drawing in gd-layer
	* yet more config updates (fun, fun, fun!)
	* update other config stuff to handle autoconf-2.52
	* update config.sub/guess to libtool-1.4.1
	* make building/inclusion of GD library optional (fjf)
	* acinclude fix (Tomasz K^3oczko)
	* up the version number (fjf)

4 files changed, 27 insertions, 13 deletions

diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index a3835d7c588..75bd53ed94c 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2001/10/24 22:11:02 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2001/12/10 13:56:42 taca Exp $
 #
 
-DISTNAME=		libwmf-0.2.1
+DISTNAME=		libwmf-0.2.2
 CATEGORIES=		graphics devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=wvware/}
 
@@ -11,6 +11,7 @@ COMMENT=		library for reading and converting WMF (Windows Meta Files), version 2
 
 USE_BUILDLINK_ONLY=	YES
 GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--enable-magick
 CONFIGURE_ARGS+=	--includedir=${INCLUDEDIR}
 CONFIGURE_ARGS+=	--with-docdir=${HTMLDIR}
 USE_X11=		YES
diff --git a/graphics/libwmf/PLIST b/graphics/libwmf/PLIST
index ecee5eacd37..80dc047a35e 100644
--- a/graphics/libwmf/PLIST
+++ b/graphics/libwmf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:51:56 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/12/10 13:56:42 taca Exp $
 bin/libwmf-config
 bin/libwmf-fontmap
 bin/wmf2eps
@@ -12,6 +12,7 @@ include/libwmf/libwmf/color.h
 include/libwmf/libwmf/defs.h
 include/libwmf/libwmf/eps.h
 include/libwmf/libwmf/fig.h
+include/libwmf/libwmf/foreign.h
 include/libwmf/libwmf/fund.h
 include/libwmf/libwmf/gd.h
 include/libwmf/libwmf/gd/gd.h
@@ -31,8 +32,8 @@ include/libwmf/libwmf/svg.h
 include/libwmf/libwmf/types.h
 include/libwmf/libwmf/x.h
 lib/libwmf-0.2.so
-lib/libwmf-0.2.so.1
-lib/libwmf-0.2.so.1.0
+lib/libwmf-0.2.so.2
+lib/libwmf-0.2.so.2.0
 lib/libwmf.a
 lib/libwmf.la
 lib/libwmf.so
@@ -137,6 +138,8 @@ share/doc/html/libwmf/html/fig_2font_8h.html
 share/doc/html/libwmf/html/fig_8c.html
 share/doc/html/libwmf/html/fig_8h.html
 share/doc/html/libwmf/html/files.html
+share/doc/html/libwmf/html/foreign_8c.html
+share/doc/html/libwmf/html/foreign_8h.html
 share/doc/html/libwmf/html/functions.html
 share/doc/html/libwmf/html/fund_8h.html
 share/doc/html/libwmf/html/gd_2bmp_8h.html
@@ -156,6 +159,7 @@ share/doc/html/libwmf/html/ipa_2magick_2region_8h.html
 share/doc/html/libwmf/html/ipa_2plot_2region_8h.html
 share/doc/html/libwmf/html/ipa_2svg_2region_8h.html
 share/doc/html/libwmf/html/ipa_2x_2region_8h.html
+share/doc/html/libwmf/html/ipa_2xgd_2region_8h.html
 share/doc/html/libwmf/html/ipa_8c.html
 share/doc/html/libwmf/html/ipa_8h.html
 share/doc/html/libwmf/html/macro_8h.html
@@ -179,6 +183,7 @@ share/doc/html/libwmf/html/src_2ipa_2ipa_2color_8h.html
 share/doc/html/libwmf/html/src_2ipa_2x_2color_8h.html
 share/doc/html/libwmf/html/src_2player_2color_8h.html
 share/doc/html/libwmf/html/stream_8c.html
+share/doc/html/libwmf/html/struct__gd__t.html
 share/doc/html/libwmf/html/struct__wmfAPI.html
 share/doc/html/libwmf/html/struct__wmfAPI__Options.html
 share/doc/html/libwmf/html/struct__wmfBMP.html
@@ -204,6 +209,7 @@ share/doc/html/libwmf/html/struct__wmfFunctionReference.html
 share/doc/html/libwmf/html/struct__wmfGS__FontData.html
 share/doc/html/libwmf/html/struct__wmfGS__FontInfo.html
 share/doc/html/libwmf/html/struct__wmfHead.html
+share/doc/html/libwmf/html/struct__wmfImage.html
 share/doc/html/libwmf/html/struct__wmfMapping.html
 share/doc/html/libwmf/html/struct__wmfMetaHeader.html
 share/doc/html/libwmf/html/struct__wmfPen.html
@@ -219,6 +225,7 @@ share/doc/html/libwmf/html/struct__wmfXML__FontInfo.html
 share/doc/html/libwmf/html/struct__wmf__eps__t.html
 share/doc/html/libwmf/html/struct__wmf__fig__t.html
 share/doc/html/libwmf/html/struct__wmf__fig__t_1_1__wmf__fig__image.html
+share/doc/html/libwmf/html/struct__wmf__foreign__t.html
 share/doc/html/libwmf/html/struct__wmf__gd__t.html
 share/doc/html/libwmf/html/struct__wmf__gd__t_1_1__wmf__gd__sink.html
 share/doc/html/libwmf/html/struct__wmf__magick__t.html
@@ -242,6 +249,12 @@ share/doc/html/libwmf/html/x_2draw_8h.html
 share/doc/html/libwmf/html/x_2font_8h.html
 share/doc/html/libwmf/html/x_8c.html
 share/doc/html/libwmf/html/x_8h.html
+share/doc/html/libwmf/html/xgd_2bmp_8h.html
+share/doc/html/libwmf/html/xgd_2device_8h.html
+share/doc/html/libwmf/html/xgd_2draw_8h.html
+share/doc/html/libwmf/html/xgd_2font_8h.html
+share/doc/html/libwmf/html/xgd_8c.html
+share/doc/html/libwmf/html/xgd_8h.html
 share/doc/html/libwmf/index.html
 share/doc/html/libwmf/smlogo2.gif
 share/doc/html/libwmf/tutapi.html
diff --git a/graphics/libwmf/distinfo b/graphics/libwmf/distinfo
index f6bf1416581..8e35b71ff87 100644
--- a/graphics/libwmf/distinfo
+++ b/graphics/libwmf/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2001/10/15 15:47:43 kei Exp $
+$NetBSD: distinfo,v 1.5 2001/12/10 13:56:42 taca Exp $
 
-SHA1 (libwmf-0.2.1.tar.gz) = 8d7302b58b8637ecd84a57973c9022497b165362
-Size (libwmf-0.2.1.tar.gz) = 1529828 bytes
-SHA1 (patch-ad) = 156438ad8eac1710f574b49c46b07b6da4aecc4a
+SHA1 (libwmf-0.2.2.tar.gz) = 2fb3878a51fd6c60902caa56efc1746a85dabdd0
+Size (libwmf-0.2.2.tar.gz) = 1635344 bytes
+SHA1 (patch-ad) = 896663daf56535f112ac03e03cef59ac09c870e5
diff --git a/graphics/libwmf/patches/patch-ad b/graphics/libwmf/patches/patch-ad
index 56a2d161c6a..0edbb0ab86c 100644
--- a/graphics/libwmf/patches/patch-ad
+++ b/graphics/libwmf/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2000/11/16 18:25:24 wiz Exp $
+$NetBSD: patch-ad,v 1.3 2001/12/10 13:56:43 taca Exp $
 
---- configure.orig	Thu Oct 19 16:10:42 2000
+--- configure.orig	Sun Oct 28 22:09:22 2001
 +++ configure
-@@ -1520,7 +1520,7 @@
+@@ -8714,7 +8714,7 @@
  
    # It would also be nice to do this for all -L options, not just this one.
    if test -n "$x_libraries"; then
@@ -10,4 +10,4 @@ $NetBSD: patch-ad,v 1.2 2000/11/16 18:25:24 wiz Exp $
 +    X_LIBS="$X_LIBS -L$x_libraries -Wl,-R$x_libraries"
      # For Solaris; some versions of Sun CC require a space after -R and
      # others require no space.  Words are not sufficient . . . .
-     case "`(uname -sr) 2>/dev/null`" in
+     case `(uname -sr) 2>/dev/null` in