* updated from 0.6.0 to 0.6.5. There is no changelog in the distributed

  archive.  Below is the release note from its WWW page.

  Notes: Lots of minor changes, some minor API
  changes, some bugs fixed, some crashers removed
  Changes: Lots of minor changes, some minor API
  changes, some bugs fixed, some crashers removed

* converted to use buildlink.mk.

9 files changed, 16 insertions, 289 deletions

diff --git a/converters/wv/patches/patch-aa b/converters/wv/patches/patch-aa
deleted file mode 100644
index 8c73e40d25d..00000000000
--- a/converters/wv/patches/patch-aa
+++ /dev/null
@@ -1,60 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2000/10/16 15:14:23 rh Exp $
-
---- Makefile.in.orig	Wed Sep 20 20:42:43 2000
-+++ Makefile.in
-@@ -76,7 +76,7 @@
- 
- VPATH = @srcdir@
- 
--CFLAGS = @CFLAGS@ @DEFS@ @ZLIB_CFLAGS@ -I. -I./ -I$(srcdir)/ -I$(srcdir)/getopt-wv/ -I$(srcdir)/iconv/ -I$(srcdir)/magick/ -I$(srcdir)/expat/xmlparse/ @TTF_CFLAGS@ @WMF_CFLAGS@ -DTTFDIR=\"$(libdir)/wv/ttf\" -DXMLCONFIG=\"$(libdir)/wv/wvConfig.xml\" -DHTMLCONFIG=\"$(libdir)/wv/wvHtml.xml\" 
-+CFLAGS = @CFLAGS@ @DEFS@ @ZLIB_CFLAGS@ -I. -I./ -I$(srcdir)/ -I$(srcdir)/getopt-wv/ -I$(srcdir)/iconv/ -I$(srcdir)/magick/ -I$(srcdir)/expat/xmlparse/ @WMF_CFLAGS@ @TTF_CFLAGS@ -DTTFDIR=\"$(prefix)/share/wv/ttf\" -DXMLCONFIG=\"$(prefix)/share/wv/wvConfig.xml\" -DHTMLCONFIG=\"$(prefix)/share/wv/wvHtml.xml\" 
- 
- CFLAGS += \
- 	-I$(srcdir)/libole2/ \
-@@ -237,7 +237,7 @@
- wv-incconfig: Makefile
- 	$(RM) -f wv-incconfig
- 	echo \#\!/bin/sh > wv-incconfig
--	echo echo @ZLIB_CFLAGS@ -I$(includedir) @WMF_CFLAGS@ >> wv-incconfig
-+	echo echo @WMF_CFLAGS@ @ZLIB_CFLAGS@ -I$(includedir) >> wv-incconfig
- 
- lex.yy.c: parser.lex
- 	$(LEX) parser.lex
-@@ -325,10 +325,11 @@
- 	$(mandir) \
- 	$(mandir)/man1 \
- 	$(libdir) \
--	$(libdir)/wv\
--	$(libdir)/wv/wingdingfont \
--	$(libdir)/wv/patterns \
--	$(libdir)/wv/ttf \
-+	$(prefix)/share/wv\
-+	$(prefix)/share/wv/wingdingfont \
-+	$(prefix)/share/wv/patterns \
-+	$(prefix)/share/wv/ttf \
-+	$(prefix)/share/wv \
- 	$(includedir)
- 	
- 
-@@ -366,15 +367,15 @@
- 	$(INSTALL_DATA) $(srcdir)/wvSummary.1 $(mandir)/man1/
- 	$(INSTALL_DATA) wv.h $(includedir)/wv.h
- 	$(INSTALL_DATA) $(srcdir)/libwv.a $(libdir)/libwv.a
--	$(INSTALL_DATA) $(srcdir)/wvHtml.xml $(libdir)/wv/wvHtml.xml
--	$(INSTALL_DATA) $(srcdir)/wvLaTeX.xml $(libdir)/wv/wvLaTeX.xml
--	$(INSTALL_DATA) $(srcdir)/wvCleanLaTeX.xml $(libdir)/wv/wvCleanLaTeX.xml
--	$(INSTALL_DATA) $(srcdir)/wvConfig.xml $(libdir)/wv/wvConfig.xml
-+	$(INSTALL_DATA) $(srcdir)/wvHtml.xml $(prefix)/share/wv/wvHtml.xml
-+	$(INSTALL_DATA) $(srcdir)/wvLaTeX.xml $(prefix)/share/wv/wvLaTeX.xml
-+	$(INSTALL_DATA) $(srcdir)/wvCleanLaTeX.xml $(prefix)/share/wv/wvCleanLaTeX.xml
-+	$(INSTALL_DATA) $(srcdir)/wvConfig.xml $(prefix)/share/wv/wvConfig.xml
- 	for filename in wingdingfont/*.gif; do \
--		$(INSTALL_DATA) $$filename $(libdir)/wv/wingdingfont; \
-+		$(INSTALL_DATA) $$filename $(prefix)/share/wv/wingdingfont; \
- 	done
- 	for filename in patterns/*.gif patterns/*.jpg; do \
--		$(INSTALL_DATA) $$filename $(libdir)/wv/patterns; \
-+		$(INSTALL_DATA) $$filename $(prefix)/share/wv/patterns; \
- 	done
- 
- 
diff --git a/converters/wv/patches/patch-ab b/converters/wv/patches/patch-ab
deleted file mode 100644
index a6eb6f08ab0..00000000000
--- a/converters/wv/patches/patch-ab
+++ /dev/null
@@ -1,139 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2000/10/16 15:14:23 rh Exp $
-
---- configure.orig	Tue Sep 19 21:38:01 2000
-+++ configure
-@@ -3567,7 +3567,7 @@
- _SAVE_LDFLAGS=$LDFLAGS
- 
- if test "$TTF_DIR" != "" ; then
--CFLAGS="-I${TTF_DIR}/include $CFLAGS"
-+CFLAGS="-I${TTF_DIR}/include/freetype $CFLAGS"
- LDFLAGS="-L${TTF_DIR}/lib $LDFLAGS"
- fi
- 
-@@ -3602,7 +3602,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lttf -lm $LIBS"
-+LIBS="-lttf -lintl -lm $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 3608 "configure"
- #include "confdefs.h"
-@@ -3630,7 +3630,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  TTF_LIBS="-lttf"
-+  TTF_LIBS="-lttf -lintl"
- else
-   echo "$ac_t""no" 1>&6
- no_ttf=yes
-@@ -3641,14 +3641,14 @@
- fi
- 
- if  test -n "${TTF_DIR}" && test -d "${TTF_DIR}" && test "$SYSTEM_TTF" = 1 ; then
--    TTF_CFLAGS="-I${TTF_DIR}/include"
-+    TTF_CFLAGS="-I${TTF_DIR}/include/freetype"
-     TTF_LIBS="-L${TTF_DIR}/lib ${TTF_LIBS}"
- fi
- 
- if test "x$no_ttf" = xyes; then
- 	if test "$TTF_DIR" != "" ; then
--	CFLAGS="-I${TTF_DIR} $CFLAGS"
--	LDFLAGS="-L${TTF_DIR} $LDFLAGS"
-+	CFLAGS="-I${TTF_DIR}/include/freetype $CFLAGS"
-+	LDFLAGS="-L${TTF_DIR}/lib $LDFLAGS"
- 	fi
- 
- 	if test "$TTF_DIR" = no; then
-@@ -3684,7 +3684,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lttf -lm $LIBS"
-+LIBS="-lttf -lintl -lm $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 3690 "configure"
- #include "confdefs.h"
-@@ -3712,7 +3712,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  TTF_LIBS="-lttf"
-+  TTF_LIBS="-lttf -lintl"
- else
-   echo "$ac_t""no" 1>&6
- no_ttf=yes
-@@ -3724,8 +3724,8 @@
- 
- 
- if  test -n "${TTF_DIR}" && test -d "${TTF_DIR}" && test "$SYSTEM_TTF" = 1 ; then
--    TTF_CFLAGS="-I${TTF_DIR}"
--    TTF_LIBS="-L${TTF_DIR} ${TTF_LIBS}"
-+    TTF_CFLAGS="-I${TTF_DIR}/include/freetype"
-+    TTF_LIBS="-L${TTF_DIR}/lib ${TTF_LIBS}"
- fi
- 
- fi
-@@ -3747,7 +3747,7 @@
- _SAVE_LIBS=$LIBS
- 
- if test "$WMF_DIR" != "" ; then
--CFLAGS="-I${WMF_DIR}/include $CFLAGS"
-+CFLAGS="-I${WMF_DIR}/include/libwmf $CFLAGS"
- LDFLAGS="-L${WMF_DIR}/lib $LDFLAGS"
- fi
- 
-@@ -3813,7 +3813,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  WMF_LIBS="-lgdwmf -lwmf -lxgd -ldib -lpng"
-+  WMF_LIBS="-lgdwmf -lwmf -lttf -lxgd -ldib -lpng"
- else
-   echo "$ac_t""no" 1>&6
- no_wmf=yes
-@@ -3824,7 +3824,7 @@
- fi
- 
- if  test -n "${WMF_DIR}" && test -d "${WMF_DIR}" && test "$SYSTEM_WMF" = 1 ; then
--    WMF_CFLAGS="-I${WMF_DIR}/include"
-+    WMF_CFLAGS="-I${WMF_DIR}/include/libwmf"
-     WMF_LIBS="-L${WMF_DIR}/lib ${WMF_LIBS}"
- fi
- 
-@@ -3869,7 +3869,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lgdwmf -lwmf -lxgd -ldib -lpng $TTF_LIBS $XPM_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lm $LIBS"
-+LIBS="-lgdwmf -lwmf -lttf -lxgd -ldib -lpng $TTF_LIBS $XPM_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lm $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 3875 "configure"
- #include "confdefs.h"
-@@ -3909,8 +3909,8 @@
- 
- 
- if  test -n "${WMF_DIR}" && test -d "${WMF_DIR}" && test "$SYSTEM_WMF" = 1 ; then
--    WMF_CFLAGS="-I${WMF_DIR}"
--    WMF_LIBS="-L${WMF_DIR} ${WMF_LIBS}"
-+    WMF_CFLAGS="-I${WMF_DIR}/include/libwmf"
-+    WMF_LIBS="-L${WMF_DIR}/lib ${WMF_LIBS}"
- fi
- 
- fi
-@@ -5425,11 +5425,11 @@
- 		echo $ac_n "checking if PNG package is complete""... $ac_c" 1>&6
- echo "configure:5427: checking if PNG package is complete" >&5
- 		if test $passed -gt 0; then
--			if test $failed -gt 0; then
-+			if false; then
- 				echo "$ac_t""no -- some components failed test" 1>&6
- 				have_png='no (failed tests)'
- 			else
--				LIB_PNG='-lpng'
-+				LIB_PNG='-lpng -lz'
- 				cat >> confdefs.h <<\EOF
- #define HasPNG 1
- EOF
diff --git a/converters/wv/patches/patch-ac b/converters/wv/patches/patch-ac
deleted file mode 100644
index f723b2d5b54..00000000000
--- a/converters/wv/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2000/09/02 17:52:54 wiz Exp $
-
---- bmptopng.c.orig	Mon Dec  6 21:50:57 1999
-+++ bmptopng.c
-@@ -18,7 +18,7 @@
- 	GetImageInfo (&image_info);
- 	sprintf(buffer, "%s.bmp",prefix);
- 	strcpy (image_info.filename, buffer);
--	image = ReadBMPImage (&image_info);
-+	image = ReadImage (&image_info);
- 	if (image == (Image *) NULL)
- 		return(1);
- 	sprintf(buffer, "%s.png",prefix);
-@@ -26,7 +26,7 @@
- 	strcpy(image_info.filename,buffer);
- 	SetImageInfo(&image_info,1);
- 	strcpy (image->filename, buffer);
--	WritePNGImage (&image_info, image);
-+	WriteImage (&image_info, image);
- 
- 	DestroyImage (image);
- 	return(0);
diff --git a/converters/wv/patches/patch-ad b/converters/wv/patches/patch-ad
index c002ef4d90a..fc08ce989c1 100644
--- a/converters/wv/patches/patch-ad
+++ b/converters/wv/patches/patch-ad
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.1 2000/10/16 15:14:23 rh Exp $
+$NetBSD: patch-ad,v 1.2 2001/07/13 04:49:11 kei Exp $
 
---- wv.h.orig	Mon Oct 16 15:35:58 2000
-+++ wv.h
-@@ -109,7 +109,11 @@
-     S32 y;
-     }POINT;
+--- 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
diff --git a/converters/wv/patches/patch-ae b/converters/wv/patches/patch-ae
index 28614649e04..d54b1cd7bd7 100644
--- a/converters/wv/patches/patch-ae
+++ b/converters/wv/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2000/10/16 15:14:23 rh Exp $
+$NetBSD: patch-ae,v 1.2 2001/07/13 04:49:11 kei Exp $
 
---- iconv/Makefile.in.orig	Mon Oct 16 16:42:29 2000
-+++ iconv/Makefile.in
-@@ -21,7 +21,7 @@
+--- iconv/Makefile.in.orig	Mon Mar 12 02:42:22 2001
++++ iconv/Makefile.in	Thu Jul  5 14:41:59 2001
+@@ -19,7 +19,7 @@
  
- CFLAGS = @CFLAGS@ @DEFS@ -I$(srcdir)/ -I$(srcdir)/../
+ VPATH = @srcdir@
+ 
+-CFLAGS = @CFLAGS@ @DEFS@ -I$(srcdir)/ -I$(srcdir)/../ -I$(srcdir)/../libole2/ -I$(srcdir)/../glib-wv/ @WMF_CFLAGS@
++CFLAGS = ${CPPFLAGS} @CFLAGS@ @DEFS@ -I$(srcdir)/ -I$(srcdir)/../ -I$(srcdir)/../libole2/ -I$(srcdir)/../glib-wv/ @WMF_CFLAGS@
+ 
+ SHELL = /bin/sh
  
--CFLAGS += \
-+CFLAGS += ${CPPFLAGS} \
-         -I$(srcdir)/../libole2/ \
-         -I$(srcdir)/../glib-wv/
-               
diff --git a/converters/wv/patches/patch-af b/converters/wv/patches/patch-af
deleted file mode 100644
index 08a3566af78..00000000000
--- a/converters/wv/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2000/10/16 15:34:12 rh Exp $
-
---- wvCleanLatex.in.orig	Mon Oct 16 17:23:06 2000
-+++ wvCleanLatex.in
-@@ -2,7 +2,7 @@
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
-+libdir=${prefix}/share
- 
- # argument checking
- if [ ${#} -ne "2" ]; then
diff --git a/converters/wv/patches/patch-ag b/converters/wv/patches/patch-ag
deleted file mode 100644
index 8842c8c33f4..00000000000
--- a/converters/wv/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2000/10/16 15:34:12 rh Exp $
-
---- wvHtml.in.orig	Mon Oct 16 17:23:11 2000
-+++ wvHtml.in
-@@ -2,7 +2,7 @@
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
-+libdir=${prefix}/share
- 
- # argument checking
- if [ ${#} -ne "2" ]; then
diff --git a/converters/wv/patches/patch-ah b/converters/wv/patches/patch-ah
deleted file mode 100644
index 56ad87c2b48..00000000000
--- a/converters/wv/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2000/10/16 15:34:12 rh Exp $
-
---- wvLatex.in.orig	Mon Oct 16 17:23:15 2000
-+++ wvLatex.in
-@@ -2,7 +2,7 @@
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
-+libdir=${prefix}/share
- 
- # argument checking
- if [ ${#} -ne "2" ]; then
diff --git a/converters/wv/patches/patch-ai b/converters/wv/patches/patch-ai
deleted file mode 100644
index 7fd8a51fec6..00000000000
--- a/converters/wv/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2000/12/16 00:31:41 wiz Exp $
-
---- wvText.orig	Thu Sep 21 23:46:54 2000
-+++ wvText
-@@ -21,7 +21,7 @@
- # intermediate file
- TMP_FILE=/tmp/wv${1}.html
- 
--wvHTML ${1} ${TMP_FILE} 2>&1 >/dev/null
-+wvHtml ${1} ${TMP_FILE} 2>&1 >/dev/null
- if [ ${?} -ne "0" ]; then
- 	echo "Could not convert into HTML"
- 	exit 1