Index: Makefile
===================================================================
--- Makefile	(revision 357352)
+++ Makefile	(working copy)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libmwaw
-PORTVERSION=	0.1.11
-PORTREVISION=	2
+PORTVERSION=	0.2.0
 CATEGORIES=	textproc
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -19,6 +18,9 @@
 CONFIGURE_ARGS=	--disable-werror
 CPPFLAGS+=	-I${LOCALBASE}/include
 
+EXTRA_PATCHES+=	${FILESDIR}/0001-std-isfinite-is-C-11.patch:-p1 \
+		${FILESDIR}/0001-use-correct-type.patch:-p1
+
 GNU_CONFIGURE=	yes
 USES=		compiler:features libtool:keepla pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
Index: distinfo
===================================================================
--- distinfo	(revision 356504)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (libmwaw-0.1.11.tar.xz) = 8b915c60c157669647ba1eee6675cd39490a01f8b1d3bf8a5b4ed753e0ffc9d9
-SIZE (libmwaw-0.1.11.tar.xz) = 744736
+SHA256 (libmwaw-0.2.0.tar.xz) = c30f228681ba2fc3715c9e41fcf2c3bb2b873911acb22602ab7b2eb1eeed85bd
+SIZE (libmwaw-0.2.0.tar.xz) = 808604
Index: files/0001-std-isfinite-is-C-11.patch
===================================================================
--- files/0001-std-isfinite-is-C-11.patch	(revision 0)
+++ files/0001-std-isfinite-is-C-11.patch	(working copy)
@@ -0,0 +1,43 @@
+From 5da59d9aa9298136d447e4014aef207f00cdc82b Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Sun, 3 Nov 2013 12:26:26 +0100
+Subject: [PATCH] std::isfinite is C++11
+
+---
+ configure.ac               | 10 ++++++++++
+ src/lib/CWDbaseContent.cxx |  5 +++--
+ 2 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/CWDbaseContent.cxx b/src/lib/CWDbaseContent.cxx
+index f27148d..7198103 100644
+--- a/src/lib/CWDbaseContent.cxx
++++ b/src/lib/CWDbaseContent.cxx
+@@ -33,7 +33,6 @@
+ 
+ #include <time.h>
+ 
+-#include <cmath>
+ #include <cstring>
+ #include <ctime>
+ #include <iomanip>
+@@ -41,6 +40,8 @@
+ #include <set>
+ #include <sstream>
+ 
++#include <boost/math/special_functions/fpclassify.hpp>
++
+ #include <libwpd/libwpd.h>
+ 
+ #include "MWAWContentListener.hxx"
+@@ -969,7 +970,7 @@ void CWDbaseContent::send(double val, CWStyleManager::CellFormat const &format)
+     if (type>=10&&type<=11) type += 4;
+     else if (type>=14) type=16;
+   }
+-  if (type <= 0 || type >=16 || type==10 || type==11 || !std::isfinite(val)) {
++  if (type <= 0 || type >=16 || type==10 || type==11 || !boost::math::isfinite(val)) {
+     s << val;
+     listener->insertUnicodeString(s.str().c_str());
+     return;
+-- 
+1.8.3.1
+

Property changes on: files/0001-std-isfinite-is-C-11.patch
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: files/0001-use-correct-type.patch
===================================================================
--- files/0001-use-correct-type.patch	(revision 0)
+++ files/0001-use-correct-type.patch	(working copy)
@@ -0,0 +1,52 @@
+From cde8d7c47cdea327f8153ab72cde650f1b36f7f8 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Sun, 3 Nov 2013 12:59:29 +0100
+Subject: [PATCH] use correct type
+
+---
+ src/lib/HMWJGraph.cxx | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/lib/HMWJGraph.cxx b/src/lib/HMWJGraph.cxx
+index fca366c..dd83ace 100644
+--- a/src/lib/HMWJGraph.cxx
++++ b/src/lib/HMWJGraph.cxx
+@@ -2668,7 +2668,7 @@ bool HMWJGraph::sendGroup(HMWJGraphInternal::Group const &group, MWAWPosition po
+     return true;
+   }
+ 
+-  std::multimap<long, int>::const_iterator fIt;
++  std::map<long, int>::const_iterator fIt;
+   int numFrames = int(m_state->m_framesList.size());
+   for (size_t c=0; c<group.m_childsList.size(); ++c) {
+     long fId=group.m_childsList[c];
+@@ -2690,7 +2690,7 @@ bool HMWJGraph::sendGroup(HMWJGraphInternal::Group const &group, MWAWPosition po
+ 
+ bool HMWJGraph::canCreateGraphic(HMWJGraphInternal::Group const &group)
+ {
+-  std::multimap<long, int>::const_iterator fIt;
++  std::map<long, int>::const_iterator fIt;
+   int page = group.m_page;
+   int numFrames = int(m_state->m_framesList.size());
+   for (size_t c=0; c<group.m_childsList.size(); ++c) {
+@@ -2726,7 +2726,7 @@ void HMWJGraph::sendGroup(HMWJGraphInternal::Group const &group, MWAWGraphicList
+   if (!listener) return;
+   group.m_parsed=true;
+   MWAWInputStreamPtr &input= m_parserState->m_input;
+-  std::multimap<long, int>::const_iterator fIt;
++  std::map<long, int>::const_iterator fIt;
+   int numFrames = int(m_state->m_framesList.size());
+   for (size_t c=0; c<group.m_childsList.size(); ++c) {
+     long fId=group.m_childsList[c];
+@@ -2784,7 +2784,7 @@ void HMWJGraph::sendGroupChild(HMWJGraphInternal::Group const &group, MWAWPositi
+   Box2f partialBdBox;
+   MWAWPosition partialPos(pos);
+   MWAWInputStreamPtr &input= m_parserState->m_input;
+-  std::multimap<long, int>::const_iterator fIt;
++  std::map<long, int>::const_iterator fIt;
+   int numFrames = int(m_state->m_framesList.size());
+   for (size_t c=0; c<numChilds; ++c) {
+     long fId=group.m_childsList[c];
+-- 
+1.8.3.1
+

Property changes on: files/0001-use-correct-type.patch
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 356504)
+++ pkg-plist	(working copy)
@@ -1,15 +1,15 @@
+bin/mwaw2csv
 bin/mwaw2html
 bin/mwaw2raw
 bin/mwaw2text
 bin/mwawFile
 bin/mwawZip
-include/libmwaw-0.1/libmwaw/MWAWDocument.hxx
-include/libmwaw-0.1/libmwaw/MWAWPropertyHandler.hxx
-include/libmwaw-0.1/libmwaw/libmwaw.hxx
-lib/libmwaw-0.1.la
-lib/libmwaw-0.1.so
-lib/libmwaw-0.1.so.1
-lib/libmwaw-0.1.so.1.0.11
-libdata/pkgconfig/libmwaw-0.1.pc
-@dirrm include/libmwaw-0.1/libmwaw
-@dirrm include/libmwaw-0.1
+include/libmwaw-0.2/libmwaw/MWAWDocument.hxx
+include/libmwaw-0.2/libmwaw/libmwaw.hxx
+lib/libmwaw-0.2.la
+lib/libmwaw-0.2.so
+lib/libmwaw-0.2.so.2
+lib/libmwaw-0.2.so.2.0.0
+libdata/pkgconfig/libmwaw-0.2.pc
+@dirrm include/libmwaw-0.2/libmwaw
+@dirrm include/libmwaw-0.2