updated wv package to 0.6.7 which is compatible with libwmf-0.2.1. no

functionality changes.

4 files changed, 38 insertions, 19 deletions

diff --git a/converters/wv/Makefile b/converters/wv/Makefile
index b533f4dbb05..a95a428a017 100644
--- a/converters/wv/Makefile
+++ b/converters/wv/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2001/09/27 23:17:51 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2001/10/15 15:53:15 kei Exp $
 #
 
-DISTNAME=		wv-0.6.5
+DISTNAME=		wv-0.6.7
 CATEGORIES=		converters
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=wvware/}
 
@@ -29,6 +29,5 @@ post-install:
 .include "../../devel/glib/buildlink.mk"
 .include "../../graphics/ImageMagick/buildlink.mk"
 .include "../../graphics/libwmf/buildlink.mk"
-.include "../../graphics/xpm/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/wv/distinfo b/converters/wv/distinfo
index a7870d0c2c6..e6f4c66abea 100644
--- a/converters/wv/distinfo
+++ b/converters/wv/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2001/07/13 04:49:10 kei Exp $
+$NetBSD: distinfo,v 1.4 2001/10/15 15:53:15 kei Exp $
 
-SHA1 (wv-0.6.5.tar.gz) = 372494e96030de57c232c43f595fe83643a48a43
-Size (wv-0.6.5.tar.gz) = 1206235 bytes
-SHA1 (patch-ad) = 3740d8dbd797dc7cbded509334faa99a7d8dafea
+SHA1 (wv-0.6.7.tar.gz) = 978a9cff35206a5b9619d071e1c0a3a2ae7266c8
+Size (wv-0.6.7.tar.gz) = 1222436 bytes
+SHA1 (patch-ad) = 820e595779998246e54a2a4c234873d563cb2bf0
 SHA1 (patch-ae) = 58b4cadf0276b1dc25bd737623336b4fc90093f0
+SHA1 (patch-aj) = f141b74b49611c954d4de24d050e5f68274ab26e
diff --git a/converters/wv/patches/patch-ad b/converters/wv/patches/patch-ad
index fc08ce989c1..a4c1ccff2b6 100644
--- a/converters/wv/patches/patch-ad
+++ b/converters/wv/patches/patch-ad
@@ -1,16 +1,22 @@
-$NetBSD: patch-ad,v 1.2 2001/07/13 04:49:11 kei Exp $
+$NetBSD: patch-ad,v 1.3 2001/10/15 15:53:16 kei Exp $
 
---- wv.h.orig	Thu May 10 05:28:16 2001
-+++ wv.h	Thu Jul  5 14:37:42 2001
-@@ -106,7 +106,11 @@
- 	S32 y;
-     } POINT;
- #else
-+#define read_32ubit wmf_read_32ubit
-+#define read_16ubit wmf_read_16ubit
- #	include <wmfapi.h>
-+#undef read_32ubit
-+#undef read_16ubit
+--- wv.h.orig	Fri Aug 31 17:53:25 2001
++++ wv.h	Mon Oct 15 02:20:49 2001
+@@ -43,7 +43,7 @@
+ #endif
+ 
+ #ifndef S32
+-#define S32 int
++#define S32 signed int
+ #endif
+ 
+ #ifndef U16
+@@ -59,7 +59,7 @@
+ #endif
+ 
+ #ifndef S8
+-#define S8 char
++#define S8 signed char
  #endif
  
  
diff --git a/converters/wv/patches/patch-aj b/converters/wv/patches/patch-aj
new file mode 100644
index 00000000000..bdc5156d05c
--- /dev/null
+++ b/converters/wv/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2001/10/15 15:53:17 kei Exp $
+
+--- make_epses.sh.orig	Tue Oct 16 00:25:36 2001
++++ make_epses.sh	Tue Oct 16 00:25:51 2001
+@@ -4,7 +4,7 @@
+ for i in ${1}*.wmf ; do
+   STEM=`basename $i wmf`
+   echo "converting $STEM"wmf
+-  wmftoeps $i ${STEM}eps
++  wmf2eps $i ${STEM}eps
+ done
+ 
+ for j in png jpg jpeg pict ; do