- Update graphics/libwpg to 0.2.0 release

- Update textproc/libwpd to 0.9.0 release
- Add graphics/libwpg01 and textproc/libwpd08 as support libraries only
- Take maintainership of textproc/libwpd[08]	[1]
- Chase dependencies in related ports
- Describe updating procedure in UPDATING

Approved by:	Mikhail Teterin (maintainer) via mail [1]

8 files changed, 41 insertions, 36 deletions

diff --git a/textproc/Makefile b/textproc/Makefile
index 2520de312d8a..0b260805c909 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -333,6 +333,7 @@
     SUBDIR += libuninameslist
     SUBDIR += libupskirt
     SUBDIR += libwpd
+    SUBDIR += libwpd08
     SUBDIR += libwps
     SUBDIR += libxdiff
     SUBDIR += libxml
diff --git a/textproc/libwpd/Makefile b/textproc/libwpd/Makefile
index 63888f5e6434..ed7f95d7c25f 100644
--- a/textproc/libwpd/Makefile
+++ b/textproc/libwpd/Makefile
@@ -6,19 +6,20 @@
 #
 
 PORTNAME=	libwpd
-PORTVERSION=	0.8.14
-PORTREVISION=	3
+PORTVERSION=	0.9.0
 CATEGORIES=	textproc
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	mi@aldan.algebra.com
+MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	Tools for importing and exporting WordPerfect(tm) documents
 
+LICENSE=	LGPL21
+
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack libgsf
 USE_LDCONFIG=	yes
-ALL_TARGET=	-j`${SYSCTL} -n hw.ncpu`
+MAKE_JOBS_SAFE=	yes
 
 CONFIGURE_ARGS+=--without-docs
 
diff --git a/textproc/libwpd/distinfo b/textproc/libwpd/distinfo
index c00603c0c6f8..0053c383c4a5 100644
--- a/textproc/libwpd/distinfo
+++ b/textproc/libwpd/distinfo
@@ -1,3 +1,2 @@
-MD5 (libwpd-0.8.14.tar.bz2) = 974784f0cf067900bb8836b4d107101b
-SHA256 (libwpd-0.8.14.tar.bz2) = e4aca91b90d6faf9b01fbc4695074ac43f236eb39aee6f8bd993e1c241149901
-SIZE (libwpd-0.8.14.tar.bz2) = 424176
+SHA256 (libwpd-0.9.0.tar.bz2) = dac08ed61af43ad8a0183791f013c8b1ffcdbf77b9d3f50ffb7f2367df635c57
+SIZE (libwpd-0.9.0.tar.bz2) = 539759
diff --git a/textproc/libwpd/pkg-plist b/textproc/libwpd/pkg-plist
index 9d2c94f6784c..cc9adf5445de 100644
--- a/textproc/libwpd/pkg-plist
+++ b/textproc/libwpd/pkg-plist
@@ -1,24 +1,25 @@
 bin/wpd2html
 bin/wpd2raw
 bin/wpd2text
-include/libwpd-0.8/libwpd/GSFStream.h
-include/libwpd-0.8/libwpd/WPDocument.h
-include/libwpd-0.8/libwpd/WPXHLListenerImpl.h
-include/libwpd-0.8/libwpd/WPXProperty.h
-include/libwpd-0.8/libwpd/WPXPropertyList.h
-include/libwpd-0.8/libwpd/WPXPropertyListVector.h
-include/libwpd-0.8/libwpd/WPXStream.h
-include/libwpd-0.8/libwpd/WPXStreamImplementation.h
-include/libwpd-0.8/libwpd/WPXString.h
-include/libwpd-0.8/libwpd/libwpd.h
-include/libwpd-0.8/libwpd/libwpd_types.h
-lib/libwpd-0.8.la
-lib/libwpd-0.8.so
-lib/libwpd-0.8.so.8
-lib/libwpd-stream-0.8.la
-lib/libwpd-stream-0.8.so
-lib/libwpd-stream-0.8.so.8
-libdata/pkgconfig/libwpd-0.8.pc
-libdata/pkgconfig/libwpd-stream-0.8.pc
-@dirrm include/libwpd-0.8/libwpd
-@dirrm include/libwpd-0.8
+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
+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
+lib/libwpd-0.9.la
+lib/libwpd-0.9.so
+lib/libwpd-0.9.so.9
+lib/libwpd-stream-0.9.la
+lib/libwpd-stream-0.9.so
+lib/libwpd-stream-0.9.so.9
+libdata/pkgconfig/libwpd-0.9.pc
+libdata/pkgconfig/libwpd-stream-0.9.pc
+@dirrm include/libwpd-0.9/libwpd-stream
+@dirrm include/libwpd-0.9/libwpd
+@dirrm include/libwpd-0.9
diff --git a/textproc/libwpd08/Makefile b/textproc/libwpd08/Makefile
index 63888f5e6434..efd093ab9b08 100644
--- a/textproc/libwpd08/Makefile
+++ b/textproc/libwpd08/Makefile
@@ -11,15 +11,22 @@ PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	mi@aldan.algebra.com
+MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	Tools for importing and exporting WordPerfect(tm) documents
 
+LATEST_LINK=	${PORTNAME}08
+
+LICENSE=	LGPL21
+
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack libgsf
 USE_LDCONFIG=	yes
-ALL_TARGET=	-j`${SYSCTL} -n hw.ncpu`
+MAKE_JOBS_SAFE=	yes
 
 CONFIGURE_ARGS+=--without-docs
 
+post-patch:
+	@${REINPLACE_CMD} -E '/^SUBDIRS = /s/conv//g' ${WRKSRC}/src/Makefile.in
+
 .include <bsd.port.mk>
diff --git a/textproc/libwpd08/distinfo b/textproc/libwpd08/distinfo
index c00603c0c6f8..4234af36db2a 100644
--- a/textproc/libwpd08/distinfo
+++ b/textproc/libwpd08/distinfo
@@ -1,3 +1,2 @@
-MD5 (libwpd-0.8.14.tar.bz2) = 974784f0cf067900bb8836b4d107101b
 SHA256 (libwpd-0.8.14.tar.bz2) = e4aca91b90d6faf9b01fbc4695074ac43f236eb39aee6f8bd993e1c241149901
 SIZE (libwpd-0.8.14.tar.bz2) = 424176
diff --git a/textproc/libwpd08/pkg-plist b/textproc/libwpd08/pkg-plist
index 9d2c94f6784c..0595d95954a5 100644
--- a/textproc/libwpd08/pkg-plist
+++ b/textproc/libwpd08/pkg-plist
@@ -1,6 +1,3 @@
-bin/wpd2html
-bin/wpd2raw
-bin/wpd2text
 include/libwpd-0.8/libwpd/GSFStream.h
 include/libwpd-0.8/libwpd/WPDocument.h
 include/libwpd-0.8/libwpd/WPXHLListenerImpl.h
diff --git a/textproc/libwps/Makefile b/textproc/libwps/Makefile
index 1864d1c7170b..3a4ad500dafa 100644
--- a/textproc/libwps/Makefile
+++ b/textproc/libwps/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	libwps
 PORTVERSION=	0.1.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Microsoft file word processor format import filter library
 
-LIB_DEPENDS=	wpd-0.8.8:${PORTSDIR}/textproc/libwpd
+LIB_DEPENDS=	wpd-0.8.8:${PORTSDIR}/textproc/libwpd08
 
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomeprefix gnomehack ltverhack