Update to 0.3.3

Remove ancient unused version

10 files changed, 4 insertions, 154 deletions

diff --git a/textproc/Makefile b/textproc/Makefile
index 327188035fca..c14c9dc74143 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -362,7 +362,6 @@
     SUBDIR += liblrdf
     SUBDIR += libmrss
     SUBDIR += libmrss-php
-    SUBDIR += libmwaw
     SUBDIR += libmwaw03
     SUBDIR += libnxml
     SUBDIR += libodfgen
diff --git a/textproc/libmwaw/Makefile b/textproc/libmwaw/Makefile
deleted file mode 100644
index a821bfb69f1d..000000000000
--- a/textproc/libmwaw/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	libmwaw
-PORTVERSION=	0.2.0
-PORTREVISION=	1
-CATEGORIES=	textproc
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
-
-MAINTAINER=	office@FreeBSD.org
-COMMENT=	Import library for some old mac text documents
-
-LICENSE=	LGPL21 MPL
-LICENSE_COMB=	dual
-
-LIB_DEPENDS=	libwpd-0.9.so:${PORTSDIR}/textproc/libwpd \
-		libwpg-0.2.so:${PORTSDIR}/graphics/libwpg
-
-CONFIGURE_ARGS=	--disable-werror --without-docs
-CPPFLAGS+=	-I${LOCALBASE}/include
-
-EXTRA_PATCHES+=	${FILESDIR}/0001-use-correct-type.patch:-p1
-
-GNU_CONFIGURE=	yes
-USES=		compiler:features libtool:keepla pathfix pkgconfig tar:xz
-USE_LDCONFIG=	yes
-INSTALL_TARGET=	install-strip
-
-.include <bsd.port.pre.mk>
-
-.if ${COMPILER_FEATURES:Mlibc++}
-CONFIGURE_ARGS+=	--with-sharedptr=c++11
-.else
-BUILD_DEPENDS+=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
-CONFIGURE_ARGS+=	--with-sharedptr=boost
-EXTRA_PATCHES+=	${FILESDIR}/0001-std-isfinite-is-C-11.patch:-p1
-.endif
-
-post-stage:
-	@${RM} -f ${STAGEDIR}${PREFIX}/bin/mwaw*
-
-.include <bsd.port.post.mk>
diff --git a/textproc/libmwaw/distinfo b/textproc/libmwaw/distinfo
deleted file mode 100644
index cdecf285bd69..000000000000
--- a/textproc/libmwaw/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (libmwaw-0.2.0.tar.xz) = c30f228681ba2fc3715c9e41fcf2c3bb2b873911acb22602ab7b2eb1eeed85bd
-SIZE (libmwaw-0.2.0.tar.xz) = 808604
diff --git a/textproc/libmwaw/files/0001-std-isfinite-is-C-11.patch b/textproc/libmwaw/files/0001-std-isfinite-is-C-11.patch
deleted file mode 100644
index 73fde5ae0387..000000000000
--- a/textproc/libmwaw/files/0001-std-isfinite-is-C-11.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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
-
diff --git a/textproc/libmwaw/files/0001-use-correct-type.patch b/textproc/libmwaw/files/0001-use-correct-type.patch
deleted file mode 100644
index 7a6ef2dc4689..000000000000
--- a/textproc/libmwaw/files/0001-use-correct-type.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-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
-
diff --git a/textproc/libmwaw/pkg-descr b/textproc/libmwaw/pkg-descr
deleted file mode 100644
index 6852e171e537..000000000000
--- a/textproc/libmwaw/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-libmwaw contains some import filters for old Macintosh text documents
-(MacWrite, ClarisWorks, ... ) and some spreadsheet documents.
-
-WWW: http://libmwaw.sourceforge.net/
diff --git a/textproc/libmwaw/pkg-plist b/textproc/libmwaw/pkg-plist
deleted file mode 100644
index beac185bf6f1..000000000000
--- a/textproc/libmwaw/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-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
diff --git a/textproc/libmwaw03/Makefile b/textproc/libmwaw03/Makefile
index 31b12dce638c..35e300fc9c24 100644
--- a/textproc/libmwaw03/Makefile
+++ b/textproc/libmwaw03/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libmwaw
-PORTVERSION=	0.3.2
+PORTVERSION=	0.3.3
 CATEGORIES=	textproc
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 PKGNAMESUFFIX=	03
diff --git a/textproc/libmwaw03/distinfo b/textproc/libmwaw03/distinfo
index e543e9716094..e61c3d386124 100644
--- a/textproc/libmwaw03/distinfo
+++ b/textproc/libmwaw03/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libmwaw-0.3.2.tar.xz) = d8360a8d6f078b5cce45815a7f90fbc163a3778205f8c9601b0e212244ea8556
-SIZE (libmwaw-0.3.2.tar.xz) = 940368
+SHA256 (libmwaw-0.3.3.tar.xz) = 7a222dba6502cd1faf4bf81775440f2878aa2db77b47dddf910bb68ab9ce1c37
+SIZE (libmwaw-0.3.3.tar.xz) = 967984
diff --git a/textproc/libmwaw03/pkg-plist b/textproc/libmwaw03/pkg-plist
index 4c68367b6675..95f7de6285c3 100644
--- a/textproc/libmwaw03/pkg-plist
+++ b/textproc/libmwaw03/pkg-plist
@@ -9,5 +9,5 @@ include/libmwaw-0.3/libmwaw/MWAWDocument.hxx
 include/libmwaw-0.3/libmwaw/libmwaw.hxx
 lib/libmwaw-0.3.so
 lib/libmwaw-0.3.so.3
-lib/libmwaw-0.3.so.3.0.2
+lib/libmwaw-0.3.so.3.0.3
 libdata/pkgconfig/libmwaw-0.3.pc