Rework to use libwmf-0.1.17nb1.

5 files changed, 412 insertions, 379 deletions

diff --git a/converters/wv/Makefile b/converters/wv/Makefile
index 286cbb2eabd..778cbfda8a4 100644
--- a/converters/wv/Makefile
+++ b/converters/wv/Makefile
@@ -1,26 +1,44 @@
-# $NetBSD: Makefile,v 1.2 2000/05/18 00:09:06 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/05 02:39:18 jlam Exp $
 #
 
-DISTNAME=	wv-0.5.43
-CATEGORIES=	converters
-MASTER_SITES=	http://www.csn.ul.ie/~caolan/publink/mswordview/development/
+DISTNAME=		wv-0.5.43
+CATEGORIES=		converters
+MASTER_SITES=		http://www.csn.ul.ie/~caolan/publink/mswordview/development/
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.wvWare.com/
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www.wvWare.com/
 
-DEPENDS+=	libwmf-0.1.17:../../graphics/libwmf
-DEPENDS+=	ImageMagick-*:../../graphics/ImageMagick
+BUILD_DEPENDS+=		autoconf:../../devel/autoconf
+DEPENDS+=		libwmf-0.1.17nb1:../../graphics/libwmf
+DEPENDS+=		ImageMagick-*:../../graphics/ImageMagick
 
 # not detected by configure, causes conflicts with the one coming with wv
-CONFLICTS+=	libgetopt-*:../../devel/libgetopt
+CONFLICTS+=		libgetopt-*
 
-MAKE_ENV+=	RM="${RM}"
+USE_X11=		# defined
 
-WRKSRC=		${WRKDIR}/wv
-GNU_CONFIGURE=	YES
-LDFLAGS+=	-Wl,-R${X11BASE}/lib
+WRKSRC=			${WRKDIR}/wv
+GNU_CONFIGURE=		# defined
+
+EVAL_PREFIX=		XPMDIR=xpm
+CONFIGURE_ARGS+=	--with-Magick=${LOCALBASE}
+CONFIGURE_ARGS+=	--with-png=${LOCALBASE}
+CONFIGURE_ARGS+=	--with-ttf=${LOCALBASE}
+CONFIGURE_ARGS+=	--with-wmf=${LOCALBASE}
+CONFIGURE_ARGS+=	--with-xpm=${XPMDIR}
+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
+MAKE_ENV+=		RM="${RM}"
+
+CPPFLAGS+=		-I${LOCALBASE}/include		# png.h
+
+pre-patch:
+	${FIND} ${WRKSRC} -name "*.orig" -exec ${RM} {} \;
+
+pre-configure:
+	cd ${WRKSRC} && autoconf
 
 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 Documentation/XML_Tags ${PREFIX}/share/doc/wv
diff --git a/converters/wv/files/patch-sum b/converters/wv/files/patch-sum
index 39b83d6e47e..1afa94e75a2 100644
--- a/converters/wv/files/patch-sum
+++ b/converters/wv/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/02/27 22:09:19 wiz Exp $
+$NetBSD: patch-sum,v 1.2 2000/08/05 02:39:19 jlam Exp $
 
-MD5 (patch-aa) = 05d9f3746dd53af8f6bd1aed36ad8895
-MD5 (patch-ab) = ff4cdd79207a9643d94754fb490215ff
+MD5 (patch-aa) = 12de44a496abc20a8776758932dc6a9c
+MD5 (patch-ab) = 872b529f658fb257a0fd16c982b18018
diff --git a/converters/wv/patches/patch-aa b/converters/wv/patches/patch-aa
index 3565f054b35..c792b3c7deb 100644
--- a/converters/wv/patches/patch-aa
+++ b/converters/wv/patches/patch-aa
@@ -1,90 +1,59 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/02/27 22:09:18 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2000/08/05 02:39:19 jlam Exp $
 
