Changes 1.2.9:

* Restore binary compatibility again, 1.2.8 broke it

Changes 1.2.8:
* Fix bug 10025: Segfault trying to parse certain word documents
* Fix bug 12746: Tables not imported from MS Word documents
* Fix Bug 11433 wvWare hangs on this seemingly blank word doc
* Buildfix: Remove unused LINK_WIN32_DLL check
* Buildfix: link with -no-undefined

Changes 1.2.7:
* Bug 12353: Regression: newlines not imported anymore
* Cross building improvements
* Fix build issue: 'libtool: link: `-::-' is not valid version information'
* Bug 12353: configure.ac in 1.2.6 release says 1.2.5

Changes 1.2.6:
Important:
 * Restore the soversion major to the value of 1.2.4 because ABI didn't change.
Fixes:
* Bug 11547: unportable test construct.
* Fix typos in wvWare's help message.
* Fix a few mis-matched wvMalloc/malloc/wvFree/free combinations. Use glib to
  allocate and free all of our memory.
* Bug 9355: a NULL pointer was causing a crash.
* Bug 9705: Default font alignment in paragraph was incorrect.
* Bug 10125: Crash in the PAP handling.
* Fix a memory leak in wvRTF.
* Bug 12034: Fix a huge performance issue while loading images.
* Fix invalid writes in wvConfig.c

4 files changed, 11 insertions, 35 deletions

diff --git a/converters/wv/Makefile b/converters/wv/Makefile
index c9ec05cdcb5..7c1827d0670 100644
--- a/converters/wv/Makefile
+++ b/converters/wv/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.67 2010/06/13 22:44:00 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2010/11/11 20:54:39 adam Exp $
 
-DISTNAME=	wv-1.2.5
-PKGREVISION=	3
+DISTNAME=	wv-1.2.9
 CATEGORIES=	converters
-MASTER_SITES=	http://www.abiword.com/downloads/wv/1.2.5/
+MASTER_SITES=	http://www.abiword.com/downloads/wv/${PKGVERSION_NOREV}/
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://wvware.sourceforge.net/
@@ -15,11 +14,11 @@ USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-libwmf=${BUILDLINK_PREFIX.libwmf}
 CONFIGURE_ARGS+=	--with-libiconv=${BUILDLINK_PREFIX.libiconv}
+CONFIGURE_ARGS+=	--with-libwmf=${BUILDLINK_PREFIX.libwmf}
 CONFIGURE_ARGS+=	--with-libxml2=${BUILDLINK_PREFIX.libxml2}
-CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
 CONFIGURE_ARGS+=	--with-png=${BUILDLINK_PREFIX.png}
+CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
 
 PKGCONFIG_OVERRIDE+=	wv-1.0.pc.in
 
diff --git a/converters/wv/buildlink3.mk b/converters/wv/buildlink3.mk
index 53efe39809f..c0aaf63719a 100644
--- a/converters/wv/buildlink3.mk
+++ b/converters/wv/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.21 2010/06/13 22:44:00 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2010/11/11 20:54:39 adam Exp $
 
 BUILDLINK_TREE+=	wv
 
 .if !defined(WV_BUILDLINK3_MK)
 WV_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.wv+=		wv>=1.0.0
+BUILDLINK_API_DEPENDS.wv+=	wv>=1.0.0
 BUILDLINK_ABI_DEPENDS.wv+=	wv>=1.2.5nb3
 BUILDLINK_PKGSRCDIR.wv?=	../../converters/wv
 
diff --git a/converters/wv/distinfo b/converters/wv/distinfo
index 0da6f8e85f1..53c3e2a7344 100644
--- a/converters/wv/distinfo
+++ b/converters/wv/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.17 2008/04/14 23:49:43 wiz Exp $
+$NetBSD: distinfo,v 1.18 2010/11/11 20:54:39 adam Exp $
 
-SHA1 (wv-1.2.5.tar.gz) = a196a31ca1c4083436d9414b9bf4809c0fd7c33c
-RMD160 (wv-1.2.5.tar.gz) = 979cd6cadcc189046e9d01da8bfc1f487d006415
-Size (wv-1.2.5.tar.gz) = 653231 bytes
-SHA1 (patch-aa) = 5e87ee08506adb2a7ea9bc19f8fce592ce5978ce
+SHA1 (wv-1.2.9.tar.gz) = db4717a151742dbdb492318f104504a92075543a
+RMD160 (wv-1.2.9.tar.gz) = c1299c4bb43034d5df244f2452753eafab496857
+Size (wv-1.2.9.tar.gz) = 616256 bytes
diff --git a/converters/wv/patches/patch-aa b/converters/wv/patches/patch-aa
deleted file mode 100644
index 007c52c71e7..00000000000
--- a/converters/wv/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2008/04/14 23:49:43 wiz Exp $
-
---- configure.orig	2008-04-14 23:43:17.000000000 +0000
-+++ configure
-@@ -20236,7 +20236,7 @@ case ${target_os} in
-     link_win32_dll="no"
-     ;;
- esac
--if test "$cross_compiling" == "yes"; then
-+if test "$cross_compiling" = "yes"; then
-   dllwrap="dllwrap"
- else
-   dllwrap=${target}-"dllwrap"
-@@ -20283,7 +20283,7 @@ fi
- 
- 
- 
--if test "$link_win32_dll" == "yes"; then
-+if test "$link_win32_dll" = "yes"; then
-   LINK_WIN32_DLL_TRUE=
-   LINK_WIN32_DLL_FALSE='#'
- else