summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjakllsch <jakllsch@pkgsrc.org>2013-12-31 16:14:15 +0000
committerjakllsch <jakllsch@pkgsrc.org>2013-12-31 16:14:15 +0000
commitd1a2f1ac73c708c5b916415b6d6caa928150bbda (patch)
tree2dfe69195783f7a928038e2b55331418fddd005e
parent89c0ebc70fe60685a015a14c38c2d900f021ccd8 (diff)
downloadpkgsrc-d1a2f1ac73c708c5b916415b6d6caa928150bbda.tar.gz
Update GNU indent to 2.2.10.
Changes since 2.2.9: 2008-03-11 david <indent@isidore-it.eu> * Re-baselined to the FreeBSD indent version to avoid onerous constraints in the old BSD license. * Release version 2.2.10 2007-12-11 david <indent@isidore-it.eu> * Added GPL version 3 as the COPYING file. * Added missing documentation of blf and brf as reported by Tom Tromey <tromey@redhat.com> 2007-11-27 Matthew Wilcox <matthew@wil.cx> * extended --indent-label with negative offsets. -il0 now gives no indentation, -il-2 is the default to match the old behaviour. 2007-11-11 Jean-Christophe Dubois <jcd@tribudubois.net> * added --indent-label and --linux-style options. 2007-02-25 david Ingamells <david@ingamells.eu> * Added doxygen profile and updated source to be better documented with doxygen. * Cleanup of code. 2003-09-28 Erik de Castro Lopo <nospam@bogus.example.com> * indent.c Fixed Bug#212320: --blank-lines-after-procedures does not work * indent.c Fixed Bug#206785: indent segfaults on the attached file
-rw-r--r--devel/gindent/Makefile7
-rw-r--r--devel/gindent/distinfo15
-rw-r--r--devel/gindent/patches/patch-aa16
-rw-r--r--devel/gindent/patches/patch-ab7
-rw-r--r--devel/gindent/patches/patch-ac14
-rw-r--r--devel/gindent/patches/patch-src_lexi.c6
6 files changed, 25 insertions, 40 deletions
diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile
index a3b4ec2689f..72a31af5dca 100644
--- a/devel/gindent/Makefile
+++ b/devel/gindent/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2012/12/06 11:40:58 jperkin Exp $
+# $NetBSD: Makefile,v 1.53 2013/12/31 16:14:15 jakllsch Exp $
#
-DISTNAME= indent-2.2.9
+DISTNAME= indent-2.2.10
PKGNAME= g${DISTNAME}
-PKGREVISION= 3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=indent/}
@@ -11,7 +10,7 @@ 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-v2
+LICENSE= gnu-gpl-v3
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/devel/gindent/distinfo b/devel/gindent/distinfo
index e6c0de11204..9ce871f801a 100644
--- a/devel/gindent/distinfo
+++ b/devel/gindent/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.10 2012/04/17 17:42:33 joerg Exp $
+$NetBSD: distinfo,v 1.11 2013/12/31 16:14:15 jakllsch Exp $
-SHA1 (indent-2.2.9.tar.gz) = 9329422a366a77fca64102282a3ec99c0dd47b83
-RMD160 (indent-2.2.9.tar.gz) = ed858ace1479236ce24725b42c8490095ce06ada
-Size (indent-2.2.9.tar.gz) = 678173 bytes
-SHA1 (patch-aa) = aadb9d20c6fa61840e6c9a66b9cab46ea1f4bcd3
-SHA1 (patch-ab) = 3feeab7810572653916e256645c7a7d8ec93764e
-SHA1 (patch-ac) = eed6b88a80202a03cb8eb33e639d43d0ee99fa91
-SHA1 (patch-src_lexi.c) = bda2219bca12321798330568255e57f2fb6892c1
+SHA1 (indent-2.2.10.tar.gz) = 20fa8a7a4af6670c3254c8b87020291c3db37ed1
+RMD160 (indent-2.2.10.tar.gz) = 66164db3f28ddc9726a56fb184795a335aac34b0
+Size (indent-2.2.10.tar.gz) = 702667 bytes
+SHA1 (patch-aa) = 4fec5c93c44b5635f828cba92e5b955379a39fc9
+SHA1 (patch-ab) = 99a3d46d1713042038deeba323ffe8ce37e3ce75
+SHA1 (patch-src_lexi.c) = 5c7270265ca58c6ce63dd11d2f7c84f0a7fc8812
diff --git a/devel/gindent/patches/patch-aa b/devel/gindent/patches/patch-aa
index 3898c083783..7aff760bcde 100644
--- a/devel/gindent/patches/patch-aa
+++ b/devel/gindent/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.5 2002/08/31 00:29:59 wiz Exp $
+$NetBSD: patch-aa,v 1.6 2013/12/31 16:14:15 jakllsch Exp $
---- doc/Makefile.in.orig Sat Aug 31 02:23:30 2002
+--- doc/Makefile.in.orig 2008-03-11 18:54:15.000000000 +0000
+++ doc/Makefile.in
-@@ -103,7 +103,7 @@ TEXI2PDF = @TEXI2PDF@
-
- info_TEXINFOS = indent.texinfo
-
+@@ -163,7 +163,7 @@ build_vendor = @build_vendor@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
-docdir = $(prefix)/doc/@PACKAGE@
+docdir = $(prefix)/share/doc/@PACKAGE@
dvidir = $(docdir)
- psdir = $(docdir)
- pdfdir = $(docdir)
+ exec_prefix = @exec_prefix@
+ host = @host@
diff --git a/devel/gindent/patches/patch-ab b/devel/gindent/patches/patch-ab
index 5dce8f578e0..5692aaf2fc4 100644
--- a/devel/gindent/patches/patch-ab
+++ b/devel/gindent/patches/patch-ab
@@ -1,13 +1,14 @@
-$NetBSD: patch-ab,v 1.7 2003/03/24 00:06:57 grant Exp $
+$NetBSD: patch-ab,v 1.8 2013/12/31 16:14:15 jakllsch Exp $
---- man/texinfo2man.c.orig Fri Jan 18 06:28:51 2002
+--- man/texinfo2man.c.orig 2008-03-11 18:50:42.000000000 +0000
+++ man/texinfo2man.c
-@@ -1,5 +1,11 @@
+@@ -1,6 +1,12 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdio.h>
+ #include <stdlib.h>
+#ifdef HAVE_MALLOC_H
#include <malloc.h>
+#endif
diff --git a/devel/gindent/patches/patch-ac b/devel/gindent/patches/patch-ac
deleted file mode 100644
index 774075757e0..00000000000
--- a/devel/gindent/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/05/18 14:23:10 minskim Exp $
-
---- src/indent.h.orig 2002-04-23 15:49:24.000000000 -0500
-+++ src/indent.h
-@@ -92,9 +92,6 @@ extern char *cur_line;
- /* Size of the input program, not including the ' \n\0' we add at the end */
- extern unsigned long in_prog_size;
-
--/* The output file. */
--extern FILE *output;
--
-
-
- extern char *labbuf; /* buffer for label */
diff --git a/devel/gindent/patches/patch-src_lexi.c b/devel/gindent/patches/patch-src_lexi.c
index 9d6264963a7..a320322639b 100644
--- a/devel/gindent/patches/patch-src_lexi.c
+++ b/devel/gindent/patches/patch-src_lexi.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_lexi.c,v 1.1 2012/04/17 17:42:33 joerg Exp $
+$NetBSD: patch-src_lexi.c,v 1.2 2013/12/31 16:14:15 jakllsch Exp $
---- src/lexi.c.orig 2012-04-17 16:05:19.000000000 +0000
+--- src/lexi.c.orig 2008-03-11 18:50:42.000000000 +0000
+++ src/lexi.c
-@@ -192,9 +192,6 @@ templ_ty *is_reserved (register const ch
+@@ -211,9 +211,6 @@ templ_ty *is_reserved (const char *str,
#undef MIN_WORD_LENGTH
#undef MAX_WORD_LENGTH