---- ./configure.orig	Thu Dec 16 16:35:18 1999
-+++ ./configure	Sun Feb 27 17:13:01 2000
-@@ -5313,76 +5313,28 @@
- echo "configure:5314: checking for PNG support ..." >&5
- 		failed=0;
- 		passed=0;
--		ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for png.h""... $ac_c" 1>&6
--echo "configure:5319: checking for png.h" >&5
--if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  cat > conftest.$ac_ext <<EOF
--#line 5324 "configure"
-+		cat > conftest.$ac_ext <<EOF
-+#line 5318 "configure"
- #include "confdefs.h"
- #include <png.h>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:5329: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=yes"
--else
--  echo "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
--fi
--rm -f conftest*
--fi
--if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  passed=`expr $passed + 1`
--else
--  echo "$ac_t""no" 1>&6
--failed=`expr $failed + 1`
--fi
--
--		ac_safe=`echo "pngconf.h" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for pngconf.h""... $ac_c" 1>&6
--echo "configure:5353: checking for pngconf.h" >&5
--if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  cat > conftest.$ac_ext <<EOF
--#line 5358 "configure"
--#include "confdefs.h"
- #include <pngconf.h>
-+int main() {
-+
-+; return 0; }
- EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:5363: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
-+if { (eval echo configure:5326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=yes"
-+  passed=`expr $passed + 1`
- else
--  echo "$ac_err" >&5
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  failed=`expr $failed + 1`
- fi
- rm -f conftest*
--fi
--if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  passed=`expr $passed + 1`
--else
--  echo "$ac_t""no" 1>&6
--failed=`expr $failed + 1`
--fi
+--- Makefile.in.orig	Thu Dec 16 10:52:20 1999
++++ Makefile.in	Fri Aug  4 21:37:11 2000
+@@ -76,7 +76,7 @@
+ 
+ VPATH = @srcdir@
+ 
+-CFLAGS = @CFLAGS@ @DEFS@ @ZLIB_CFLAGS@ -I. -I./ -I$(srcdir)/ -I$(srcdir)/iconv/ -I$(srcdir)/magick/ -I$(srcdir)/expat/xmlparse/ -I$(srcdir)/oledecod/  @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)/iconv/ -I$(srcdir)/magick/ -I$(srcdir)/expat/xmlparse/ -I$(srcdir)/oledecod/ @WMF_CFLAGS@ @TTF_CFLAGS@ -DTTFDIR=\"$(prefix)/share/wv/ttf\" -DXMLCONFIG=\"$(prefix)/share/wv/wvConfig.xml\" -DHTMLCONFIG=\"$(prefix)/share/wv/wvHtml.xml\" @CPPFLAGS@
+ 
+ MKINSTALLDIRS = $(srcdir)/mkinstalldirs
+ 
+@@ -223,7 +223,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
+@@ -293,10 +293,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)
+ 	
+ 
+@@ -313,13 +314,16 @@
+ 	$(INSTALL_DATA) $(srcdir)/wvHtml.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)/wvConfig.xml $(libdir)/wv/wvConfig.xml
++	$(INSTALL_DATA) $(srcdir)/lyx.xml $(prefix)/share/wv/lyx.xml
++	$(INSTALL_DATA) $(srcdir)/wvHtml.xml $(prefix)/share/wv/wvHtml.xml
++	$(INSTALL_DATA) $(srcdir)/wvConfig.xml $(prefix)/share/wv/wvConfig.xml
++	$(INSTALL_DATA) $(srcdir)/wvLaTeX.xml $(prefix)/share/wv/wvLaTeX.xml
++	$(INSTALL_DATA) $(srcdir)/wvOnline.xml $(prefix)/share/wv/wvOnline.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
+ 
  
- 		echo $ac_n "checking for png_info_init in -lpng""... $ac_c" 1>&6
--echo "configure:5386: checking for png_info_init in -lpng" >&5
-+echo "configure:5338: checking for png_info_init in -lpng" >&5
- ac_lib_var=`echo png'_'png_info_init | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
diff --git a/converters/wv/patches/patch-ab b/converters/wv/patches/patch-ab
index 16b0322d97f..c4f7696288c 100644
--- a/converters/wv/patches/patch-ab
+++ b/converters/wv/patches/patch-ab
@@ -1,50 +1,95 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/02/27 22:09:18 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2000/08/05 02:39:19 jlam Exp $
 
