- 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]

20 files changed, 98 insertions, 469 deletions

diff --git a/UPDATING b/UPDATING
index 18c90d53f0f2..eae2b3f6d739 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,21 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20110103:
+  AFFECTS: users of textproc/libwpd and graphics/libwpg
+  AUTHOR: fluffy@FreeBSD.org
+
+  LibWPD and LibWPG is now using new API, partially incompatible with
+  previous versions.
+  For correct upgrade procedure please upgrade LibWPD and LibWPG first
+  as described, than follow usual upgrade procedure
+
+  # portmaster -o textproc/libwpd08 libwpd
+  # portmaster -o graphics/libwpg01 libwpg
+
+  substitute 'portupgrade' for 'portmaster' accordingly if that's your
+  your upgrade tool of choice.
+
 20101230:
   AFFECTS: users of databases/postgresql??-(server|client)
   AUTHOR: ohauer@FreeBSD.org
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index 48368916c84f..a2c2d10dca01 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	koffice
 PORTVERSION=	${KOFFICE2_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}-${PORTVERSION}/
@@ -29,7 +29,7 @@ LIB_DEPENDS=	boost_thread.4:${PORTSDIR}/devel/boost-libs \
 		jpeg.11:${PORTSDIR}/graphics/jpeg \
 		kipi.7:${PORTSDIR}/graphics/kdegraphics4 \
 		lcms.1:${PORTSDIR}/graphics/lcms \
-		wpg-0.1:${PORTSDIR}/graphics/libwpg \
+		wpg-0.1:${PORTSDIR}/graphics/libwpg01 \
 		png.6:${PORTSDIR}/graphics/png \
 		poppler-qt4.3:${PORTSDIR}/graphics/poppler-qt4 \
 		tiff.4:${PORTSDIR}/graphics/tiff \
diff --git a/editors/koffice-kde3/Makefile b/editors/koffice-kde3/Makefile
index 0fb73d4068b4..adfb43e8e710 100644
--- a/editors/koffice-kde3/Makefile
+++ b/editors/koffice-kde3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	koffice
 PORTVERSION=	1.6.3
-PORTREVISION=	14
+PORTREVISION=	15
 PORTEPOCH=	2
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
@@ -27,7 +27,7 @@ LIB_DEPENDS=	GraphicsMagick++.1:${PORTSDIR}/graphics/GraphicsMagick \
 		lcms.1:${PORTSDIR}/graphics/lcms \
 		paper.2:${PORTSDIR}/print/libpaper \
 		poppler-qt.2:${PORTSDIR}/graphics/poppler-qt \
