diff options
author | adam <adam> | 2006-01-18 22:13:59 +0000 |
---|---|---|
committer | adam <adam> | 2006-01-18 22:13:59 +0000 |
commit | bc037151b2a4b77e8184b14d4625f52cee951311 (patch) | |
tree | a02a657f09c7f63cfe19dde94e4d2ed1595b64c2 | |
parent | fa198ec683feb137033a46165cdf1affb3a25d25 (diff) | |
download | pkgsrc-bc037151b2a4b77e8184b14d4625f52cee951311.tar.gz |
Changes 1.2.0:
* Bug fixes
-rw-r--r-- | converters/wv/Makefile | 25 | ||||
-rw-r--r-- | converters/wv/PLIST | 5 | ||||
-rw-r--r-- | converters/wv/buildlink3.mk | 4 | ||||
-rw-r--r-- | converters/wv/distinfo | 9 | ||||
-rw-r--r-- | converters/wv/patches/patch-aa | 42 |
5 files changed, 17 insertions, 68 deletions
diff --git a/converters/wv/Makefile b/converters/wv/Makefile index 045b1764abb..d5a8eb3e429 100644 --- a/converters/wv/Makefile +++ b/converters/wv/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.49 2005/10/24 11:36:38 tonio Exp $ +# $NetBSD: Makefile,v 1.50 2006/01/18 22:13:59 adam Exp $ -DISTNAME= wv-1.0.3 -PKGREVISION= 3 +DISTNAME= wv-1.2.0 CATEGORIES= converters MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wvware/} @@ -9,29 +8,25 @@ MAINTAINER= adam@NetBSD.org HOMEPAGE= http://wvware.sourceforge.net/ COMMENT= Library and executables to access Microsoft Word files -USE_TOOLS+= gmake pkg-config -USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes +USE_PKGLOCALEDIR= yes +USE_TOOLS+= gmake pkg-config GNU_CONFIGURE= yes - -PKGCONFIG_OVERRIDE+= wv-1.0.pc.in - -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} +PKGCONFIG_OVERRIDE+= wv-1.0.pc.in + +MAKEFILE= GNUmakefile + .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/zlib/buildlink3.mk" +.include "../../devel/libgsf/buildlink3.mk" .include "../../graphics/libwmf/buildlink3.mk" -.include "../../graphics/png/buildlink3.mk" -.include "../../textproc/libxml2/buildlink3.mk" -.include "../../textproc/expat/buildlink3.mk" -.include "../../mk/x11.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/converters/wv/PLIST b/converters/wv/PLIST index f4a3be805fb..f1fa07d19d3 100644 --- a/converters/wv/PLIST +++ b/converters/wv/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2004/09/22 08:09:21 jlam Exp $ +@comment $NetBSD: PLIST,v 1.9 2006/01/18 22:13:59 adam Exp $ bin/wvAbw bin/wvCleanLatex bin/wvConvert @@ -15,8 +15,6 @@ bin/wvText bin/wvVersion bin/wvWare bin/wvWml -include/wv/libole2/ms-ole-summary.h -include/wv/libole2/ms-ole.h include/wv/wv.h lib/libwv.la lib/pkgconfig/wv-1.0.pc @@ -485,5 +483,4 @@ 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/buildlink3.mk b/converters/wv/buildlink3.mk index 8e156172995..fa53206ea34 100644 --- a/converters/wv/buildlink3.mk +++ b/converters/wv/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2004/12/25 06:43:38 reed Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2006/01/18 22:13:59 adam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ WV_BUILDLINK3_MK:= ${WV_BUILDLINK3_MK}+ @@ -24,4 +24,4 @@ BUILDLINK_PKGSRCDIR.wv?= ../../converters/wv .include "../../graphics/png/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/converters/wv/distinfo b/converters/wv/distinfo index b64e9746c47..59ceddc4d08 100644 --- a/converters/wv/distinfo +++ b/converters/wv/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.13 2005/10/24 11:36:38 tonio Exp $ +$NetBSD: distinfo,v 1.14 2006/01/18 22:13:59 adam Exp $ -SHA1 (wv-1.0.3.tar.gz) = dea20c457d8b9f66fb4006672913b5f7852cc77f -RMD160 (wv-1.0.3.tar.gz) = 0076da017b65f89032d0648292c7e3e4058c9d70 -Size (wv-1.0.3.tar.gz) = 857412 bytes -SHA1 (patch-aa) = 47e41aa335d4c66fb1f5111b746599b31b9c8fc1 +SHA1 (wv-1.2.0.tar.gz) = c696685fdc1434e300fc9baad5f9f048e94971a7 +RMD160 (wv-1.2.0.tar.gz) = 9658ab78813d2f49cbee5a0909f058956406c12e +Size (wv-1.2.0.tar.gz) = 627912 bytes diff --git a/converters/wv/patches/patch-aa b/converters/wv/patches/patch-aa deleted file mode 100644 index 35c3317bacd..00000000000 --- a/converters/wv/patches/patch-aa +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2005/10/24 11:36:38 tonio Exp $ - ---- wvConfig.c.orig 2002-07-14 15:20:07.000000000 +0200 -+++ wvConfig.c -@@ -2130,7 +2130,7 @@ exstartElement (void *userData, const ch - } - - static void --startElement (void *userData, const XML_Char *name, const XML_Char **atts) -+wvstartElement (void *userData, const XML_Char *name, const XML_Char **atts) - { - unsigned int nAtts = 0; - const XML_Char **p; -@@ -3094,7 +3094,7 @@ startElement (void *userData, const XML_ - } - - static void --endElement (void *userData, const XML_Char *name) -+wvendElement (void *userData, const XML_Char *name) - { - state_data *mydata = (state_data *) userData; - unsigned int token_type; -@@ -3470,8 +3470,8 @@ wvParseConfig (state_data * myhandle) - memset(&hdl, 0, sizeof(hdl)); - - hdl.getEntity = _getEntity; -- hdl.startElement = startElement; -- hdl.endElement = endElement; -+ hdl.startElement = wvstartElement; -+ hdl.endElement = wvendElement; - hdl.characters = charData; - - if (myhandle->fp) -@@ -3514,7 +3514,7 @@ wvParseConfig (state_data * myhandle) - size_t len; - - XML_SetUserData (parser, myhandle); -- XML_SetElementHandler (parser, startElement, endElement); -+ XML_SetElementHandler (parser, wvstartElement, wvendElement); - XML_SetCharacterDataHandler (parser, charData); - - if (myhandle->fp == NULL) |