---- ./Makefile.in.orig	Thu Dec 16 16:52:20 1999
-+++ ./Makefile.in	Sun Feb 27 20:05:06 2000
-@@ -76,7 +76,7 @@
- 
- VPATH = @srcdir@
- 
--CFLAGS = @CFLAGS@ @DEFS@ @ZLIB_CFLAGS@ -I. -I./ -I$(srcdir)/ -I$(srcdir)/iconv/ -I$(srcdir)/magick/ -I$(srcdir)/expat/xmlparse/ -I$(srcdir)/oledecod/  @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)/iconv/ -I$(srcdir)/magick/ -I$(srcdir)/expat/xmlparse/ -I$(srcdir)/oledecod/  @TTF_CFLAGS@ @WMF_CFLAGS@ -DTTFDIR=\"$(libdir)/wv/ttf\" -DXMLCONFIG=\"$(prefix)/share/wv/wvConfig.xml\" -DHTMLCONFIG=\"$(prefix)/share/wv/wvHtml.xml\" 
- 
- MKINSTALLDIRS = $(srcdir)/mkinstalldirs
- 
-@@ -293,10 +293,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)
- 	
- 
-@@ -313,13 +314,16 @@
- 	$(INSTALL_DATA) $(srcdir)/wvHtml.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)/wvConfig.xml $(libdir)/wv/wvConfig.xml
-+	$(INSTALL_DATA) $(srcdir)/lyx.xml $(prefix)/share/wv/lyx.xml
-+	$(INSTALL_DATA) $(srcdir)/wvHtml.xml $(prefix)/share/wv/wvHtml.xml
-+	$(INSTALL_DATA) $(srcdir)/wvConfig.xml $(prefix)/share/wv/wvConfig.xml
-+	$(INSTALL_DATA) $(srcdir)/wvLaTeX.xml $(prefix)/share/wv/wvLaTeX.xml
-+	$(INSTALL_DATA) $(srcdir)/wvOnline.xml $(prefix)/share/wv/wvOnline.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
+--- configure.in.orig	Thu Dec 16 10:35:16 1999
++++ configure.in	Fri Aug  4 21:37:12 2000
+@@ -305,7 +305,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
  
+@@ -319,20 +319,21 @@
+     AC_MSG_RESULT("$result")
+ fi
+ if [ test "$SYSTEM_TTF" = 1 ]; then
+-    AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf"],no_ttf=yes,-lm)
++    AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf -lintl"],
++    no_ttf=yes,-lintl)
+ else
+     no_ttf=yes
+ 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
+@@ -345,15 +346,16 @@
+ 		AC_MSG_RESULT("$result")
+ 	fi
+ 	if [ test "$SYSTEM_TTF" = 1 ]; then
+-		AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf"],no_ttf=yes,-lm)
++		AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf -lintl"],
++		no_ttf=yes,-lintl)
+ 	else
+ 		no_ttf=yes
+ 	fi
+ 
+ 
+ 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}/include ${TTF_LIBS}"
+ fi
+ 
+ fi
+@@ -374,7 +376,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
+ 
+@@ -397,13 +399,13 @@
+ 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
+ 
+ if test "x$no_wmf" = xyes; then
+ 	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
+ 
+@@ -427,8 +429,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
diff --git a/converters/wv/pkg/PLIST b/converters/wv/pkg/PLIST
index 12e33861222..d2ff8ea4e3b 100644
--- a/converters/wv/pkg/PLIST
+++ b/converters/wv/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/02/27 22:09:18 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/08/05 02:39:19 jlam Exp $
 bin/wv-incconfig
 bin/wv-libconfig
 bin/wvConvert
@@ -10,6 +10,231 @@ bin/wvVersion
 include/wv.h
 lib/libwv.a
 man/man1/wvHtml.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/lyx.xml
