editors/*: let pkglint fix indentation and variable alignment

pkglint -Wall -F -r editors

Manually fixed the changes in editors/nedit since the "fixed" indentation
was wrong.

16 files changed, 56 insertions, 32 deletions

diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 36a0004e526..85e7ab078db 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.185 2019/04/03 00:32:40 ryoon Exp $
+# $NetBSD: Makefile,v 1.186 2019/06/08 10:40:52 rillig Exp $
 
 .include 	"Makefile.common"
 DISTNAME=	abiword-${ABIVERSION}
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.abiword.com/
 COMMENT=	Open Source cross-platform word processor
 LICENSE=	gnu-gpl-v2
 
-CONFLICTS=      abiword-personal-[0-9]* abiword2-[0-9]*
+CONFLICTS=	abiword-personal-[0-9]* abiword2-[0-9]*
 
 DEPENDS+=	adwaita-icon-theme>0:../../graphics/adwaita-icon-theme
 
@@ -25,7 +25,7 @@ CONFIGURE_ARGS+=	--enable-spell         # (Gtk+ only) include spell checking sup
 CONFIGURE_ARGS+=	--enable-plugins=""
 # evolution data server can't be found even if buildlinked
 # disable to make sure it's not found somewhere else
-CONFIGURE_ARGS+=        --with-evolution-data-server=no
+CONFIGURE_ARGS+=	--with-evolution-data-server=no
 
 PKGCONFIG_OVERRIDE+=	libabiword.pc.in
 
diff --git a/editors/abiword/Makefile.common b/editors/abiword/Makefile.common
index d7765427a2c..3ee58787bad 100644
--- a/editors/abiword/Makefile.common
+++ b/editors/abiword/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.47 2018/11/24 19:14:09 nia Exp $
+# $NetBSD: Makefile.common,v 1.48 2019/06/08 10:40:53 rillig Exp $
 # used by editors/abiword-plugins/Makefile
 
-ABIVERSION=3.0.2
+ABIVERSION=	3.0.2
diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index 74f5db23d98..32e873a61e6 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1,25 +1,25 @@
-$NetBSD: distinfo,v 1.77 2018/12/28 22:24:52 gutteridge Exp $
+$NetBSD: distinfo,v 1.78 2019/06/08 10:40:53 rillig Exp $
 
 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) = ccdb6932b389694998a8d50676347d4fa6a03910
+SHA1 (patch-plugin-configure.m4) = 50b5b6be8a1e8270c7ce45a4ed94cb5d436516f2
 SHA1 (patch-plugins_aiksaurus_Makefile.am) = 1529d5098b7fb798c428fe02cc50879374cb3e9d
 SHA1 (patch-plugins_command_Makefile.am) = e003a6bf9a6e0566abc85f09868fdf1aa93234d7
-SHA1 (patch-plugins_gimp_xp_AbiGimp.cpp) = 15692cf15fd4099e7ad4ad854b6b57b103717269
+SHA1 (patch-plugins_gimp_xp_AbiGimp.cpp) = 2b245de4beb2f4b9b8cd8593c811bb086bb2bde3
 SHA1 (patch-plugins_goffice_Makefile.am) = 1959eea3b4e19f085aeb56870f682ce44561d445
 SHA1 (patch-plugins_mht_xp_tidyReader.h) = fa4ef0ee7f893fb070b76e21aaad4efd9b8b27ee
-SHA1 (patch-plugins_paint_xp_AbiGeneric.cpp) = 0c29c7ddf0dbd55d4bb6ab90311e40f2cff7130b
-SHA1 (patch-plugins_paint_xp_AbiPaint.cpp) = bf1ea7eb25fb384014523554f7ca55e6507bcbe6
+SHA1 (patch-plugins_paint_xp_AbiGeneric.cpp) = d0b6f3c23c1512c6517775ce9a5ae78f168931fc
+SHA1 (patch-plugins_paint_xp_AbiPaint.cpp) = 3cdad7a1755db036e3299368b4b11e10feff1875
 SHA1 (patch-plugins_psion_Makefile.am) = d18356c2a273d99918076d5aefafec595af3f898
-SHA1 (patch-plugins_wordperfect_xp_Makefile.am) = e5cba76cfdba5caca672b801fa222b277a7522c1
-SHA1 (patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp) = 10a6d88e21f98e743b4443a09cd73ab8b7812fc9
-SHA1 (patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h) = 6e1e264506edabf0e1cb359f664ed455d16fa05e
-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_wordperfect_xp_Makefile.am) = 027dadfb6effbb25fafda6b69e9c92c8046e52f7
+SHA1 (patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp) = e677c06d7e6c0a97ab7a4003471adae2148ce435
+SHA1 (patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h) = 4931688c7cb82b9fe41cb42bb9bc604f6606ef4e
+SHA1 (patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp) = 255ac57f2f127d76aff6bdbf1f0ddc223a673ca9
+SHA1 (patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h) = a3eac8abff26bf91f698948430e89bff13db710b
+SHA1 (patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp) = 7eb0296fdff2fa27288f4c68fc337ba105695551
 SHA1 (patch-src_af_gr_gtk_gr__UnixCairoGraphics.cpp) = 2fb170202d13c9ddf077cea545d8d8f79fdbf5c2
 SHA1 (patch-src_af_gr_gtk_gr__UnixImage.cpp) = 2546621961ce959a8d5078ff52efa4650362be54
 SHA1 (patch-src_af_gr_xp_gr__Caret.cpp) = 96b186c4fc762f6734226b4505e2d4c64fb2b03a
@@ -28,9 +28,9 @@ SHA1 (patch-src_af_gr_xp_gr__Graphics.cpp) = 9cf398ea8e787e5820d41182c005fe2906c
 SHA1 (patch-src_af_gr_xp_gr__Graphics.h) = a3539f0e2e3a8f661a01428f7550f8a4bebb1ee5
 SHA1 (patch-src_af_util_unix_ut__unixTimer.cpp) = 543d8977c8da5c1db4e26581d82f72a4f936f190
 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.cpp) = 18529454262fe6cb3ae15fd485c7bcc8adb00ae3
 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__mbtowc.cpp) = cf7078a6bfdf9ac9b30478d11d9d3a81a95b8ed1
 SHA1 (patch-src_af_util_xp_ut__misc.cpp) = f552ecbb87490355d8e74218dd59fd3961f1af5d
 SHA1 (patch-src_af_util_xp_ut__png.cpp) = 9f4ae043873fc6d66e063419d0736bb6104483b0
 SHA1 (patch-src_af_xap_gtk_xap__UnixFrameImpl.cpp) = 5b67bd234209beddc751e7c98b17cf1844b73b1a
diff --git a/editors/abiword/options.mk b/editors/abiword/options.mk
index 449024bfb56..be80c93c29b 100644
--- a/editors/abiword/options.mk
+++ b/editors/abiword/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2018/11/24 19:14:09 nia Exp $
+# $NetBSD: options.mk,v 1.4 2019/06/08 10:40:53 rillig Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.abiword
 PKG_SUPPORTED_OPTIONS=		debug
@@ -11,7 +11,7 @@ PKG_SUPPORTED_OPTIONS=		debug
 .if !empty(PKG_OPTIONS:Mdebug)
 CC+=			-ggdb
 CXX+=			-ggdb
-CONFIGURE_ARGS+=        --enable-debug
+CONFIGURE_ARGS+=	--enable-debug
 INSTALL_UNSTRIPPED=	yes
 CFLAGS+=		-O0
 .endif
diff --git a/editors/abiword/patches/patch-plugin-configure.m4 b/editors/abiword/patches/patch-plugin-configure.m4
index e17954c733f..83ba0eb62fe 100644
--- a/editors/abiword/patches/patch-plugin-configure.m4
+++ b/editors/abiword/patches/patch-plugin-configure.m4
@@ -1,6 +1,8 @@
-$NetBSD: patch-plugin-configure.m4,v 1.2 2018/11/24 19:14:09 nia Exp $
+$NetBSD: patch-plugin-configure.m4,v 1.3 2019/06/08 10:40:53 rillig Exp $
+
 * adapt wordperfect plugins to dependecies available in pkgsrc 
   from abiword svn date 2014-12-27
+
 --- plugin-configure.m4.orig	2016-10-21 00:42:58.000000000 +0000
 +++ plugin-configure.m4
 @@ -72,7 +72,7 @@ AC_SUBST([GRAMMAR_CFLAGS])
diff --git a/editors/abiword/patches/patch-plugins_gimp_xp_AbiGimp.cpp b/editors/abiword/patches/patch-plugins_gimp_xp_AbiGimp.cpp
index a6fa799c1f5..5e5d5a9ea1c 100644
--- a/editors/abiword/patches/patch-plugins_gimp_xp_AbiGimp.cpp
+++ b/editors/abiword/patches/patch-plugins_gimp_xp_AbiGimp.cpp
@@ -1,5 +1,7 @@
-$NetBSD: patch-plugins_gimp_xp_AbiGimp.cpp,v 1.1 2015/09/13 21:32:13 nros Exp $
+$NetBSD: patch-plugins_gimp_xp_AbiGimp.cpp,v 1.2 2019/06/08 10:40:53 rillig Exp $
+
 * Fix seg fault.
+
 --- plugins/gimp/xp/AbiGimp.cpp.orig	2013-12-23 02:37:58.000000000 +0000
 +++ plugins/gimp/xp/AbiGimp.cpp
 @@ -249,6 +249,10 @@ AbiGimp_invoke(AV_View* /*v*/, EV_EditMe
