@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.179 2018/11/14 22:21:21 kleink Exp $
+# $NetBSD: Makefile,v 1.180 2018/11/24 19:14:09 nia Exp $
 
 .include 	"Makefile.common"
 DISTNAME=	abiword-${ABIVERSION}
-PKGREVISION=	20
 CATEGORIES=	editors
 MASTER_SITES=	http://www.abiword.com/downloads/abiword/${PKGVERSION_NOREV}/source/
 
@@ -18,7 +17,7 @@
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	autoconf automake gmake pkg-config
-USE_LANGUAGES=	c c++03
+USE_LANGUAGES=	c c++11
 
 CONFIGURE_ARGS+=	--disable-default-plugins	#do not build any plugins by default
 CONFIGURE_ARGS+=	--enable-spell         # (Gtk+ only) include spell checking support

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.46 2016/09/27 12:00:50 wiz Exp $
+# $NetBSD: Makefile.common,v 1.47 2018/11/24 19:14:09 nia Exp $
 # used by editors/abiword-plugins/Makefile
 
-ABIVERSION=3.0.1
+ABIVERSION=3.0.2

@@ -1,20 +1,15 @@
-$NetBSD: distinfo,v 1.74 2018/06/30 12:43:28 maya Exp $
+$NetBSD: distinfo,v 1.75 2018/11/24 19:14:09 nia Exp $
 
-SHA1 (abiword-3.0.1.tar.gz) = 7badf9663564a144e16764a456cadda18df70991
-RMD160 (abiword-3.0.1.tar.gz) = 05d92a7304e4e419776970d7b35065ceb59f7681
-SHA512 (abiword-3.0.1.tar.gz) = c655aabe0ba0a9880f30808e26c02ec3280c750625faa482a68d4d336742f85659a7af7d6413d8813b82d3de0a3f6b61b6f6898f030bb921d792ad866879dbcf
-Size (abiword-3.0.1.tar.gz) = 11144990 bytes
+SHA1 (abiword-3.0.2.tar.gz) = 8226e0962e6667e0a461955a0ac680a629e0b55a
+RMD160 (abiword-3.0.2.tar.gz) = fde551492b0cffa7d522082906f374490bd47f5c
+SHA512 (abiword-3.0.2.tar.gz) = 29ce9e80b3b85ab2933e7d39216771d8c4e05db5255eaed0cf8e1d032ffaac2cb1880bf24e754196ad5dae4969a1c2101ce4dc9c1db14604adc2f852b6a17fe3
+Size (abiword-3.0.2.tar.gz) = 11154333 bytes
 SHA1 (patch-configure.ac) = 239c0635c2c616c7e0a986a5fd92428393af38b7
-SHA1 (patch-plugin-configure.m4) = a8b8db3bdbd69339e32eefec1de7b1b59467db40
+SHA1 (patch-plugin-configure.m4) = ccdb6932b389694998a8d50676347d4fa6a03910
 SHA1 (patch-plugins_aiksaurus_Makefile.am) = 1529d5098b7fb798c428fe02cc50879374cb3e9d
-SHA1 (patch-plugins_collab_backends_service_xp_RealmProtocol.cpp) = 8b46d71b4ebb23aa4720e6d2d544004e178c1f2f
-SHA1 (patch-plugins_collab_backends_service_xp_soa__soup.cpp) = 219532cffebd67a9ed2e62fd318ccfb7eee57036
-SHA1 (patch-plugins_collab_backends_service_xp_tls__tunnel.cpp) = f8eed4520951653822c6de8da371c8cb42dcbc89
 SHA1 (patch-plugins_command_Makefile.am) = e003a6bf9a6e0566abc85f09868fdf1aa93234d7
 SHA1 (patch-plugins_gimp_xp_AbiGimp.cpp) = 15692cf15fd4099e7ad4ad854b6b57b103717269
 SHA1 (patch-plugins_goffice_Makefile.am) = 1959eea3b4e19f085aeb56870f682ce44561d445
-SHA1 (patch-plugins_grammar_linkgrammarwrap_LinkGrammarWrap.cpp) = f3916dbc0b208bfe9dbb55eac850a3094683694c
-SHA1 (patch-plugins_latex_xp_ie__exp__LaTeX.cpp) = bffa5e143147214af4baf8bf778123ca7223a8eb
 SHA1 (patch-plugins_mht_xp_tidyReader.h) = fa4ef0ee7f893fb070b76e21aaad4efd9b8b27ee
 SHA1 (patch-plugins_paint_xp_AbiGeneric.cpp) = 0c29c7ddf0dbd55d4bb6ab90311e40f2cff7130b
 SHA1 (patch-plugins_paint_xp_AbiPaint.cpp) = bf1ea7eb25fb384014523554f7ca55e6507bcbe6
@@ -25,12 +20,10 @@
 SHA1 (patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp) = c87bc227eebcfcc2ab11ee6b5237ef8fcc47c0bc
 SHA1 (patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h) = 0a75276dc0d1d99b97155f61d9f98de7126fb0a3
 SHA1 (patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp) = 36d7ca7855ddc504701e392c28e3d8530f78b81e
