Update to 0.10.0:

0.9.9 - 0.10.0
- Switch to librevenge
- Miscellaneous fixes and cleanups

4 files changed, 16 insertions, 24 deletions

diff --git a/converters/libwpd/Makefile b/converters/libwpd/Makefile
index 99d9055ba00..40c4b469c1a 100644
--- a/converters/libwpd/Makefile
+++ b/converters/libwpd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2014/05/13 18:54:01 ryoon Exp $
+# $NetBSD: Makefile,v 1.32 2014/07/22 10:52:24 wiz Exp $
 
-DISTNAME=	libwpd-0.9.9
+DISTNAME=	libwpd-0.10.0
 CATEGORIES=	converters
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libwpd/}
 EXTRACT_SUFX=	.tar.bz2
@@ -15,7 +15,7 @@ USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-docs
-PKGCONFIG_OVERRIDE+=	libwpd-0.9.pc.in libwpd-stream-0.9.pc.in
+PKGCONFIG_OVERRIDE+=	libwpd.pc.in
 
 .include "../../mk/compiler.mk"
 
@@ -24,4 +24,5 @@ _WRAP_EXTRA_ARGS.CXX+=	-Wno-unused-private-field
 .endif
 
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../converters/librevenge/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/libwpd/PLIST b/converters/libwpd/PLIST
index c8b0f882b61..1f008cb68be 100644
--- a/converters/libwpd/PLIST
+++ b/converters/libwpd/PLIST
@@ -1,19 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2010/11/25 10:27:49 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2014/07/22 10:52:24 wiz Exp $
 bin/wpd2html
 bin/wpd2raw
 bin/wpd2text
-include/libwpd-0.9/libwpd-stream/WPXStream.h
-include/libwpd-0.9/libwpd-stream/WPXStreamImplementation.h
-include/libwpd-0.9/libwpd-stream/libwpd-stream.h
-include/libwpd-0.9/libwpd/WPDocument.h
-include/libwpd-0.9/libwpd/WPXBinaryData.h
-include/libwpd-0.9/libwpd/WPXDocumentInterface.h
-include/libwpd-0.9/libwpd/WPXProperty.h
-include/libwpd-0.9/libwpd/WPXPropertyList.h
-include/libwpd-0.9/libwpd/WPXPropertyListVector.h
-include/libwpd-0.9/libwpd/WPXString.h
-include/libwpd-0.9/libwpd/libwpd.h
-lib/libwpd-0.9.la
-lib/libwpd-stream-0.9.la
-lib/pkgconfig/libwpd-0.9.pc
-lib/pkgconfig/libwpd-stream-0.9.pc
+include/libwpd-0.10/libwpd/WPDocument.h
+include/libwpd-0.10/libwpd/libwpd.h
+lib/libwpd-0.10.la
+lib/pkgconfig/libwpd-0.10.pc
diff --git a/converters/libwpd/buildlink3.mk b/converters/libwpd/buildlink3.mk
index 77a82417820..c38319e2753 100644
--- a/converters/libwpd/buildlink3.mk
+++ b/converters/libwpd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2013/08/24 21:50:24 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2014/07/22 10:52:24 wiz Exp $
 
 BUILDLINK_TREE+=	libwpd
 
@@ -6,8 +6,10 @@ BUILDLINK_TREE+=	libwpd
 LIBWPD_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libwpd+=	libwpd>=0.9.5
+BUILDLINK_ABI_DEPENDS.libwpd+=	libwpd>=0.10.0nb1
 BUILDLINK_PKGSRCDIR.libwpd?=	../../converters/libwpd
 
+.include "../../converters/librevenge/buildlink3.mk"
 .endif # LIBWPD_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libwpd
diff --git a/converters/libwpd/distinfo b/converters/libwpd/distinfo
index ef5ba4f5063..85c969ee1ee 100644
--- a/converters/libwpd/distinfo
+++ b/converters/libwpd/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2013/08/24 21:50:24 jaapb Exp $
+$NetBSD: distinfo,v 1.12 2014/07/22 10:52:24 wiz Exp $
 
-SHA1 (libwpd-0.9.9.tar.bz2) = 74d13c4e5137edc78660059257671b5a1f40224d
-RMD160 (libwpd-0.9.9.tar.bz2) = 5223e000a668ce021849eba6c7f5ba34cbf9da54
-Size (libwpd-0.9.9.tar.bz2) = 684918 bytes
+SHA1 (libwpd-0.10.0.tar.bz2) = bbcc6e528a69492fb2b4bbb9a56d385a29efc4c4
+RMD160 (libwpd-0.10.0.tar.bz2) = 01a4e102acacc10e60387651861d005d1212c740
+Size (libwpd-0.10.0.tar.bz2) = 632272 bytes