3 files changed, 136 insertions, 25 deletions

diff --git a/textproc/libwps/Makefile b/textproc/libwps/Makefile
index 3a4ad500dafa..fbf62cbd3613 100644
--- a/textproc/libwps/Makefile
+++ b/textproc/libwps/Makefile
@@ -6,18 +6,26 @@
 #
 
 PORTNAME=	libwps
-PORTVERSION=	0.1.2
-PORTREVISION=	5
+PORTVERSION=	0.2.0
 CATEGORIES=	textproc
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	A Microsoft file word processor format import filter library
 
-LIB_DEPENDS=	wpd-0.8.8:${PORTSDIR}/textproc/libwpd08
+LIB_DEPENDS=	wpd-0.9.9:${PORTSDIR}/textproc/libwpd
+
+LICENSE=	LGPL21
 
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomeprefix gnomehack ltverhack
+USE_GNOME=     gnomeprefix gnomehack ltverhack
 USE_LDCONFIG=	yes
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.if defined(NOPORTDOCS)
+CONFIGURE_ARGS+=	--without-docs
+.else
+BUILD_DEPENDS+=		doxygen:${PORTSDIR}/devel/doxygen
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/textproc/libwps/distinfo b/textproc/libwps/distinfo
index 0f7a9eaf44a3..ad40ba866d08 100644
--- a/textproc/libwps/distinfo
+++ b/textproc/libwps/distinfo
@@ -1,3 +1,2 @@
-MD5 (libwps-0.1.2.tar.gz) = 799fc3b835a79adce8c88a3fee0150c1
-SHA256 (libwps-0.1.2.tar.gz) = e8f03fc83f7ddd3976adb61f693eaeebefee852655875816e5f945e0efabb2b1
-SIZE (libwps-0.1.2.tar.gz) = 413360
+SHA256 (libwps-0.2.0.tar.gz) = 0c85c77f117caaf2903b67c7ae08785ef5970126dcab0416af1f42f097491bf8
+SIZE (libwps-0.2.0.tar.gz) = 402804
diff --git a/textproc/libwps/pkg-plist b/textproc/libwps/pkg-plist
index bce1df7b58a4..c32490d6b535 100644
--- a/textproc/libwps/pkg-plist
+++ b/textproc/libwps/pkg-plist
@@ -1,19 +1,123 @@
 bin/wps2html
 bin/wps2raw
 bin/wps2text
-include/libwps-0.1/libwps/WPSDocument.h
-include/libwps-0.1/libwps/WPSStream.h
-include/libwps-0.1/libwps/WPSStreamImplementation.h
-include/libwps-0.1/libwps/libwps.h
-lib/libwps-0.1.a
-lib/libwps-0.1.la
-lib/libwps-0.1.so
-lib/libwps-0.1.so.1
-lib/libwps-stream-0.1.a
-lib/libwps-stream-0.1.la
-lib/libwps-stream-0.1.so
-lib/libwps-stream-0.1.so.1
-libdata/pkgconfig/libwps-0.1.pc
-libdata/pkgconfig/libwps-stream-0.1.pc
-@dirrm include/libwps-0.1/libwps
-@dirrm include/libwps-0.1
+include/libwps-0.2/libwps/WPSDocument.h
+include/libwps-0.2/libwps/libwps.h
+lib/libwps-0.2.a
+lib/libwps-0.2.la
+lib/libwps-0.2.so
+lib/libwps-0.2.so.2
+libdata/pkgconfig/libwps-0.2.pc
+%%PORTDOCS%%%%DOCSDIR%%/html/WPS4_8cpp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classWPSHeader.html
+%%PORTDOCS%%%%DOCSDIR%%/html/WPS4_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/WPS4_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/WPS8_8cpp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/WPS8_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/WPS8_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/WPSContentListener_8cpp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/WPSContentListener_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/WPSContentListener_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/WPSDocument_8cpp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/WPSDocument_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/WPSDocument_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/WPSFileStructure_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/WPSFileStructure_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/WPSHeader_8cpp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/WPSHeader_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/WPSHeader_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/WPSPageSpan_8cpp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/WPSPageSpan_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/WPSPageSpan_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/WPSParser_8cpp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/WPSParser_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/WPSParser_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/WPS_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/WPS_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/annotated.html
+%%PORTDOCS%%%%DOCSDIR%%/html/bc_s.png
+%%PORTDOCS%%%%DOCSDIR%%/html/classFOD-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classFOD.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classFPROP-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classFPROP.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classFileException.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classGenericException.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classHeaderIndexEntries-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classHeaderIndexEntries.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classParseException.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classVersionException.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classWPS4ContentListener-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classWPS4ContentListener.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classWPS4ContentListener.png
+%%PORTDOCS%%%%DOCSDIR%%/html/classWPS4Parser-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classWPS4Parser.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classWPS4Parser.png
+%%PORTDOCS%%%%DOCSDIR%%/html/classWPS8ContentListener-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classWPS8ContentListener.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classWPS8ContentListener.png
+%%PORTDOCS%%%%DOCSDIR%%/html/classWPS8Parser-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classWPS8Parser.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classWPS8Parser.png
+%%PORTDOCS%%%%DOCSDIR%%/html/classWPSContentListener-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classWPSContentListener.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classWPSContentListener.png
+%%PORTDOCS%%%%DOCSDIR%%/html/classWPSDocument-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classWPSDocument.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classWPSHeader-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classWPSHeaderFooter-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classWPSHeaderFooter.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classWPSPageSpan-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classWPSPageSpan.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classWPSParser-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classWPSParser.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classWPSParser.png
+%%PORTDOCS%%%%DOCSDIR%%/html/classes.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_func.html
+%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars.html
+%%PORTDOCS%%%%DOCSDIR%%/html/globals.html
+%%PORTDOCS%%%%DOCSDIR%%/html/globals_defs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/globals_enum.html
+%%PORTDOCS%%%%DOCSDIR%%/html/globals_eval.html
+%%PORTDOCS%%%%DOCSDIR%%/html/globals_func.html
+%%PORTDOCS%%%%DOCSDIR%%/html/globals_type.html
+%%PORTDOCS%%%%DOCSDIR%%/html/globals_vars.html
+%%PORTDOCS%%%%DOCSDIR%%/html/hierarchy.html
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/libwps_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/libwps_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/libwps__internal_8cpp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/libwps__internal_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/libwps__internal_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/main.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nav_f.png
+%%PORTDOCS%%%%DOCSDIR%%/html/nav_h.png
+%%PORTDOCS%%%%DOCSDIR%%/html/open.png
+%%PORTDOCS%%%%DOCSDIR%%/html/struct__WPSContentParsingState-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/struct__WPSContentParsingState.html
+%%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
+@dirrm include/libwps-0.2/libwps
+@dirrm include/libwps-0.2
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%