-		wpd-0.8.8:${PORTSDIR}/textproc/libwpd \
+		wpd-0.8.8:${PORTSDIR}/textproc/libwpd08 \
 		wv2.4:${PORTSDIR}/textproc/wv2
 RUN_DEPENDS=	${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx
 
diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile
index 48368916c84f..a2c2d10dca01 100644
--- a/editors/koffice-kde4/Makefile
+++ b/editors/koffice-kde4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	koffice
 PORTVERSION=	${KOFFICE2_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}-${PORTVERSION}/
@@ -29,7 +29,7 @@ LIB_DEPENDS=	boost_thread.4:${PORTSDIR}/devel/boost-libs \
 		jpeg.11:${PORTSDIR}/graphics/jpeg \
 		kipi.7:${PORTSDIR}/graphics/kdegraphics4 \
 		lcms.1:${PORTSDIR}/graphics/lcms \
-		wpg-0.1:${PORTSDIR}/graphics/libwpg \
+		wpg-0.1:${PORTSDIR}/graphics/libwpg01 \
 		png.6:${PORTSDIR}/graphics/png \
 		poppler-qt4.3:${PORTSDIR}/graphics/poppler-qt4 \
 		tiff.4:${PORTSDIR}/graphics/tiff \
diff --git a/graphics/Makefile b/graphics/Makefile
index df56cec59a65..a7102b0309db 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -492,6 +492,7 @@
     SUBDIR += libvisual04-plugins
     SUBDIR += libwmf
     SUBDIR += libwpg
+    SUBDIR += libwpg01
     SUBDIR += libx3dtk
     SUBDIR += lightspark-devel
     SUBDIR += linplasma
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 534e9910556a..f70bab13cfff 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	inkscape
 PORTVERSION=	0.48.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics gnome
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=${PORTNAME:L}/${PORTNAME:L}/0.48
@@ -22,7 +22,7 @@ LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
 		gsl.15:${PORTSDIR}/math/gsl \
 		gtkspell.0:${PORTSDIR}/textproc/gtkspell \
 		lcms.1:${PORTSDIR}/graphics/lcms \
-		wpg-0.1.1:${PORTSDIR}/graphics/libwpg \
+		wpg-0.1.1:${PORTSDIR}/graphics/libwpg01 \
 		Magick++.4:${PORTSDIR}/graphics/ImageMagick
 RUN_DEPENDS=	${SITE_PERL}/XML/XQL.pm:${PORTSDIR}/textproc/p5-XML-XQL
 
diff --git a/graphics/libwpg/Makefile b/graphics/libwpg/Makefile
index a59597b2b71b..e381072f9d2a 100644
--- a/graphics/libwpg/Makefile
+++ b/graphics/libwpg/Makefile
@@ -6,15 +6,16 @@
 #
 
 PORTNAME=	libwpg
-PORTVERSION=	0.1.3
-PORTREVISION=	5
+PORTVERSION=	0.2.0
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	Library for importing and converting Corel WordPerfect(tm) Graphics images
 
-LIB_DEPENDS=	wpd-0.8.8:${PORTSDIR}/textproc/libwpd
+LIB_DEPENDS=	wpd-0.9.9:${PORTSDIR}/textproc/libwpd
+
+LICENSE=	LGPL20
 
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomeprefix gnomehack ltverhack
diff --git a/graphics/libwpg/distinfo b/graphics/libwpg/distinfo
index 165edee8c1ac..890b6160bb14 100644
--- a/graphics/libwpg/distinfo
+++ b/graphics/libwpg/distinfo
@@ -1,3 +1,2 @@
-MD5 (libwpg-0.1.3.tar.gz) = db556b750bf3eac8481a4cc5e29e5af1
-SHA256 (libwpg-0.1.3.tar.gz) = 19a52f4eede1da890ac6a5dfa5f0d9a63a73a6dfc3f17cb3423563c53cc665e3
-SIZE (libwpg-0.1.3.tar.gz) = 410799
+SHA256 (libwpg-0.2.0.tar.gz) = aea3e744b180ff244f56709055ba7d4910af829ed14d388b0b60cc732c9c3b94
+SIZE (libwpg-0.2.0.tar.gz) = 418210
diff --git a/graphics/libwpg/pkg-plist b/graphics/libwpg/pkg-plist
index 705b733995b0..4e4707fa94e0 100644
--- a/graphics/libwpg/pkg-plist
+++ b/graphics/libwpg/pkg-plist
@@ -2,83 +2,40 @@
 bin/wpg2raw
 bin/wpg2svg
 bin/wpg2svgbatch.pl
-include/libwpg-0.1/libwpg/WPGBinaryData.h
-include/libwpg-0.1/libwpg/WPGBitmap.h
-include/libwpg-0.1/libwpg/WPGBrush.h
-include/libwpg-0.1/libwpg/WPGColor.h
-include/libwpg-0.1/libwpg/WPGGradient.h
-include/libwpg-0.1/libwpg/WPGPaintInterface.h
-include/libwpg-0.1/libwpg/WPGPath.h
-include/libwpg-0.1/libwpg/WPGPen.h
-include/libwpg-0.1/libwpg/WPGPoint.h
-include/libwpg-0.1/libwpg/WPGRect.h
-include/libwpg-0.1/libwpg/WPGStreamImplementation.h
-include/libwpg-0.1/libwpg/WPGString.h
-include/libwpg-0.1/libwpg/WPGraphics.h
-include/libwpg-0.1/libwpg/libwpg.h
-lib/libwpg-0.1.a
-lib/libwpg-0.1.la
-lib/libwpg-0.1.so
-lib/libwpg-0.1.so.1
-lib/libwpg-stream-0.1.a
-lib/libwpg-stream-0.1.la
-lib/libwpg-stream-0.1.so
-lib/libwpg-stream-0.1.so.1
-libdata/pkgconfig/libwpg-0.1.pc
-libdata/pkgconfig/libwpg-stream-0.1.pc
+include/libwpg-0.2/libwpg/WPGPaintInterface.h
+include/libwpg-0.2/libwpg/WPGraphics.h
+include/libwpg-0.2/libwpg/libwpg.h
+lib/libwpg-0.2.a
+lib/libwpg-0.2.la
+lib/libwpg-0.2.so
+lib/libwpg-0.2.so.2
+libdata/pkgconfig/libwpg-0.2.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/WPG1Parser_8cpp.html
 %%PORTDOCS%%%%DOCSDIR%%/html/WPG1Parser_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/WPG1Parser_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/WPG2Parser_8cpp.html
 %%PORTDOCS%%%%DOCSDIR%%/html/WPG2Parser_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/WPG2Parser_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGBinaryData_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGBinaryData_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGBinaryData_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/WPGBitmap_8cpp.html
 %%PORTDOCS%%%%DOCSDIR%%/html/WPGBitmap_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/WPGBitmap_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGBrush_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGBrush_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGBrush_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/WPGColor_8cpp.html
 %%PORTDOCS%%%%DOCSDIR%%/html/WPGColor_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/WPGColor_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGGradient_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGGradient_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGGradient_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/WPGDashArray_8cpp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/WPGDashArray_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/WPGDashArray_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/WPGHeader_8cpp.html
 %%PORTDOCS%%%%DOCSDIR%%/html/WPGHeader_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/WPGHeader_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/WPGInternalStream_8cpp.html
 %%PORTDOCS%%%%DOCSDIR%%/html/WPGInternalStream_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/WPGInternalStream_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGOLEStream_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGOLEStream_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGOLEStream_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/WPGPaintInterface_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/WPGPaintInterface_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGPath_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGPath_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGPath_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGPen_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGPen_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGPen_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGPoint_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGPoint_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGPoint_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGRect_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGRect_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGRect_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/WPGSVGGenerator_8cpp.html
 %%PORTDOCS%%%%DOCSDIR%%/html/WPGSVGGenerator_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/WPGSVGGenerator_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGStreamImplementation_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGStreamImplementation_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGStreamImplementation_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGString_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGString_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGString_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/WPGXParser_8cpp.html
 %%PORTDOCS%%%%DOCSDIR%%/html/WPGXParser_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/WPGXParser_8h_source.html
@@ -109,82 +66,30 @@ libdata/pkgconfig/libwpg-stream-0.1.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/classWPGHeader.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classWPGInternalInputStream-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classWPGInternalInputStream.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classWPGTextDataContext-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classWPGTextDataContext.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classWPGTextDataHandler-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classWPGTextDataHandler.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classWPGXParser-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classWPGXParser.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classWPGXParser.png
 %%PORTDOCS%%%%DOCSDIR%%/html/classes.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1AllocTable-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1AllocTable.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1DirEntry-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1DirEntry.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1DirTree-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1DirTree.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1Header-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1Header.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1Storage-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1Storage.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1StorageIO-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1StorageIO.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1Stream-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1Stream.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1StreamIO-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1StreamIO.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGBinaryData-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGBinaryData.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGBinaryDataImpl-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGBinaryDataImpl.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGBitmap-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGBitmap.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGBitmap_1_1Private-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGBitmap_1_1Private.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGBrush-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGBrush.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGColor-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGColor.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGDashArray-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGDashArray.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGDashArrayPrivate-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGDashArrayPrivate.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGFileStream-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGFileStream.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGFileStreamPrivate-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGFileStreamPrivate.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGGradient-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGGradient.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGGradientPrivate-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGGradientPrivate.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGGradientStop-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGGradientStop.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGMemoryStream-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGMemoryStream.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGMemoryStreamPrivate-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGMemoryStreamPrivate.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGPaintInterface-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGPaintInterface.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGPaintInterface.png
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGPath-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGPath.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGPathElement-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGPathElement.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGPathPrivate-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGPathPrivate.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGPen-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGPen.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGPoint-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGPoint.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGPointArray-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGPointArray.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGPointArrayPrivate-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGPointArrayPrivate.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGRect-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGRect.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGSVGGenerator-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGSVGGenerator.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGSVGGenerator.png
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGString-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGString.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGStringPrivate-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGStringPrivate.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGraphics-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGraphics.html
 %%PORTDOCS%%%%DOCSDIR%%/html/closed.png
@@ -221,16 +126,12 @@ libdata/pkgconfig/libwpg-stream-0.1.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/functions_0x72.html
 %%PORTDOCS%%%%DOCSDIR%%/html/functions_0x73.html
 %%PORTDOCS%%%%DOCSDIR%%/html/functions_0x74.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x75.html
 %%PORTDOCS%%%%DOCSDIR%%/html/functions_0x76.html
 %%PORTDOCS%%%%DOCSDIR%%/html/functions_0x77.html
 %%PORTDOCS%%%%DOCSDIR%%/html/functions_0x78.html
 %%PORTDOCS%%%%DOCSDIR%%/html/functions_0x79.html
 %%PORTDOCS%%%%DOCSDIR%%/html/functions_0x7e.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_enum.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_eval.html
 %%PORTDOCS%%%%DOCSDIR%%/html/functions_func.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x62.html
 %%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x63.html
 %%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x64.html
 %%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x65.html
@@ -245,33 +146,10 @@ libdata/pkgconfig/libwpg-stream-0.1.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x72.html
 %%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x73.html
 %%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x74.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x75.html
 %%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x76.html
 %%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x77.html
 %%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x7e.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_rela.html
 %%PORTDOCS%%%%DOCSDIR%%/html/functions_vars.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x62.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x63.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x64.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x65.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x66.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x67.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x68.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x69.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x6b.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x6c.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x6d.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x6e.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x6f.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x70.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x72.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x73.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x74.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x76.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x77.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x78.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x79.html
 %%PORTDOCS%%%%DOCSDIR%%/html/globals.html
 %%PORTDOCS%%%%DOCSDIR%%/html/globals_defs.html
 %%PORTDOCS%%%%DOCSDIR%%/html/globals_func.html
@@ -284,6 +162,9 @@ libdata/pkgconfig/libwpg-stream-0.1.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/libwpg__utils_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/main.html
 %%PORTDOCS%%%%DOCSDIR%%/html/namespacelibwpg.html
+%%PORTDOCS%%%%DOCSDIR%%/html/namespacemembers.html
+%%PORTDOCS%%%%DOCSDIR%%/html/namespacemembers_enum.html
+%%PORTDOCS%%%%DOCSDIR%%/html/namespacemembers_eval.html
 %%PORTDOCS%%%%DOCSDIR%%/html/namespaces.html
 %%PORTDOCS%%%%DOCSDIR%%/html/nav_f.png
 %%PORTDOCS%%%%DOCSDIR%%/html/nav_h.png
@@ -296,5 +177,5 @@ libdata/pkgconfig/libwpg-stream-0.1.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/tree.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm include/libwpg-0.1/libwpg
-@dirrm include/libwpg-0.1
+@dirrm include/libwpg-0.2/libwpg
+@dirrm include/libwpg-0.2
diff --git a/graphics/libwpg01/Makefile b/graphics/libwpg01/Makefile
index a59597b2b71b..667523eca4c4 100644
--- a/graphics/libwpg01/Makefile
+++ b/graphics/libwpg01/Makefile
@@ -7,25 +7,26 @@
 
 PORTNAME=	libwpg
 PORTVERSION=	0.1.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	Library for importing and converting Corel WordPerfect(tm) Graphics images
 
-LIB_DEPENDS=	wpd-0.8.8:${PORTSDIR}/textproc/libwpd
+LIB_DEPENDS=	wpd-0.8.8:${PORTSDIR}/textproc/libwpd08
+
+LATEST_LINK=	${PORTNAME}01
+
+LICENSE=	LGPL20
 
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomeprefix gnomehack ltverhack
 USE_PERL5=	yes
 USE_LDCONFIG=	yes
 
-.if !defined(NOPORTDOCS)
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
-.else
 post-patch:
 	@${REINPLACE_CMD} -E '/^SUBDIRS = /s/docs//g' ${WRKSRC}/Makefile.in
-.endif
+	@${REINPLACE_CMD} -E '/^SUBDIRS = /s/conv//g' ${WRKSRC}/src/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/graphics/libwpg01/distinfo b/graphics/libwpg01/distinfo
index 165edee8c1ac..c3dafe799ef5 100644
--- a/graphics/libwpg01/distinfo
+++ b/graphics/libwpg01/distinfo
@@ -1,3 +1,2 @@
-MD5 (libwpg-0.1.3.tar.gz) = db556b750bf3eac8481a4cc5e29e5af1
 SHA256 (libwpg-0.1.3.tar.gz) = 19a52f4eede1da890ac6a5dfa5f0d9a63a73a6dfc3f17cb3423563c53cc665e3
 SIZE (libwpg-0.1.3.tar.gz) = 410799
diff --git a/graphics/libwpg01/pkg-plist b/graphics/libwpg01/pkg-plist
index 705b733995b0..cdef8c521b9a 100644
--- a/graphics/libwpg01/pkg-plist
+++ b/graphics/libwpg01/pkg-plist
@@ -1,7 +1,4 @@
 @comment $FreeBSD$
-bin/wpg2raw
-bin/wpg2svg
-bin/wpg2svgbatch.pl
 include/libwpg-0.1/libwpg/WPGBinaryData.h
 include/libwpg-0.1/libwpg/WPGBitmap.h
 include/libwpg-0.1/libwpg/WPGBrush.h
@@ -26,275 +23,5 @@ lib/libwpg-stream-0.1.so
 lib/libwpg-stream-0.1.so.1
 libdata/pkgconfig/libwpg-0.1.pc
 libdata/pkgconfig/libwpg-stream-0.1.pc
-%%PORTDOCS%%%%DOCSDIR%%/html/WPG1Parser_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPG1Parser_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPG1Parser_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPG2Parser_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPG2Parser_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPG2Parser_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGBinaryData_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGBinaryData_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGBinaryData_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGBitmap_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGBitmap_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGBitmap_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGBrush_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGBrush_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGBrush_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGColor_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGColor_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGColor_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGGradient_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGGradient_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGGradient_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGHeader_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGHeader_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGHeader_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGInternalStream_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGInternalStream_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGInternalStream_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGOLEStream_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGOLEStream_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGOLEStream_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGPaintInterface_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGPaintInterface_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGPath_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGPath_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGPath_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGPen_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGPen_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGPen_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGPoint_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGPoint_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGPoint_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGRect_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGRect_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGRect_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGSVGGenerator_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGSVGGenerator_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGSVGGenerator_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGStreamImplementation_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGStreamImplementation_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGStreamImplementation_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGString_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGString_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGString_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGXParser_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGXParser_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGXParser_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGraphics_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGraphics_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/WPGraphics_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/annotated.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bc_s.png
-%%PORTDOCS%%%%DOCSDIR%%/html/classWPG1Parser-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classWPG1Parser.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classWPG1Parser.png
-%%PORTDOCS%%%%DOCSDIR%%/html/classWPG2Parser-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classWPG2Parser.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classWPG2Parser.png
-%%PORTDOCS%%%%DOCSDIR%%/html/classWPG2Parser_1_1ObjectCharacterization-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classWPG2Parser_1_1ObjectCharacterization.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classWPG2TransformMatrix-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classWPG2TransformMatrix.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classWPGBinaryDataContext-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classWPGBinaryDataContext.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classWPGBitmapContext-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classWPGBitmapContext.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classWPGCompoundPolygon-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classWPGCompoundPolygon.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classWPGGroupContext-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classWPGGroupContext.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classWPGHeader-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classWPGHeader.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classWPGInternalInputStream-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classWPGInternalInputStream.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classWPGXParser-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classWPGXParser.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classWPGXParser.png
-%%PORTDOCS%%%%DOCSDIR%%/html/classes.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1AllocTable-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1AllocTable.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1DirEntry-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1DirEntry.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1DirTree-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1DirTree.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1Header-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1Header.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1Storage-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1Storage.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1StorageIO-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1StorageIO.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1Stream-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1Stream.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1StreamIO-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1StreamIO.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGBinaryData-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGBinaryData.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGBinaryDataImpl-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGBinaryDataImpl.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGBitmap-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGBitmap.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGBitmap_1_1Private-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGBitmap_1_1Private.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGBrush-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGBrush.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGColor-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGColor.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGDashArray-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGDashArray.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGDashArrayPrivate-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGDashArrayPrivate.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGFileStream-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGFileStream.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGFileStreamPrivate-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGFileStreamPrivate.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGGradient-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGGradient.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGGradientPrivate-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGGradientPrivate.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGGradientStop-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGGradientStop.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGMemoryStream-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGMemoryStream.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGMemoryStreamPrivate-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGMemoryStreamPrivate.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGPaintInterface-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGPaintInterface.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGPaintInterface.png
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGPath-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGPath.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGPathElement-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGPathElement.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGPathPrivate-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGPathPrivate.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGPen-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGPen.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGPoint-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGPoint.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGPointArray-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGPointArray.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGPointArrayPrivate-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGPointArrayPrivate.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGRect-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGRect.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGSVGGenerator-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGSVGGenerator.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGSVGGenerator.png
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGString-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGString.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGStringPrivate-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGStringPrivate.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGraphics-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGraphics.html
-%%PORTDOCS%%%%DOCSDIR%%/html/closed.png
-%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.css
-%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.png
-%%PORTDOCS%%%%DOCSDIR%%/html/files.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ftv2blank.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ftv2doc.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ftv2folderclosed.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ftv2folderopen.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ftv2lastnode.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ftv2link.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ftv2mlastnode.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ftv2mnode.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ftv2node.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ftv2plastnode.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ftv2pnode.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ftv2vertline.png
-%%PORTDOCS%%%%DOCSDIR%%/html/functions.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x62.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x63.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x64.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x65.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x66.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x67.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x68.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x69.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x6b.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x6c.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x6d.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x6e.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x6f.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x70.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x72.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x73.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x74.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x75.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x76.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x77.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x78.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x79.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x7e.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_enum.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_eval.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x62.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x63.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x64.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x65.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x66.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x67.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x68.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x69.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x6c.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x6d.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x6f.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x70.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x72.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x73.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x74.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x75.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x76.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x77.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x7e.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_rela.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x62.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x63.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x64.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x65.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x66.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x67.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x68.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x69.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x6b.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x6c.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x6d.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x6e.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x6f.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x70.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x72.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x73.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x74.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x76.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x77.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x78.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x79.html
-%%PORTDOCS%%%%DOCSDIR%%/html/globals.html
-%%PORTDOCS%%%%DOCSDIR%%/html/globals_defs.html
-%%PORTDOCS%%%%DOCSDIR%%/html/globals_func.html
-%%PORTDOCS%%%%DOCSDIR%%/html/globals_vars.html
-%%PORTDOCS%%%%DOCSDIR%%/html/hierarchy.html
-%%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/libwpg_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/libwpg_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/libwpg__utils_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/libwpg__utils_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/main.html
-%%PORTDOCS%%%%DOCSDIR%%/html/namespacelibwpg.html
-%%PORTDOCS%%%%DOCSDIR%%/html/namespaces.html
-%%PORTDOCS%%%%DOCSDIR%%/html/nav_f.png
-%%PORTDOCS%%%%DOCSDIR%%/html/nav_h.png
-%%PORTDOCS%%%%DOCSDIR%%/html/open.png
-%%PORTDOCS%%%%DOCSDIR%%/html/tab_a.png
-%%PORTDOCS%%%%DOCSDIR%%/html/tab_b.png
-%%PORTDOCS%%%%DOCSDIR%%/html/tab_h.png
-%%PORTDOCS%%%%DOCSDIR%%/html/tab_s.png
-%%PORTDOCS%%%%DOCSDIR%%/html/tabs.css
-%%PORTDOCS%%%%DOCSDIR%%/html/tree.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/libwpg-0.1/libwpg
 @dirrm include/libwpg-0.1
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