Changes 0.7.6: style updates, bidi updates, crasher updates

6 files changed, 28 insertions, 66 deletions

diff --git a/converters/wv/Makefile b/converters/wv/Makefile
index 70ad971995b..420374f3498 100644
--- a/converters/wv/Makefile
+++ b/converters/wv/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.28 2003/07/17 21:27:43 grant Exp $
+# $NetBSD: Makefile,v 1.29 2003/09/03 13:21:37 adam Exp $
 #
 
-DISTNAME=		wv-0.7.4
-PKGREVISION=		3
-CATEGORIES=		converters
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=wvware/}
+DISTNAME=	wv-0.7.6
+CATEGORIES=	converters
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wvware/}
 
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://www.wvWare.com/
-COMMENT=		Microsoft Word 6, 7, 8, and 9 (95/97/2000) doc to HTML/LaTeX converter
+MAINTAINER=	adam@NetBSD.org
+HOMEPAGE=	http://wvware.sourceforge.net/
+COMMENT=	Microsoft Word doc to HTML/LaTeX converter
 
 # not detected by configure, causes conflicts with the one coming with wv
 #CONFLICTS+=		libgetopt-[0-9]*
@@ -16,16 +15,13 @@ COMMENT=		Microsoft Word 6, 7, 8, and 9 (95/97/2000) doc to HTML/LaTeX converter
 USE_BUILDLINK2=		YES
 USE_X11=		YES
 USE_GMAKE=		YES
+USE_LIBTOOL=		YES
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=		YES
 MAKE_ENV+=		RM="${RM} -f"
+MAKEFILE=		GNUmakefile
 CONFIGURE_ARGS+=	--with-libwmf=${BUILDLINK_PREFIX.libwmf}
 
-post-install:
-	${TOUCH} ${PREFIX}/share/wv/ttf/.directory
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/wv
-	cd ${WRKSRC} && ${INSTALL_DATA} COPYING CREDITS INSTALL KNOWN-BUGS \
-		README help/Docs/XML_Tags ${PREFIX}/share/doc/wv
-
 .include "../../converters/libiconv/buildlink2.mk"
 .include "../../devel/glib/buildlink2.mk"
 .include "../../graphics/ImageMagick/buildlink2.mk"
diff --git a/converters/wv/PLIST b/converters/wv/PLIST
index e82c186ee68..08825d67e8d 100644
--- a/converters/wv/PLIST
+++ b/converters/wv/PLIST
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2002/11/15 18:03:41 wiz Exp $
-bin/make_epses.sh
-bin/wv-incconfig
-bin/wv-libconfig
+@comment $NetBSD: PLIST,v 1.4 2003/09/03 13:21:37 adam Exp $
+bin/libwv-config
 bin/wvAbw
 bin/wvCleanLatex
 bin/wvConvert
+bin/wvDocBook
 bin/wvDVI
 bin/wvHtml
 bin/wvLatex
@@ -18,11 +17,14 @@ bin/wvVersion
 bin/wvWare
 bin/wvWml
 include/wv.h
-include/wvexporter.h
+lib/libwv.so
+lib/libwv-0.7.so
+lib/libwv-0.7.so.6
+lib/libwv-0.7.so.6.0
 lib/libwv.a
+lib/libwv.la
 man/man1/wvAbw.1
 man/man1/wvCleanLatex.1
-man/man1/wvConvert.1
 man/man1/wvDVI.1
 man/man1/wvHtml.1
 man/man1/wvLatex.1
@@ -35,12 +37,6 @@ man/man1/wvText.1
 man/man1/wvVersion.1
 man/man1/wvWare.1
 man/man1/wvWml.1
-share/doc/wv/COPYING
-share/doc/wv/CREDITS
-share/doc/wv/INSTALL
-share/doc/wv/KNOWN-BUGS
-share/doc/wv/README
-share/doc/wv/XML_Tags
 share/wv/patterns/100.gif
 share/wv/patterns/101.gif
 share/wv/patterns/102.gif
