Index: head/textproc/libmwaw03/Makefile =================================================================== --- head/textproc/libmwaw03/Makefile (revision 458694) +++ head/textproc/libmwaw03/Makefile (revision 458695) @@ -1,35 +1,25 @@ # $FreeBSD$ PORTNAME= libmwaw -PORTVERSION= 0.3.12 -PORTREVISION= 2 +PORTVERSION= 0.3.13 CATEGORIES= textproc MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} PKGNAMESUFFIX= 03 MAINTAINER= office@FreeBSD.org COMMENT= Import library for some old mac text documents LICENSE= LGPL21+ MPL20 LICENSE_COMB= dual LIB_DEPENDS= librevenge-0.0.so:textproc/librevenge CONFIGURE_ARGS= --disable-werror --without-docs CPPFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes -USES= compiler:features libtool pathfix pkgconfig tar:xz +USES= compiler:c++11-lib libtool 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:devel/boost-libs -CONFIGURE_ARGS+= --with-sharedptr=boost -.endif - -.include +.include Index: head/textproc/libmwaw03/distinfo =================================================================== --- head/textproc/libmwaw03/distinfo (revision 458694) +++ head/textproc/libmwaw03/distinfo (revision 458695) @@ -1,3 +1,3 @@ -TIMESTAMP = 1501607789 -SHA256 (libmwaw-0.3.12.tar.xz) = 7691a6e6e7221d61c40e3f630a8907e3e516b99a587e47d09ec53f8ac60ed1e7 -SIZE (libmwaw-0.3.12.tar.xz) = 1258972 +TIMESTAMP = 1515615392 +SHA256 (libmwaw-0.3.13.tar.xz) = db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea +SIZE (libmwaw-0.3.13.tar.xz) = 1258220 Index: head/textproc/libmwaw03/files/patch-src_lib_libmwaw__internal.hxx =================================================================== --- head/textproc/libmwaw03/files/patch-src_lib_libmwaw__internal.hxx (revision 458694) +++ head/textproc/libmwaw03/files/patch-src_lib_libmwaw__internal.hxx (revision 458695) @@ -1,17 +1,11 @@ ---- src/lib/libmwaw_internal.hxx.orig 2017-07-03 08:10:43 UTC +--- src/lib/libmwaw_internal.hxx.orig 2017-11-13 09:08:03 UTC +++ src/lib/libmwaw_internal.hxx -@@ -119,9 +119,11 @@ struct MWAW_shared_ptr_noop_deleter { - /** fall through attributes */ - #define MWAW_FALLTHROUGH - #if defined(__clang__) --# if defined(__has_cpp_attribute) && __has_cpp_attribute(clang::fallthrough) --# undef MWAW_FALLTHROUGH --# define MWAW_FALLTHROUGH [[clang::fallthrough]] -+# if defined(__has_cpp_attribute) -+# if __has_cpp_attribute(clang::fallthrough) -+# undef MWAW_FALLTHROUGH -+# define MWAW_FALLTHROUGH [[clang::fallthrough]] -+# endif - # endif - #elif defined(__GNUC__) - # if __GNUC__>=7 +@@ -1027,7 +1027,7 @@ template class MWAWBox2 (public) + } + //! generic constructor + template explicit MWAWBox2(MWAWBox2 const &p) +- : m_data(p.min(), p.max()) ++ : m_data(MWAWVec2(p.min()), MWAWVec2(p.max())) + { + } + Index: head/textproc/libmwaw03/pkg-plist =================================================================== --- head/textproc/libmwaw03/pkg-plist (revision 458694) +++ head/textproc/libmwaw03/pkg-plist (revision 458695) @@ -1,13 +1,13 @@ bin/mwaw2csv bin/mwaw2html bin/mwaw2raw bin/mwaw2svg bin/mwaw2text bin/mwawFile bin/mwawZip 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.12 +lib/libmwaw-0.3.so.3.0.13 libdata/pkgconfig/libmwaw-0.3.pc