diff --git a/editors/abiword/patches/patch-plugins_paint_xp_AbiGeneric.cpp b/editors/abiword/patches/patch-plugins_paint_xp_AbiGeneric.cpp
index 5148dfc55c5..7c4d3794ada 100644
--- a/editors/abiword/patches/patch-plugins_paint_xp_AbiGeneric.cpp
+++ b/editors/abiword/patches/patch-plugins_paint_xp_AbiGeneric.cpp
@@ -1,6 +1,8 @@
-$NetBSD: patch-plugins_paint_xp_AbiGeneric.cpp,v 1.1 2015/09/13 21:32:13 nros Exp $
+$NetBSD: patch-plugins_paint_xp_AbiGeneric.cpp,v 1.2 2019/06/08 10:40:53 rillig Exp $
+
 If pFrame is NULL an image is obviously not selected.
 Fixes seg fault.
+
 --- plugins/paint/xp/AbiGeneric.cpp.orig	2013-04-07 13:53:03.000000000 +0000
 +++ plugins/paint/xp/AbiGeneric.cpp
 @@ -297,6 +297,9 @@ bool isImageSelected (void)
diff --git a/editors/abiword/patches/patch-plugins_paint_xp_AbiPaint.cpp b/editors/abiword/patches/patch-plugins_paint_xp_AbiPaint.cpp
index 2dd14b28b90..93280ef71f0 100644
--- a/editors/abiword/patches/patch-plugins_paint_xp_AbiPaint.cpp
+++ b/editors/abiword/patches/patch-plugins_paint_xp_AbiPaint.cpp
@@ -1,5 +1,7 @@
-$NetBSD: patch-plugins_paint_xp_AbiPaint.cpp,v 1.1 2015/09/13 21:32:13 nros Exp $
+$NetBSD: patch-plugins_paint_xp_AbiPaint.cpp,v 1.2 2019/06/08 10:40:53 rillig Exp $
+
 * Fix seg fault.
