From 7b1351ee4cd46b3710c2f8e83e4c39faac483ee5 Mon Sep 17 00:00:00 2001 From: rh Date: Mon, 16 Oct 2000 15:14:22 +0000 Subject: Update wv to 0.6.0. Changes include: * Changed executable name from wvHtml to wvWare * Added Mime display script (wvMime) (Martin Vermeer, Dom) * Added Conversion Helper Scripts (wvHtml, wvLatex, wvCleanLatex, wvPS, wvDVI, wvPDF) (Dom) * Added CleanLaTeX output mode, more closely resembling hand-crafted LaTeX (Martin) * Use GLib (http://www.gtk.org) (Dom) * Use Gnome Libole2 (http://www.gnome.org) (Dom, Jamie) * New wvStream architecture (Jamie) * Word 2 support! (Martin Vermeer) * Code speedups and XP improvements (the Abiword team) * Massive work started on an exporter (Dom) * Move to wvware.sourceforge.net (Dom) * New Maintainer: Dom Lachowicz (cinamod@hotmail.com) |-> also getting lots of help from Martin Vermeer --- converters/wv/Makefile | 25 ++++++--- converters/wv/files/md5 | 4 +- converters/wv/files/patch-sum | 8 +-- converters/wv/patches/patch-aa | 31 +++++------ converters/wv/patches/patch-ab | 116 ++++++++++++++++++++++++++++------------- converters/wv/patches/patch-ad | 16 ++++++ converters/wv/patches/patch-ae | 13 +++++ converters/wv/pkg/PLIST | 23 ++++++-- 8 files changed, 169 insertions(+), 67 deletions(-) create mode 100644 converters/wv/patches/patch-ad create mode 100644 converters/wv/patches/patch-ae (limited to 'converters') diff --git a/converters/wv/Makefile b/converters/wv/Makefile index 66eaa2ef07c..2d724d4fd7d 100644 --- a/converters/wv/Makefile +++ b/converters/wv/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.4 2000/09/02 17:52:53 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2000/10/16 15:14:22 rh Exp $ # -DISTNAME= wv-0.5.44 +DISTNAME= wv-0.6.0 CATEGORIES= converters -MASTER_SITES= http://www.csn.ul.ie/~caolan/publink/mswordview/development/ +MASTER_SITES= http://download.sourceforge.net/wvware/ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.wvWare.com/ @@ -15,10 +15,11 @@ DEPENDS+= ImageMagick>=5.2.2:../../graphics/ImageMagick # not detected by configure, causes conflicts with the one coming with wv CONFLICTS+= libgetopt-* -USE_X11= # defined +USE_X11= YES +USE_XPM= YES WRKSRC= ${WRKDIR}/wv -GNU_CONFIGURE= # defined +GNU_CONFIGURE= YES EVAL_PREFIX= XPMDIR=xpm CONFIGURE_ARGS+= --with-Magick=${LOCALBASE} @@ -27,15 +28,23 @@ CONFIGURE_ARGS+= --with-ttf=${LOCALBASE} CONFIGURE_ARGS+= --with-wmf=${LOCALBASE} CONFIGURE_ARGS+= --with-xpm=${XPMDIR} CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" -MAKE_ENV+= RM="${RM}" +MAKE_ENV+= RM="${RM} -f" -CPPFLAGS+= -I${LOCALBASE}/include # png.h +CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include/magick +CPPFLAGS+= -I${LOCALBASE}/include/libwmf +MAKE_ENV+= CPPFLAGS="${CPPFLAGS}" pre-patch: ${FIND} ${WRKSRC} -name "*.orig" -exec ${RM} {} \; pre-configure: - cd ${WRKSRC} && autoconf + #cd ${WRKSRC} && autoconf + +post-configure: + #cd ${WRKSRC} && ${RM} -rf magick && \ + #${LN} -s ${PREFIX}/include/magick . + #cd ${WRKSRC} && ${LN} -s ${PREFIX}/include/magick/config.h magick post-install: ${TOUCH} ${PREFIX}/share/wv/ttf/.directory diff --git a/converters/wv/files/md5 b/converters/wv/files/md5 index 66b09fdd5c2..7e10461ca0d 100644 --- a/converters/wv/files/md5 +++ b/converters/wv/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.3 2000/09/05 10:35:26 wiz Exp $ +$NetBSD: md5,v 1.4 2000/10/16 15:14:23 rh Exp $ -MD5 (wv-0.5.44.tar.gz) = e1286c8792d3912e4c15de68dcbff7be +MD5 (wv-0.6.0.tar.gz) = 0addb073d247c550824976196cbaa8b8 diff --git a/converters/wv/files/patch-sum b/converters/wv/files/patch-sum index 21a1f73368a..7ab8997160d 100644 --- a/converters/wv/files/patch-sum +++ b/converters/wv/files/patch-sum @@ -1,5 +1,7 @@ -$NetBSD: patch-sum,v 1.3 2000/09/02 17:52:54 wiz Exp $ +$NetBSD: patch-sum,v 1.4 2000/10/16 15:14:23 rh Exp $ -MD5 (patch-aa) = 12de44a496abc20a8776758932dc6a9c -MD5 (patch-ab) = 872b529f658fb257a0fd16c982b18018 +MD5 (patch-aa) = e265e430abdc0cc5cc2e7ccfa4728353 +MD5 (patch-ab) = 04252edd7ebc3c0d5ec4d07f8d00966c MD5 (patch-ac) = 35539af46672e33a6a7fcddd348548cb +MD5 (patch-ad) = 35f4a87bb195ad980ffaf05f3c2fa548 +MD5 (patch-ae) = 40357654775d4c15fd4584392f8297d9 diff --git a/converters/wv/patches/patch-aa b/converters/wv/patches/patch-aa index c792b3c7deb..8c73e40d25d 100644 --- a/converters/wv/patches/patch-aa +++ b/converters/wv/patches/patch-aa @@ -1,26 +1,26 @@ -$NetBSD: patch-aa,v 1.2 2000/08/05 02:39:19 jlam Exp $ +$NetBSD: patch-aa,v 1.3 2000/10/16 15:14:23 rh Exp $ ---- Makefile.in.orig Thu Dec 16 10:52:20 1999 -+++ Makefile.in Fri Aug 4 21:37:11 2000 +--- 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)/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@ +-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\" - MKINSTALLDIRS = $(srcdir)/mkinstalldirs - -@@ -223,7 +223,7 @@ + CFLAGS += \ + -I$(srcdir)/libole2/ \ +@@ -237,7 +237,7 @@ wv-incconfig: Makefile - rm -f wv-incconfig + $(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 @@ +@@ -325,10 +325,11 @@ $(mandir) \ $(mandir)/man1 \ $(libdir) \ @@ -36,17 +36,18 @@ $NetBSD: patch-aa,v 1.2 2000/08/05 02:39:19 jlam Exp $ $(includedir) -@@ -313,13 +314,16 @@ - $(INSTALL_DATA) $(srcdir)/wvHtml.1 $(mandir)/man1/ +@@ -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)/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 ++ $(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; \ diff --git a/converters/wv/patches/patch-ab b/converters/wv/patches/patch-ab index c4f7696288c..a6eb6f08ab0 100644 --- a/converters/wv/patches/patch-ab +++ b/converters/wv/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.2 2000/08/05 02:39:19 jlam Exp $ +$NetBSD: patch-ab,v 1.3 2000/10/16 15:14:23 rh Exp $ ---- configure.in.orig Thu Dec 16 10:35:16 1999 -+++ configure.in Fri Aug 4 21:37:12 2000 -@@ -305,7 +305,7 @@ +--- configure.orig Tue Sep 19 21:38:01 2000 ++++ configure +@@ -3567,7 +3567,7 @@ _SAVE_LDFLAGS=$LDFLAGS if test "$TTF_DIR" != "" ; then @@ -11,18 +11,28 @@ $NetBSD: patch-ab,v 1.2 2000/08/05 02:39:19 jlam Exp $ LDFLAGS="-L${TTF_DIR}/lib $LDFLAGS" fi -@@ -319,20 +319,21 @@ - AC_MSG_RESULT("$result") +@@ -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 <&6 +- TTF_LIBS="-lttf" ++ TTF_LIBS="-lttf -lintl" else - no_ttf=yes + 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 + 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}" @@ -37,27 +47,36 @@ $NetBSD: patch-ab,v 1.2 2000/08/05 02:39:19 jlam Exp $ 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 +@@ -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 <&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 + 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}" ++ TTF_LIBS="-L${TTF_DIR}/lib ${TTF_LIBS}" fi fi -@@ -374,7 +376,7 @@ +@@ -3747,7 +3747,7 @@ _SAVE_LIBS=$LIBS if test "$WMF_DIR" != "" ; then @@ -66,26 +85,37 @@ $NetBSD: patch-ab,v 1.2 2000/08/05 02:39:19 jlam Exp $ LDFLAGS="-L${WMF_DIR}/lib $LDFLAGS" fi -@@ -397,13 +399,13 @@ +@@ -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 + 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 @@ +@@ -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 <&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-ad b/converters/wv/patches/patch-ad new file mode 100644 index 00000000000..c002ef4d90a --- /dev/null +++ b/converters/wv/patches/patch-ad @@ -0,0 +1,16 @@ +$NetBSD: patch-ad,v 1.1 2000/10/16 15:14:23 rh Exp $ + +--- wv.h.orig Mon Oct 16 15:35:58 2000 ++++ wv.h +@@ -109,7 +109,11 @@ + S32 y; + }POINT; + #else ++#define read_32ubit wmf_read_32ubit ++#define read_16ubit wmf_read_16ubit + # include ++#undef read_32ubit ++#undef read_16ubit + #endif + + diff --git a/converters/wv/patches/patch-ae b/converters/wv/patches/patch-ae new file mode 100644 index 00000000000..28614649e04 --- /dev/null +++ b/converters/wv/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.1 2000/10/16 15:14:23 rh Exp $ + +--- iconv/Makefile.in.orig Mon Oct 16 16:42:29 2000 ++++ iconv/Makefile.in +@@ -21,7 +21,7 @@ + + CFLAGS = @CFLAGS@ @DEFS@ -I$(srcdir)/ -I$(srcdir)/../ + +-CFLAGS += \ ++CFLAGS += ${CPPFLAGS} \ + -I$(srcdir)/../libole2/ \ + -I$(srcdir)/../glib-wv/ + diff --git a/converters/wv/pkg/PLIST b/converters/wv/pkg/PLIST index d2ff8ea4e3b..00d85b253bb 100644 --- a/converters/wv/pkg/PLIST +++ b/converters/wv/pkg/PLIST @@ -1,22 +1,39 @@ -@comment $NetBSD: PLIST,v 1.2 2000/08/05 02:39:19 jlam Exp $ +@comment $NetBSD: PLIST,v 1.3 2000/10/16 15:14:23 rh Exp $ bin/wv-incconfig bin/wv-libconfig +bin/wvCleanLatex bin/wvConvert +bin/wvDVI bin/wvHtml +bin/wvLatex +bin/wvMime +bin/wvPDF +bin/wvPS bin/wvSimpleCLX bin/wvSummary bin/wvText bin/wvVersion +bin/wvWare include/wv.h lib/libwv.a +man/man1/wvCleanLatex.1 +man/man1/wvConvert.1 +man/man1/wvDVI.1 man/man1/wvHtml.1 +man/man1/wvLatex.1 +man/man1/wvMime.1 +man/man1/wvPDF.1 +man/man1/wvPS.1 +man/man1/wvSummary.1 +man/man1/wvText.1 +man/man1/wvVersion.1 +man/man1/wvWare.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 @@ -456,10 +473,10 @@ share/wv/wingdingfont/96.gif share/wv/wingdingfont/97.gif share/wv/wingdingfont/98.gif share/wv/wingdingfont/99.gif +share/wv/wvCleanLaTeX.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 -- cgit v1.2.3