From 1eea175f09a3a81b3138cd445107ea1f1a725b2b Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Fri, 31 Oct 2014 13:11:58 +0000 Subject: [PATCH] Update to 0.3.3 Remove ancient unused version --- MOVED | 1 + textproc/Makefile | 1 - textproc/libmwaw/Makefile | 41 --------------- textproc/libmwaw/distinfo | 2 - .../files/0001-std-isfinite-is-C-11.patch | 43 --------------- .../libmwaw/files/0001-use-correct-type.patch | 52 ------------------- textproc/libmwaw/pkg-descr | 4 -- textproc/libmwaw/pkg-plist | 7 --- textproc/libmwaw03/Makefile | 2 +- textproc/libmwaw03/distinfo | 4 +- textproc/libmwaw03/pkg-plist | 2 +- 11 files changed, 5 insertions(+), 154 deletions(-) delete mode 100644 textproc/libmwaw/Makefile delete mode 100644 textproc/libmwaw/distinfo delete mode 100644 textproc/libmwaw/files/0001-std-isfinite-is-C-11.patch delete mode 100644 textproc/libmwaw/files/0001-use-correct-type.patch delete mode 100644 textproc/libmwaw/pkg-descr delete mode 100644 textproc/libmwaw/pkg-plist diff --git a/MOVED b/MOVED index 72a2998fe29f..3e2e63b0572d 100644 --- a/MOVED +++ b/MOVED @@ -7174,3 +7174,4 @@ net/slirp||2014-10-28|Has expired: Broken for more than 6 months www/typo347||2014-10-30|Has expired: Upgrade to www/typo3 or www/typo3-lts deskutils/babytrans||2014-10-31|Has expired: Abandonware, dictionaries unavailable www/rt38||2014-10-31|Has expired: Has expired: End of Life March 2014 +textproc/libmwaw|textproc/libmwaw03|2014-10-31|Replaced by newer version 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 - -.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 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 -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 - --#include - #include - #include - #include -@@ -41,6 +40,8 @@ - #include - #include - -+#include -+ - #include - - #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 -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::const_iterator fIt; -+ std::map::const_iterator fIt; - int numFrames = int(m_state->m_framesList.size()); - for (size_t c=0; c::const_iterator fIt; -+ std::map::const_iterator fIt; - int page = group.m_page; - int numFrames = int(m_state->m_framesList.size()); - for (size_t c=0; cm_input; -- std::multimap::const_iterator fIt; -+ std::map::const_iterator fIt; - int numFrames = int(m_state->m_framesList.size()); - for (size_t c=0; cm_input; -- std::multimap::const_iterator fIt; -+ std::map::const_iterator fIt; - int numFrames = int(m_state->m_framesList.size()); - for (size_t c=0; c