-SHA1 (patch-plugins_xslfo_xp_ie__exp__XSL-FO.cpp) = 8dfb1c643d70ff1813fd3d9eaa71074e8954975a
 SHA1 (patch-src_af_util_xp_ut__endian.h) = e1dd4cc0df3b0eb66dbd673fb5c0d2e3b24b30a4
 SHA1 (patch-src_af_util_xp_ut__iconv.cpp) = 613f162d4db0ba9520e0481a98564e59ccd862d4
 SHA1 (patch-src_af_util_xp_ut__iconv.h) = bbcfa2098ea77d393feb50d69de9ae29fcce302f
 SHA1 (patch-src_af_util_xp_ut__mbtowc.cpp) = 01f6793651533e7e39f665e5c15e6c12e1c7b96d
 SHA1 (patch-src_af_util_xp_ut__misc.cpp) = f552ecbb87490355d8e74218dd59fd3961f1af5d
 SHA1 (patch-src_text_fmt_xp_fv__FrameEdit.h) = 684310bf9aece4ce72d004dfae9a4b4b6ca69570
-SHA1 (patch-src_text_ptbl_xp_pd__DocumentRDF.cpp) = 0c111e9e88c27ad0321c1a3d337abd1f158398d0
+SHA1 (patch-src_text_ptbl_xp_pd__DocumentRDF.cpp) = 5673e9341372913156f2f722229569199d97af4c
-SHA1 (patch-src_text_ptbl_xp_pd__DocumentRDF.h) = 59837727c060bc8f8f14478c3a0245b877c2d29a

@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2016/02/12 23:42:15 jperkin Exp $
+# $NetBSD: options.mk,v 1.3 2018/11/24 19:14:09 nia Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.abiword
 PKG_SUPPORTED_OPTIONS=		debug
@@ -15,3 +15,4 @@
 INSTALL_UNSTRIPPED=	yes
 CFLAGS+=		-O0
 .endif
+

@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.94 2018/11/14 22:21:21 kleink Exp $
+# $NetBSD: Makefile,v 1.95 2018/11/24 19:14:09 nia Exp $
 
 .include	"../../editors/abiword/Makefile.common"
 DISTNAME=	abiword-${ABIVERSION}
 PKGNAME=	abiword-plugins-${ABIVERSION}
-PKGREVISION=	33
 CATEGORIES=	editors
 MASTER_SITES=	http://www.abiword.com/downloads/abiword/${PKGVERSION_NOREV}/source/
 

@@ -1,10 +1,10 @@
-$NetBSD: patch-plugin-configure.m4,v 1.1 2015/09/13 21:32:13 nros Exp $
+$NetBSD: patch-plugin-configure.m4,v 1.2 2018/11/24 19:14:09 nia Exp $
 * adapt wordperfect plugins to dependecies available in pkgsrc 
   from abiword svn date 2014-12-27
---- plugin-configure.m4.orig	2014-12-23 05:13:14.000000000 +0000
+--- plugin-configure.m4.orig	2016-10-21 00:42:58.000000000 +0000
 +++ plugin-configure.m4
-@@ -1355,7 +1355,7 @@ AC_SUBST([BMP_CFLAGS])
- AC_SUBST([BMP_LIBS])
+@@ -72,7 +72,7 @@ AC_SUBST([GRAMMAR_CFLAGS])
+ AC_SUBST([GRAMMAR_LIBS])
  
  
 -wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0"
@@ -12,8 +12,8 @@
  wpg_deps="no"
  
  if test "$enable_wpg" != ""; then
-@@ -1469,8 +1469,8 @@ AC_SUBST([AIKSAURUS_CFLAGS])
- AC_SUBST([AIKSAURUS_LIBS])
+@@ -962,8 +962,8 @@ AC_SUBST([XSLFO_CFLAGS])
+ AC_SUBST([XSLFO_LIBS])
  
  
 -wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req"

@@ -1,37 +1,9 @@
-$NetBSD: patch-src_text_ptbl_xp_pd__DocumentRDF.cpp,v 1.2 2018/04/25 05:53:53 markd Exp $
+$NetBSD: patch-src_text_ptbl_xp_pd__DocumentRDF.cpp,v 1.3 2018/11/24 19:14:09 nia Exp $
 
-* fixes build on FreeBSD 10 with clang. From FreeBSD ports mailing list.
-  Applied upstream.
-  https://lists.freebsd.org/pipermail/freebsd-ports/2015-March/098621.html
+fix using modern libical
 
-* fix using modern libical
-
---- src/text/ptbl/xp/pd_DocumentRDF.cpp.orig	2014-02-27 05:11:32.000000000 +0000
+--- src/text/ptbl/xp/pd_DocumentRDF.cpp.orig	2015-04-02 03:09:20.000000000 +0000
 +++ src/text/ptbl/xp/pd_DocumentRDF.cpp
-@@ -570,6 +570,11 @@ bool PD_URI::operator==(const std::strin
-     return m_value == b;
- }
- 
-+bool PD_URI::operator<(const PD_URI& b) const
-+{
-+return m_value < b.m_value;
-+}
-+
- PD_URI
- PD_URI::prefixedToURI( PD_RDFModelHandle model ) const
- {
-@@ -611,11 +616,6 @@ bool PD_URI::write( std::ostream& ss ) c
-     return true;
- }
- 
--bool operator<( PD_URI a, PD_URI b)
--{
--    return a.toString() < b.toString();
--}
--
- bool operator<( std::pair< PD_URI, PD_URI > a, PD_URI b)
- {
-     return a.first.toString() < b.toString();
 @@ -2269,8 +2269,8 @@ PD_RDFEvent::exportToFile( const std::st
          icalcomponent_set_uid( c,         m_uid.c_str() );
          icalcomponent_set_location( c,    m_location.c_str() );