>Number:         14889
>Category:       pkg
>Synopsis:       Package update: graphics/libwmf
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Dec 10 03:25:00 PST 2001
>Closed-Date:
>Last-Modified:
>Originator:     Masao Uebayashi
>Release:        NetBSD 1.5.2
>Organization:
SOUM Corporation
>Environment:
System: NetBSD sebastes.soum.co.jp 1.5.2 NetBSD 1.5.2 (SEBASTES) #0: Fri Nov 2 20:03:26 JST 2001 masao@sebastes.soum.co.jp:/usr/src_netbsd-1-5-PATCH002/sys/arch/i386/compile/SEBASTES i386
>Description:
Update of graphics/libwmf from 2.1 to 2.2.

Changes excerpted from ChangeLog:

        * 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]Uczko)
        * up the version number (fjf)
>How-To-Repeat:
>Fix:
diff -Nru libwmf.orig/Makefile libwmf/Makefile
--- libwmf.orig/Makefile	Mon Dec 10 20:22:39 2001
+++ libwmf/Makefile	Mon Dec 10 20:22:24 2001
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.27 2001/10/24 22:11:02 jlam Exp $
 #
 
-DISTNAME=		libwmf-0.2.1
+DISTNAME=		libwmf-0.2.2
 CATEGORIES=		graphics devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=wvware/}
 
diff -Nru libwmf.orig/PLIST libwmf/PLIST
--- libwmf.orig/PLIST	Mon Dec 10 20:22:39 2001
+++ libwmf/PLIST	Mon Dec 10 20:22:24 2001
@@ -4,14 +4,15 @@
 bin/wmf2eps
 bin/wmf2fig
 bin/wmf2gd
-bin/wmf2magick
 bin/wmf2svg
 bin/wmf2x
+bin/wmfishtime
 include/libwmf/libwmf/api.h
 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/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_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_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_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__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__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_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 -Nru libwmf.orig/distinfo libwmf/distinfo
--- libwmf.orig/distinfo	Mon Dec 10 20:22:38 2001
+++ libwmf/distinfo	Mon Dec 10 20:22:24 2001
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.4 2001/10/15 15:47:43 kei 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 -Nru libwmf.orig/patches/patch-ad libwmf/patches/patch-ad
--- libwmf.orig/patches/patch-ad	Mon Dec 10 20:22:38 2001
+++ libwmf/patches/patch-ad	Mon Dec 10 20:22:24 2001
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2000/11/16 18:25:24 wiz Exp $
+$NetBSD$
 
---- 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 @@
 +    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
>Release-Note:
>Audit-Trail:
>Unformatted: