diff options
author | xtraeme <xtraeme@pkgsrc.org> | 2003-12-13 23:45:12 +0000 |
---|---|---|
committer | xtraeme <xtraeme@pkgsrc.org> | 2003-12-13 23:45:12 +0000 |
commit | 652ef3e9ff118ca0244aa706674a428a0293eb8f (patch) | |
tree | 936325695f00c95cfb5387a783f01d0bae8ff667 | |
parent | e4aa31db39009e40278e4bc3cee458046ee03639 (diff) | |
download | pkgsrc-652ef3e9ff118ca0244aa706674a428a0293eb8f.tar.gz |
Updated to 1.0.0, Changelog unavailable.
Also update DESCR with reality.
-rw-r--r-- | converters/wv/DESCR | 11 | ||||
-rw-r--r-- | converters/wv/Makefile | 42 | ||||
-rw-r--r-- | converters/wv/PLIST | 20 | ||||
-rw-r--r-- | converters/wv/buildlink2.mk | 29 | ||||
-rw-r--r-- | converters/wv/distinfo | 7 | ||||
-rw-r--r-- | converters/wv/patches/patch-ad | 22 |
6 files changed, 68 insertions, 63 deletions
diff --git a/converters/wv/DESCR b/converters/wv/DESCR index ff662fc18e4..59746aa2067 100644 --- a/converters/wv/DESCR +++ b/converters/wv/DESCR @@ -1,5 +1,8 @@ -wv is a collection of programs that understand the Microsoft Word 6, -7, and 8 binary file formats (Office 95/97/2000), display information -about them and can convert them to HTML or LaTeX. +wv is a library which allows access to Microsoft Word files. +It can load and parse the Word 6-9 formats (Word 6, 95, 97, 2000). -It also supports reading encrypted Word documents. +And several converter executables called wvWare are also provided: + wvHtml, wvLatex, wvCleanLatex, wvDVI, wvPS, wvPDF, + wvText, wvAbw, wvWml, wvMime + +note: wvHtml is previously known as MSWordView. diff --git a/converters/wv/Makefile b/converters/wv/Makefile index bdb66022f34..00aaf2a0cac 100644 --- a/converters/wv/Makefile +++ b/converters/wv/Makefile @@ -1,32 +1,38 @@ -# $NetBSD: Makefile,v 1.31 2003/12/04 19:48:24 xtraeme Exp $ +# $NetBSD: Makefile,v 1.32 2003/12/13 23:45:12 xtraeme Exp $ # -DISTNAME= wv-0.7.6 -PKGREVISION= 2 -CATEGORIES= converters -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wvware/} +DISTNAME= wv-1.0.0 +CATEGORIES= converters +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wvware/} -MAINTAINER= adam@NetBSD.org -HOMEPAGE= http://wvware.sourceforge.net/ -COMMENT= Microsoft Word doc to HTML/LaTeX converter +MAINTAINER= adam@NetBSD.org +HOMEPAGE= http://wvware.sourceforge.net/ +COMMENT= Library and executables to access Microsoft Word files -# not detected by configure, causes conflicts with the one coming with wv -#CONFLICTS+= libgetopt-[0-9]* +USE_BUILDLINK2= yes +USE_GMAKE= yes +USE_PKGLOCALEDIR= yes +USE_LIBTOOL= yes +USE_X11= yes +GNU_CONFIGURE= yes + +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +PKGCONFIG_OVERRIDE+= ${WRKSRC}/wv-1.0.pc.in -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} +CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.libiconv} CONFIGURE_ARGS+= --with-libxml2=${BUILDLINK_PREFIX.libxml2} +CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} +CONFIGURE_ARGS+= --with-png=${BUILDLINK_PREFIX.png} .include "../../converters/libiconv/buildlink2.mk" -.include "../../devel/glib/buildlink2.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../devel/glib2/buildlink2.mk" +.include "../../devel/pkgconfig/buildlink2.mk" .include "../../devel/zlib/buildlink2.mk" .include "../../graphics/libwmf/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" .include "../../textproc/libxml2/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/converters/wv/PLIST b/converters/wv/PLIST index 08825d67e8d..ef42f23e559 100644 --- a/converters/wv/PLIST +++ b/converters/wv/PLIST @@ -1,10 +1,9 @@ -@comment $NetBSD: PLIST,v 1.4 2003/09/03 13:21:37 adam Exp $ -bin/libwv-config +@comment $NetBSD: PLIST,v 1.5 2003/12/13 23:45:12 xtraeme Exp $ bin/wvAbw bin/wvCleanLatex bin/wvConvert -bin/wvDocBook bin/wvDVI +bin/wvDocBook bin/wvHtml bin/wvLatex bin/wvMime @@ -16,13 +15,16 @@ bin/wvText bin/wvVersion bin/wvWare bin/wvWml -include/wv.h -lib/libwv.so -lib/libwv-0.7.so -lib/libwv-0.7.so.6 -lib/libwv-0.7.so.6.0 +include/wv/libole2/ms-ole-summary.h +include/wv/libole2/ms-ole.h +include/wv/wv.h +lib/libwv-1.0.so +lib/libwv-1.0.so.0 +lib/libwv-1.0.so.0.0 lib/libwv.a lib/libwv.la +lib/libwv.so +lib/pkgconfig/wv-1.0.pc man/man1/wvAbw.1 man/man1/wvCleanLatex.1 man/man1/wvDVI.1 @@ -488,3 +490,5 @@ share/wv/wvXml.xml @dirrm share/wv/wingdingfont @dirrm share/wv/patterns @dirrm share/wv +@dirrm include/wv/libole2 +@dirrm include/wv diff --git a/converters/wv/buildlink2.mk b/converters/wv/buildlink2.mk index a67f6d33667..55194ea2017 100644 --- a/converters/wv/buildlink2.mk +++ b/converters/wv/buildlink2.mk @@ -1,18 +1,33 @@ -# $NetBSD: buildlink2.mk,v 1.7 2003/07/13 13:50:54 wiz Exp $ +# $NetBSD: buildlink2.mk,v 1.8 2003/12/13 23:45:12 xtraeme Exp $ +# +# This Makefile fragment is included by packages that use wv. +# +# This file was created automatically using createbuildlink 2.8. +# .if !defined(WV_BUILDLINK2_MK) WV_BUILDLINK2_MK= # defined -BUILDLINK_PACKAGES+= wv -BUILDLINK_DEPENDS.wv?= wv>=0.7.4nb3 -BUILDLINK_PKGSRCDIR.wv?= ../../converters/wv +BUILDLINK_PACKAGES+= wv +BUILDLINK_DEPENDS.wv?= wv>=1.0.0 +BUILDLINK_PKGSRCDIR.wv?= ../../converters/wv -EVAL_PREFIX+= BUILDLINK_PREFIX.wv=wv +EVAL_PREFIX+= BUILDLINK_PREFIX.wv=wv BUILDLINK_PREFIX.wv_DEFAULT= ${LOCALBASE} - -BUILDLINK_FILES.wv= include/wv.h +BUILDLINK_FILES.wv+= include/wv/libole2/ms-ole-summary.h +BUILDLINK_FILES.wv+= include/wv/libole2/ms-ole.h +BUILDLINK_FILES.wv+= include/wv/wv.h +BUILDLINK_FILES.wv+= lib/libwv-1.0.* BUILDLINK_FILES.wv+= lib/libwv.* +.include "../../converters/libiconv/buildlink2.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../devel/glib2/buildlink2.mk" +.include "../../devel/zlib/buildlink2.mk" +.include "../../graphics/libwmf/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../textproc/libxml2/buildlink2.mk" + BUILDLINK_TARGETS+= wv-buildlink wv-buildlink: _BUILDLINK_USE diff --git a/converters/wv/distinfo b/converters/wv/distinfo index 799d97d0a6c..65d3a3cd46b 100644 --- a/converters/wv/distinfo +++ b/converters/wv/distinfo @@ -1,5 +1,4 @@ -$NetBSD: distinfo,v 1.8 2003/09/03 13:21:38 adam Exp $ +$NetBSD: distinfo,v 1.9 2003/12/13 23:45:12 xtraeme Exp $ -SHA1 (wv-0.7.6.tar.gz) = ac76e1ee1a2a6fbb33ba882fc29b24cf96e7be33 -Size (wv-0.7.6.tar.gz) = 723355 bytes -SHA1 (patch-ad) = 52e5879b535710baf8069705465daac572afb641 +SHA1 (wv-1.0.0.tar.gz) = a260c667f1d42dbeeade5c0e25d3ffce92a090db +Size (wv-1.0.0.tar.gz) = 726428 bytes diff --git a/converters/wv/patches/patch-ad b/converters/wv/patches/patch-ad deleted file mode 100644 index 885e85e30f7..00000000000 --- a/converters/wv/patches/patch-ad +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ad,v 1.4 2003/09/03 13:21:38 adam Exp $ - ---- wv.h.orig 2003-05-13 00:48:59.000000000 +0200 -+++ wv.h -@@ -51,7 +51,7 @@ extern "C" { - #endif - - #ifndef S32 --#define S32 int -+#define S32 signed int - #endif - - #ifndef U16 -@@ -67,7 +67,7 @@ extern "C" { - #endif - - #ifndef S8 --#define S8 char -+#define S8 signed char - #endif - - |