+share/wv/patterns/100.gif
+share/wv/patterns/101.gif
+share/wv/patterns/102.gif
+share/wv/patterns/103.gif
+share/wv/patterns/104.gif
+share/wv/patterns/105.gif
+share/wv/patterns/106.gif
+share/wv/patterns/107.gif
+share/wv/patterns/108.gif
+share/wv/patterns/109.gif
+share/wv/patterns/110.gif
+share/wv/patterns/111.gif
+share/wv/patterns/112.gif
+share/wv/patterns/113.gif
+share/wv/patterns/114.gif
+share/wv/patterns/115.gif
+share/wv/patterns/116.gif
+share/wv/patterns/117.gif
+share/wv/patterns/118.gif
+share/wv/patterns/119.gif
+share/wv/patterns/120.gif
+share/wv/patterns/121.gif
+share/wv/patterns/122.gif
+share/wv/patterns/123.gif
+share/wv/patterns/124.gif
+share/wv/patterns/125.gif
+share/wv/patterns/126.gif
+share/wv/patterns/127.gif
+share/wv/patterns/128.gif
+share/wv/patterns/129.gif
+share/wv/patterns/130.gif
+share/wv/patterns/131.gif
+share/wv/patterns/132.gif
+share/wv/patterns/133.gif
+share/wv/patterns/134.gif
+share/wv/patterns/135.gif
+share/wv/patterns/136.gif
+share/wv/patterns/137.gif
+share/wv/patterns/138.gif
+share/wv/patterns/139.gif
+share/wv/patterns/14.gif
+share/wv/patterns/140.gif
+share/wv/patterns/141.gif
+share/wv/patterns/142.gif
+share/wv/patterns/143.gif
+share/wv/patterns/144.gif
+share/wv/patterns/145.gif
+share/wv/patterns/146.gif
+share/wv/patterns/147.gif
+share/wv/patterns/148.gif
+share/wv/patterns/149.gif
+share/wv/patterns/15.gif
+share/wv/patterns/150.gif
+share/wv/patterns/151.gif
+share/wv/patterns/152.gif
+share/wv/patterns/153.gif
+share/wv/patterns/154.gif
+share/wv/patterns/155.gif
+share/wv/patterns/156.gif
+share/wv/patterns/157.gif
+share/wv/patterns/158.gif
+share/wv/patterns/159.gif
+share/wv/patterns/16.gif
+share/wv/patterns/160.gif
+share/wv/patterns/161.gif
+share/wv/patterns/162.gif
+share/wv/patterns/163.gif
+share/wv/patterns/164.gif
+share/wv/patterns/165.gif
+share/wv/patterns/166.gif
+share/wv/patterns/167.gif
+share/wv/patterns/168.gif
+share/wv/patterns/169.gif
+share/wv/patterns/17.gif
+share/wv/patterns/170.gif
+share/wv/patterns/171.gif
+share/wv/patterns/172.gif
+share/wv/patterns/173.gif
+share/wv/patterns/174.gif
+share/wv/patterns/175.gif
+share/wv/patterns/176.gif
+share/wv/patterns/177.gif
+share/wv/patterns/178.gif
+share/wv/patterns/179.gif
+share/wv/patterns/18.gif
+share/wv/patterns/180.gif
+share/wv/patterns/181.gif
+share/wv/patterns/182.gif
+share/wv/patterns/183.gif
+share/wv/patterns/184.gif
+share/wv/patterns/185.gif
+share/wv/patterns/186.gif
+share/wv/patterns/187.gif
+share/wv/patterns/188.gif
+share/wv/patterns/189.gif
+share/wv/patterns/19.gif
+share/wv/patterns/190.gif
+share/wv/patterns/191.gif
+share/wv/patterns/192.gif
+share/wv/patterns/193.gif
+share/wv/patterns/194.gif
+share/wv/patterns/195.gif
+share/wv/patterns/196.gif
+share/wv/patterns/197.gif
+share/wv/patterns/198.gif
+share/wv/patterns/199.gif
+share/wv/patterns/20.gif
+share/wv/patterns/200.gif
+share/wv/patterns/201.gif
+share/wv/patterns/202.gif
+share/wv/patterns/203.gif
+share/wv/patterns/204.gif
+share/wv/patterns/205.gif
+share/wv/patterns/21.gif
+share/wv/patterns/22.gif
+share/wv/patterns/23.gif
+share/wv/patterns/24.gif
+share/wv/patterns/25.gif
+share/wv/patterns/26.gif
+share/wv/patterns/27.gif
+share/wv/patterns/28.gif
+share/wv/patterns/29.gif
+share/wv/patterns/30.gif
+share/wv/patterns/31.gif
+share/wv/patterns/32.gif
+share/wv/patterns/33.gif
+share/wv/patterns/34.gif
+share/wv/patterns/35.gif
+share/wv/patterns/36.gif
+share/wv/patterns/37.gif
+share/wv/patterns/38.gif
+share/wv/patterns/39.gif
+share/wv/patterns/40.gif
+share/wv/patterns/41.gif
+share/wv/patterns/42.gif
+share/wv/patterns/43.gif
+share/wv/patterns/44.gif
+share/wv/patterns/45.gif
+share/wv/patterns/46.gif
+share/wv/patterns/47.gif
+share/wv/patterns/48.gif
+share/wv/patterns/49.gif
+share/wv/patterns/50.gif
+share/wv/patterns/51.gif
+share/wv/patterns/52.gif
+share/wv/patterns/53.gif
+share/wv/patterns/54.gif
+share/wv/patterns/55.gif
+share/wv/patterns/56.gif
+share/wv/patterns/57.gif
+share/wv/patterns/58.gif
+share/wv/patterns/59.gif
+share/wv/patterns/60.gif
+share/wv/patterns/61.gif
+share/wv/patterns/62.gif
+share/wv/patterns/63.gif
+share/wv/patterns/64.gif
+share/wv/patterns/65.gif
+share/wv/patterns/66.gif
+share/wv/patterns/67.gif
+share/wv/patterns/68.gif
+share/wv/patterns/69.gif
+share/wv/patterns/70.gif
+share/wv/patterns/71.gif
+share/wv/patterns/72.gif
+share/wv/patterns/73.gif
+share/wv/patterns/74.gif
+share/wv/patterns/75.gif
+share/wv/patterns/76.gif
+share/wv/patterns/77.gif
+share/wv/patterns/78.gif
+share/wv/patterns/79.gif
+share/wv/patterns/80.gif
+share/wv/patterns/81.gif
+share/wv/patterns/82.gif
+share/wv/patterns/83.gif
+share/wv/patterns/84.gif
+share/wv/patterns/85.gif
+share/wv/patterns/86.gif
+share/wv/patterns/87.gif
+share/wv/patterns/88.gif
+share/wv/patterns/89.gif
+share/wv/patterns/90.gif
+share/wv/patterns/91.gif
+share/wv/patterns/92.gif
+share/wv/patterns/93.gif
+share/wv/patterns/94.gif
+share/wv/patterns/95.gif
+share/wv/patterns/96.gif
+share/wv/patterns/97.gif
+share/wv/patterns/98.gif
+share/wv/patterns/99.gif
+share/wv/patterns/battributes.jpg
+share/wv/patterns/bdeleted.jpg
+share/wv/patterns/bnewlytyped.jpg
+share/wv/patterns/clear.gif
+share/wv/patterns/columnbreak.gif
+share/wv/patterns/commentbegin.gif
+share/wv/patterns/commentend.gif
+share/wv/patterns/deleted.jpg
+share/wv/patterns/doccommentb.jpg
+share/wv/patterns/doccommente.jpg
+share/wv/patterns/documentend.gif
+share/wv/patterns/eattributes.jpg
+share/wv/patterns/edeleted.jpg
+share/wv/patterns/endnotebegin.gif
+share/wv/patterns/endnoteend.gif
+share/wv/patterns/enewlytyped.jpg
+share/wv/patterns/footnotebegin.gif
+share/wv/patterns/footnoteend.gif
+share/wv/patterns/pagebreak.gif
+share/wv/patterns/sectionendcolumn.gif
+share/wv/patterns/sectionendcontinous.gif
+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
@@ -231,236 +456,12 @@ share/wv/wingdingfont/96.gif
 share/wv/wingdingfont/97.gif
 share/wv/wingdingfont/98.gif
 share/wv/wingdingfont/99.gif