@@ -258,7 +254,6 @@ share/wv/patterns/sectionendeven.gif
 share/wv/patterns/sectionendnewpage.gif
 share/wv/patterns/sectionendodd.gif
 share/wv/patterns/wmf.jpg
-share/wv/ttf/.directory
 share/wv/wingdingfont/100.gif
 share/wv/wingdingfont/101.gif
 share/wv/wingdingfont/102.gif
@@ -483,6 +478,7 @@ share/wv/wingdingfont/99.gif
 share/wv/wvAbw.xml
 share/wv/wvCleanLaTeX.xml
 share/wv/wvConfig.xml
+share/wv/wvDocbook.xml
 share/wv/wvHtml.xml
 share/wv/wvLaTeX.xml
 share/wv/wvText.xml
@@ -490,7 +486,5 @@ share/wv/wvWml.xml
 share/wv/wvXml.dtd
 share/wv/wvXml.xml
 @dirrm share/wv/wingdingfont
-@dirrm share/wv/ttf
 @dirrm share/wv/patterns
 @dirrm share/wv
-@dirrm share/doc/wv
diff --git a/converters/wv/distinfo b/converters/wv/distinfo
index 9445faa3557..799d97d0a6c 100644
--- a/converters/wv/distinfo
+++ b/converters/wv/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.7 2002/11/15 18:03:41 wiz Exp $
+$NetBSD: distinfo,v 1.8 2003/09/03 13:21:38 adam Exp $
 
-SHA1 (wv-0.7.4.tar.gz) = ce07299aadda9c88bd02cbc3489d5093825c51c5
-Size (wv-0.7.4.tar.gz) = 1199621 bytes
-SHA1 (patch-ad) = 820e595779998246e54a2a4c234873d563cb2bf0
-SHA1 (patch-ae) = 58b4cadf0276b1dc25bd737623336b4fc90093f0
-SHA1 (patch-aj) = f141b74b49611c954d4de24d050e5f68274ab26e
+SHA1 (wv-0.7.6.tar.gz) = ac76e1ee1a2a6fbb33ba882fc29b24cf96e7be33
+Size (wv-0.7.6.tar.gz) = 723355 bytes
+SHA1 (patch-ad) = 52e5879b535710baf8069705465daac572afb641
diff --git a/converters/wv/patches/patch-ad b/converters/wv/patches/patch-ad
index a4c1ccff2b6..885e85e30f7 100644
--- a/converters/wv/patches/patch-ad
+++ b/converters/wv/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2001/10/15 15:53:16 kei Exp $
+$NetBSD: patch-ad,v 1.4 2003/09/03 13:21:38 adam Exp $
 
---- wv.h.orig	Fri Aug 31 17:53:25 2001
-+++ wv.h	Mon Oct 15 02:20:49 2001
-@@ -43,7 +43,7 @@
+--- wv.h.orig	2003-05-13 00:48:59.000000000 +0200
++++ wv.h
+@@ -51,7 +51,7 @@ extern "C" {
  #endif
  
  #ifndef S32
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.3 2001/10/15 15:53:16 kei Exp $
  #endif
  
  #ifndef U16
-@@ -59,7 +59,7 @@
+@@ -67,7 +67,7 @@ extern "C" {
  #endif
  
  #ifndef S8
diff --git a/converters/wv/patches/patch-ae b/converters/wv/patches/patch-ae
deleted file mode 100644
index d54b1cd7bd7..00000000000
--- a/converters/wv/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2001/07/13 04:49:11 kei Exp $
-
---- 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 @@
- 
- 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
- 
diff --git a/converters/wv/patches/patch-aj b/converters/wv/patches/patch-aj
deleted file mode 100644
index bdc5156d05c..00000000000
--- a/converters/wv/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$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