+
 --- plugins/paint/xp/AbiPaint.cpp.orig	2013-04-07 13:53:03.000000000 +0000
 +++ plugins/paint/xp/AbiPaint.cpp
 @@ -177,6 +177,9 @@ static DECLARE_ABI_PLUGIN_METHOD(specify
diff --git a/editors/abiword/patches/patch-plugins_wordperfect_xp_Makefile.am b/editors/abiword/patches/patch-plugins_wordperfect_xp_Makefile.am
index d397e59401f..b3197c03ea3 100644
--- a/editors/abiword/patches/patch-plugins_wordperfect_xp_Makefile.am
+++ b/editors/abiword/patches/patch-plugins_wordperfect_xp_Makefile.am
@@ -1,6 +1,8 @@
-$NetBSD: patch-plugins_wordperfect_xp_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+$NetBSD: patch-plugins_wordperfect_xp_Makefile.am,v 1.2 2019/06/08 10:40:53 rillig Exp $
+
 * adapt wordperfect plugins to dependecies available in pkgsrc 
   from abiword svn date 2014-12-27
+
 --- plugins/wordperfect/xp/Makefile.am.orig	2008-05-08 13:12:53.000000000 +0000
 +++ plugins/wordperfect/xp/Makefile.am
 @@ -6,8 +6,6 @@ AM_CPPFLAGS = \
diff --git a/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp b/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp
index c315a1cafcd..2bc594452be 100644
--- a/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp
+++ b/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp
@@ -1,6 +1,8 @@
-$NetBSD: patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp,v 1.1 2015/09/13 21:32:13 nros Exp $
+$NetBSD: patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp,v 1.2 2019/06/08 10:40:53 rillig Exp $
+
 * adapt wordperfect plugins to dependecies available in pkgsrc 
   from abiword svn date 2014-12-27
+
 --- plugins/wordperfect/xp/ie_imp_WordPerfect.cpp.orig	2013-04-07 13:53:03.000000000 +0000
 +++ plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
 @@ -31,6 +31,8 @@
diff --git a/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h b/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h
index 9e9a48a6eb8..e5470f2dd6c 100644
--- a/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h
+++ b/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h
@@ -1,6 +1,8 @@
-$NetBSD: patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h,v 1.1 2015/09/13 21:32:13 nros Exp $
+$NetBSD: patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h,v 1.2 2019/06/08 10:40:53 rillig Exp $
+
 * adapt wordperfect plugins to dependecies available in pkgsrc 
   from abiword svn date 2014-12-27
+
 --- plugins/wordperfect/xp/ie_imp_WordPerfect.h.orig	2013-04-07 13:53:03.000000000 +0000
 +++ plugins/wordperfect/xp/ie_imp_WordPerfect.h
 @@ -30,7 +30,7 @@
diff --git a/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp b/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp
index 1e87a858f54..2a5cbcf415e 100644
--- a/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp
+++ b/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp
@@ -1,6 +1,8 @@
-$NetBSD: patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp,v 1.1 2015/09/13 21:32:13 nros Exp $
+$NetBSD: patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp,v 1.2 2019/06/08 10:40:53 rillig Exp $
+
 * adapt wordperfect plugins to dependecies available in pkgsrc 
   from abiword svn date 2014-12-27
+
 --- plugins/wordperfect/xp/ie_impexp_WordPerfect.cpp.orig	2013-04-07 13:53:03.000000000 +0000
 +++ plugins/wordperfect/xp/ie_impexp_WordPerfect.cpp
 @@ -35,7 +35,6 @@
diff --git a/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h b/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h
index 056bd3ae21c..4317a96eda5 100644
--- a/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h
+++ b/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h
@@ -1,6 +1,8 @@
-$NetBSD: patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h,v 1.1 2015/09/13 21:32:13 nros Exp $
+$NetBSD: patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h,v 1.2 2019/06/08 10:40:53 rillig Exp $
+
 * adapt wordperfect plugins to dependecies available in pkgsrc 
   from abiword svn date 2014-12-27
+
 --- plugins/wordperfect/xp/ie_impexp_WordPerfect.h.orig	2013-04-07 13:53:03.000000000 +0000
 +++ plugins/wordperfect/xp/ie_impexp_WordPerfect.h
 @@ -24,7 +24,6 @@
diff --git a/editors/abiword/patches/patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp b/editors/abiword/patches/patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp
index 1a065d11e44..740d416ca6f 100644
--- a/editors/abiword/patches/patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp
+++ b/editors/abiword/patches/patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp
@@ -1,6 +1,8 @@
-$NetBSD: patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp,v 1.1 2015/09/13 21:32:13 nros Exp $
+$NetBSD: patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp,v 1.2 2019/06/08 10:40:53 rillig Exp $
+
 * adapt wordperfect plugins to dependecies available in pkgsrc 
   from abiword svn date 2014-12-27
+
 --- plugins/wpg/xp/ie_impGraphic_WPG.cpp.orig	2013-04-07 13:53:03.000000000 +0000
 +++ plugins/wpg/xp/ie_impGraphic_WPG.cpp
 @@ -31,37 +31,43 @@
diff --git a/editors/abiword/patches/patch-src_af_util_xp_ut__iconv.cpp b/editors/abiword/patches/patch-src_af_util_xp_ut__iconv.cpp
index 49a3f973a9e..226c952fdd3 100644
--- a/editors/abiword/patches/patch-src_af_util_xp_ut__iconv.cpp
+++ b/editors/abiword/patches/patch-src_af_util_xp_ut__iconv.cpp
@@ -1,5 +1,7 @@
-$NetBSD: patch-src_af_util_xp_ut__iconv.cpp,v 1.1 2015/09/13 21:32:13 nros Exp $
+$NetBSD: patch-src_af_util_xp_ut__iconv.cpp,v 1.2 2019/06/08 10:40:53 rillig Exp $
+
 * NetBSD uses citrus iconv that has UCS-4
+
 --- src/af/util/xp/ut_iconv.cpp.orig	2013-04-07 13:53:03.000000000 +0000
 +++ src/af/util/xp/ut_iconv.cpp
 @@ -267,9 +267,11 @@ const char * ucs4Internal ()
diff --git a/editors/abiword/patches/patch-src_af_util_xp_ut__mbtowc.cpp b/editors/abiword/patches/patch-src_af_util_xp_ut__mbtowc.cpp
index 5d884912871..d068f2ac6b5 100644
--- a/editors/abiword/patches/patch-src_af_util_xp_ut__mbtowc.cpp
+++ b/editors/abiword/patches/patch-src_af_util_xp_ut__mbtowc.cpp
@@ -1,6 +1,8 @@
-$NetBSD: patch-src_af_util_xp_ut__mbtowc.cpp,v 1.1 2015/09/13 21:32:13 nros Exp $
+$NetBSD: patch-src_af_util_xp_ut__mbtowc.cpp,v 1.2 2019/06/08 10:40:53 rillig Exp $
+
 * remove bom if it comes with the conversion
   makes the rulers look correct on startup
+
 --- src/af/util/xp/ut_mbtowc.cpp.orig	2013-04-07 13:53:03.000000000 +0000
 +++ src/af/util/xp/ut_mbtowc.cpp
 @@ -192,7 +192,24 @@ int UT_UCS4_mbtowc::mbtowc (UT_UCS4Char