-@dirrm share/wv/wingdingfont
-share/wv/patterns/100.gif
-share/wv/patterns/101.gif
-share/wv/patterns/102.gif
-share/wv/patterns/103.gif
-share/wv/patterns/104.gif
-share/wv/patterns/105.gif
-share/wv/patterns/106.gif
-share/wv/patterns/107.gif
-share/wv/patterns/108.gif
-share/wv/patterns/109.gif
-share/wv/patterns/110.gif
-share/wv/patterns/111.gif
-share/wv/patterns/112.gif
-share/wv/patterns/113.gif
-share/wv/patterns/114.gif
-share/wv/patterns/115.gif
-share/wv/patterns/116.gif
-share/wv/patterns/117.gif
-share/wv/patterns/118.gif
-share/wv/patterns/119.gif
-share/wv/patterns/120.gif
-share/wv/patterns/121.gif
-share/wv/patterns/122.gif
-share/wv/patterns/123.gif
-share/wv/patterns/124.gif
-share/wv/patterns/125.gif
-share/wv/patterns/126.gif
-share/wv/patterns/127.gif
-share/wv/patterns/128.gif
-share/wv/patterns/129.gif
-share/wv/patterns/130.gif
-share/wv/patterns/131.gif
-share/wv/patterns/132.gif
-share/wv/patterns/133.gif
-share/wv/patterns/134.gif
-share/wv/patterns/135.gif
-share/wv/patterns/136.gif
-share/wv/patterns/137.gif
-share/wv/patterns/138.gif
-share/wv/patterns/139.gif
-share/wv/patterns/14.gif
-share/wv/patterns/140.gif
-share/wv/patterns/141.gif
-share/wv/patterns/142.gif
-share/wv/patterns/143.gif
-share/wv/patterns/144.gif
-share/wv/patterns/145.gif
-share/wv/patterns/146.gif
-share/wv/patterns/147.gif
-share/wv/patterns/148.gif
-share/wv/patterns/149.gif
-share/wv/patterns/15.gif
-share/wv/patterns/150.gif
-share/wv/patterns/151.gif
-share/wv/patterns/152.gif
-share/wv/patterns/153.gif
-share/wv/patterns/154.gif
-share/wv/patterns/155.gif
-share/wv/patterns/156.gif
-share/wv/patterns/157.gif
-share/wv/patterns/158.gif
-share/wv/patterns/159.gif
-share/wv/patterns/16.gif
-share/wv/patterns/160.gif
-share/wv/patterns/161.gif
-share/wv/patterns/162.gif
-share/wv/patterns/163.gif
-share/wv/patterns/164.gif
-share/wv/patterns/165.gif
-share/wv/patterns/166.gif
-share/wv/patterns/167.gif
-share/wv/patterns/168.gif
-share/wv/patterns/169.gif
-share/wv/patterns/17.gif
-share/wv/patterns/170.gif
-share/wv/patterns/171.gif
-share/wv/patterns/172.gif
-share/wv/patterns/173.gif
-share/wv/patterns/174.gif
-share/wv/patterns/175.gif
-share/wv/patterns/176.gif
-share/wv/patterns/177.gif
-share/wv/patterns/178.gif
-share/wv/patterns/179.gif
-share/wv/patterns/18.gif
-share/wv/patterns/180.gif
-share/wv/patterns/181.gif
-share/wv/patterns/182.gif
-share/wv/patterns/183.gif
-share/wv/patterns/184.gif
-share/wv/patterns/185.gif
-share/wv/patterns/186.gif
-share/wv/patterns/187.gif
-share/wv/patterns/188.gif
-share/wv/patterns/189.gif
-share/wv/patterns/19.gif
-share/wv/patterns/190.gif
-share/wv/patterns/191.gif
-share/wv/patterns/192.gif
-share/wv/patterns/193.gif
-share/wv/patterns/194.gif
-share/wv/patterns/195.gif
-share/wv/patterns/196.gif
-share/wv/patterns/197.gif
-share/wv/patterns/198.gif
-share/wv/patterns/199.gif
-share/wv/patterns/20.gif
-share/wv/patterns/200.gif
-share/wv/patterns/201.gif
-share/wv/patterns/202.gif
-share/wv/patterns/203.gif
-share/wv/patterns/204.gif
-share/wv/patterns/205.gif
-share/wv/patterns/21.gif
-share/wv/patterns/22.gif
-share/wv/patterns/23.gif
-share/wv/patterns/24.gif
-share/wv/patterns/25.gif
-share/wv/patterns/26.gif
-share/wv/patterns/27.gif
-share/wv/patterns/28.gif
-share/wv/patterns/29.gif
-share/wv/patterns/30.gif
-share/wv/patterns/31.gif
-share/wv/patterns/32.gif
-share/wv/patterns/33.gif
-share/wv/patterns/34.gif
-share/wv/patterns/35.gif
-share/wv/patterns/36.gif
-share/wv/patterns/37.gif
-share/wv/patterns/38.gif
-share/wv/patterns/39.gif
-share/wv/patterns/40.gif
-share/wv/patterns/41.gif
-share/wv/patterns/42.gif
-share/wv/patterns/43.gif
-share/wv/patterns/44.gif
-share/wv/patterns/45.gif
-share/wv/patterns/46.gif
-share/wv/patterns/47.gif
-share/wv/patterns/48.gif
-share/wv/patterns/49.gif
-share/wv/patterns/50.gif
-share/wv/patterns/51.gif
-share/wv/patterns/52.gif
-share/wv/patterns/53.gif
-share/wv/patterns/54.gif
-share/wv/patterns/55.gif
-share/wv/patterns/56.gif
-share/wv/patterns/57.gif
-share/wv/patterns/58.gif
-share/wv/patterns/59.gif
-share/wv/patterns/60.gif
-share/wv/patterns/61.gif
-share/wv/patterns/62.gif
-share/wv/patterns/63.gif
-share/wv/patterns/64.gif
-share/wv/patterns/65.gif
-share/wv/patterns/66.gif
-share/wv/patterns/67.gif
-share/wv/patterns/68.gif
-share/wv/patterns/69.gif
-share/wv/patterns/70.gif
-share/wv/patterns/71.gif
-share/wv/patterns/72.gif
-share/wv/patterns/73.gif
-share/wv/patterns/74.gif
-share/wv/patterns/75.gif
-share/wv/patterns/76.gif
-share/wv/patterns/77.gif
-share/wv/patterns/78.gif
-share/wv/patterns/79.gif
-share/wv/patterns/80.gif
-share/wv/patterns/81.gif
-share/wv/patterns/82.gif
-share/wv/patterns/83.gif
-share/wv/patterns/84.gif
-share/wv/patterns/85.gif
-share/wv/patterns/86.gif
-share/wv/patterns/87.gif
-share/wv/patterns/88.gif
-share/wv/patterns/89.gif
-share/wv/patterns/90.gif
-share/wv/patterns/91.gif
-share/wv/patterns/92.gif
-share/wv/patterns/93.gif
-share/wv/patterns/94.gif
-share/wv/patterns/95.gif
-share/wv/patterns/96.gif
-share/wv/patterns/97.gif
-share/wv/patterns/98.gif
-share/wv/patterns/99.gif
-share/wv/patterns/battributes.jpg
-share/wv/patterns/bdeleted.jpg
-share/wv/patterns/bnewlytyped.jpg
-share/wv/patterns/clear.gif
-share/wv/patterns/columnbreak.gif
-share/wv/patterns/commentbegin.gif
-share/wv/patterns/commentend.gif
-share/wv/patterns/deleted.jpg
-share/wv/patterns/doccommentb.jpg
-share/wv/patterns/doccommente.jpg
-share/wv/patterns/documentend.gif
-share/wv/patterns/eattributes.jpg
-share/wv/patterns/edeleted.jpg
-share/wv/patterns/endnotebegin.gif
-share/wv/patterns/endnoteend.gif
-share/wv/patterns/enewlytyped.jpg
-share/wv/patterns/footnotebegin.gif
-share/wv/patterns/footnoteend.gif
-share/wv/patterns/pagebreak.gif
-share/wv/patterns/sectionendcolumn.gif
-share/wv/patterns/sectionendcontinous.gif
-share/wv/patterns/sectionendeven.gif
-share/wv/patterns/sectionendnewpage.gif
-share/wv/patterns/sectionendodd.gif
-share/wv/patterns/wmf.jpg
-@dirrm share/wv/patterns
-@dirrm share/wv/ttf
-share/wv/lyx.xml
 share/wv/wvConfig.xml
 share/wv/wvHtml.xml
 share/wv/wvLaTeX.xml
 share/wv/wvOnline.xml
+@dirrm share/wv/wingdingfont
+@dirrm share/wv/ttf
+@dirrm share/wv/patterns
 @dirrm share/wv
-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
 @dirrm share/doc/wv