More __inline removal, fixes Darwin. Perform pkglint cleanup while here.

5 files changed, 25 insertions, 10 deletions

diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile
index b6317ad838a..82d7041fcb1 100644
--- a/devel/gindent/Makefile
+++ b/devel/gindent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2014/10/09 14:06:08 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2016/02/15 09:38:10 jperkin Exp $
 #
 
 DISTNAME=	indent-2.2.10
@@ -9,7 +9,6 @@ MASTER_SITES=	${MASTER_SITE_GNU:=indent/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/indent/indent.html
 COMMENT=	GNU version of pretty-printer for C source code
-
 LICENSE=	gnu-gpl-v3
 
 GNU_CONFIGURE=		yes
diff --git a/devel/gindent/distinfo b/devel/gindent/distinfo
index 1312931cd16..74d9f52066b 100644
--- a/devel/gindent/distinfo
+++ b/devel/gindent/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2015/11/03 03:27:28 agc Exp $
+$NetBSD: distinfo,v 1.13 2016/02/15 09:38:10 jperkin Exp $
 
 SHA1 (indent-2.2.10.tar.gz) = 20fa8a7a4af6670c3254c8b87020291c3db37ed1
 RMD160 (indent-2.2.10.tar.gz) = 66164db3f28ddc9726a56fb184795a335aac34b0
 SHA512 (indent-2.2.10.tar.gz) = a90faf1bf855ecc1e0b0f47f4133e4a46be8b2c42bd0aa7f6cf6d764b7883b34b558e3ca443b193b1a747f64cd2653640f1aecbc8a17265c66260f6d6d621e19
 Size (indent-2.2.10.tar.gz) = 702667 bytes
-SHA1 (patch-aa) = 4fec5c93c44b5635f828cba92e5b955379a39fc9
-SHA1 (patch-ab) = 99a3d46d1713042038deeba323ffe8ce37e3ce75
-SHA1 (patch-src_lexi.c) = 5c7270265ca58c6ce63dd11d2f7c84f0a7fc8812
+SHA1 (patch-aa) = c3c8286cfb8152e5168e48f409cab6605faa2bc7
+SHA1 (patch-ab) = edc861a2db0ba16e34c41e9d8984099dedcdc6e7
+SHA1 (patch-src_lexi.c) = 9b8c02c6b77293a55ec534d7758ef39536b9b4ef
diff --git a/devel/gindent/patches/patch-aa b/devel/gindent/patches/patch-aa
index 7aff760bcde..eb5ce67daaa 100644
--- a/devel/gindent/patches/patch-aa
+++ b/devel/gindent/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.6 2013/12/31 16:14:15 jakllsch Exp $
+$NetBSD: patch-aa,v 1.7 2016/02/15 09:38:10 jperkin Exp $
+
+Fix docdir.
 
 --- doc/Makefile.in.orig	2008-03-11 18:54:15.000000000 +0000
 +++ doc/Makefile.in
diff --git a/devel/gindent/patches/patch-ab b/devel/gindent/patches/patch-ab
index 5692aaf2fc4..e303a07c818 100644
--- a/devel/gindent/patches/patch-ab
+++ b/devel/gindent/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.8 2013/12/31 16:14:15 jakllsch Exp $
+$NetBSD: patch-ab,v 1.9 2016/02/15 09:38:10 jperkin Exp $
+
+Fix includes.
 
 --- man/texinfo2man.c.orig	2008-03-11 18:50:42.000000000 +0000
 +++ man/texinfo2man.c
diff --git a/devel/gindent/patches/patch-src_lexi.c b/devel/gindent/patches/patch-src_lexi.c
index a320322639b..5c48f544ce6 100644
--- a/devel/gindent/patches/patch-src_lexi.c
+++ b/devel/gindent/patches/patch-src_lexi.c
@@ -1,8 +1,20 @@
-$NetBSD: patch-src_lexi.c,v 1.2 2013/12/31 16:14:15 jakllsch Exp $
+$NetBSD: patch-src_lexi.c,v 1.3 2016/02/15 09:38:10 jperkin Exp $
+
+Remove bogus __inline.
 
 --- src/lexi.c.orig	2008-03-11 18:50:42.000000000 +0000
 +++ src/lexi.c
-@@ -211,9 +211,6 @@ templ_ty *is_reserved (const char *str, 
+@@ -197,9 +197,6 @@ int main (void)
+ #endif
+ 
+ /* Include code generated by gperf */
+-#ifdef __GNUC__
+-__inline
+-#endif
+ templ_ty *is_reserved (const char *str, unsigned int len);
+ 
+ #include "gperf.c"
+@@ -211,9 +208,6 @@ templ_ty *is_reserved (const char *str, 
  #undef MIN_WORD_LENGTH
  #undef MAX_WORD_LENGTH