diff options
Diffstat (limited to 'devel/gindent')
| -rw-r--r-- | devel/gindent/Makefile | 2 | ||||
| -rw-r--r-- | devel/gindent/files/patch-ab | 5 | ||||
| -rw-r--r-- | devel/gindent/files/patch-args.c | 14 | ||||
| -rw-r--r-- | devel/gindent/files/patch-doc:Makefile.in | 2 | ||||
| -rw-r--r-- | devel/gindent/files/patch-indent.h | 14 | ||||
| -rw-r--r-- | devel/gindent/files/patch-output.c | 8 |
6 files changed, 31 insertions, 14 deletions
diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile index b7bdc165955f..c9e69afa9c87 100644 --- a/devel/gindent/Makefile +++ b/devel/gindent/Makefile @@ -8,7 +8,7 @@ PORTNAME= gindent PORTVERSION= 2.2.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= indent diff --git a/devel/gindent/files/patch-ab b/devel/gindent/files/patch-ab index ed887bcd50cc..63642a8ad7f5 100644 --- a/devel/gindent/files/patch-ab +++ b/devel/gindent/files/patch-ab @@ -1,5 +1,5 @@ ---- doc/indent.texinfo.orig Tue May 21 14:40:06 2002 -+++ doc/indent.texinfo Sun Jul 14 23:20:41 2002 +--- doc/indent.texinfo.orig 2008-03-11 19:50:42.000000000 +0100 ++++ doc/indent.texinfo 2010-06-27 16:29:17.000000000 +0200 @@ -13,7 +13,7 @@ @dircategory Indent Code Formatter @@ -8,3 +8,4 @@ +* GNU indent: (indent). C code formatter. @end direntry + diff --git a/devel/gindent/files/patch-args.c b/devel/gindent/files/patch-args.c index 970bdf148f61..81fc4266598b 100644 --- a/devel/gindent/files/patch-args.c +++ b/devel/gindent/files/patch-args.c @@ -1,5 +1,5 @@ --- src/args.c.orig 2008-03-11 19:50:42.000000000 +0100 -+++ src/args.c 2009-03-08 13:04:43.000000000 +0100 ++++ src/args.c 2010-06-27 16:29:54.000000000 +0200 @@ -163,6 +163,7 @@ static int exp_i = 0; static int exp_il = 0; @@ -72,8 +72,9 @@ + {"npcs", PRO_BOOL, true, OFF, &settings.proc_calls_space, &exp_pcs}, {"nlps", PRO_BOOL, false, OFF, &settings.leave_preproc_space, &exp_lps}, {"nlp", PRO_BOOL, true, OFF, &settings.lineup_to_parens, &exp_lp}, - {"nip", PRO_SETTINGS, 0, ONOFF_NA, (int *) "-ip0", &exp_nip}, +- {"nip", PRO_SETTINGS, 0, ONOFF_NA, (int *) "-ip0", &exp_nip}, - {"nhnl", PRO_BOOL, true, OFF, &settings.honour_newlines, &exp_hnl}, ++ {"nip", PRO_SETTINGS, 0, ONOFF_NA, (int *) "-ip0\0", &exp_nip}, + {"nhnl", PRO_BOOL, false, OFF, &settings.honour_newlines, &exp_hnl}, {"nfca", PRO_BOOL, true, OFF, &settings.format_comments, &exp_fca}, {"nfc1", PRO_BOOL, true, OFF, &settings.format_col1_comments, &exp_fc1}, @@ -186,3 +187,12 @@ {"berkeley-style", "orig"}, {"berkeley", "orig"}, {"Bill-Shannon", "bs"}, +@@ -798,7 +830,7 @@ + + if (!found) + { +- DieError(invocation_error, _("%s: unknown option \"%s\"\n"), option_source, option - 1); ++ DieError(invocation_error, _("%s: unknown option \"%s\"\n"), option_source, option - option_length); + } + else + { diff --git a/devel/gindent/files/patch-doc:Makefile.in b/devel/gindent/files/patch-doc:Makefile.in index 9fedacf5a048..fe00ee8130c5 100644 --- a/devel/gindent/files/patch-doc:Makefile.in +++ b/devel/gindent/files/patch-doc:Makefile.in @@ -1,5 +1,5 @@ --- doc/Makefile.in.orig 2008-03-11 19:54:15.000000000 +0100 -+++ doc/Makefile.in 2009-03-08 13:35:49.000000000 +0100 ++++ doc/Makefile.in 2010-06-27 16:29:17.000000000 +0200 @@ -602,10 +602,10 @@ uninstall-pdf-am uninstall-ps-am diff --git a/devel/gindent/files/patch-indent.h b/devel/gindent/files/patch-indent.h index 3443405d7049..50a47d49475f 100644 --- a/devel/gindent/files/patch-indent.h +++ b/devel/gindent/files/patch-indent.h @@ -1,8 +1,14 @@ ---- src/indent.h.orig Thu Nov 16 19:01:04 2000 -+++ src/indent.h Fri Apr 20 01:16:45 2001 -@@ -63 +63 @@ +--- src/indent.h.orig 2008-03-11 19:50:42.000000000 +0100 ++++ src/indent.h 2010-06-27 16:29:17.000000000 +0200 +@@ -135,9 +135,9 @@ + bb_cast + } bb_code_ty; + -#define DEFAULT_RIGHT_MARGIN 78 +#define DEFAULT_RIGHT_MARGIN 79 -@@ -65 +65 @@ + -#define DEFAULT_RIGHT_COMMENT_MARGIN 78 +#define DEFAULT_RIGHT_COMMENT_MARGIN 79 + + #define DEFAULT_LABEL_INDENT -2 + diff --git a/devel/gindent/files/patch-output.c b/devel/gindent/files/patch-output.c index d9b5b6f36b96..e1537bbbfe35 100644 --- a/devel/gindent/files/patch-output.c +++ b/devel/gindent/files/patch-output.c @@ -1,8 +1,8 @@ ---- src/output.c.orig Mon May 21 23:45:36 2007 -+++ src/output.c Mon May 21 23:47:36 2007 -@@ -23,7 +23,7 @@ +--- src/output.c.orig 2008-03-11 19:50:42.000000000 +0100 ++++ src/output.c 2010-06-27 16:29:17.000000000 +0200 +@@ -71,7 +71,7 @@ - RCSTAG_CC ("$Id: output.c,v 1.5 2002/12/12 17:36:49 david Exp $"); + RCSTAG_CC ("$Id$"); -static FILE * output = NULL; +FILE * output = NULL; |