diff options
| author | Johan van Selst <johans@FreeBSD.org> | 2009-03-08 13:44:40 +0000 |
|---|---|---|
| committer | Johan van Selst <johans@FreeBSD.org> | 2009-03-08 13:44:40 +0000 |
| commit | e18f9972729329931554d7e100f4fe15903bf2f3 (patch) | |
| tree | a59fc32ee1744dae803c5de5ef22b4b2f92d1bfe /devel/gindent | |
| parent | 12ccbf6bf5bb8cf58361e2f544b2c0c2354388d4 (diff) | |
Notes
Diffstat (limited to 'devel/gindent')
| -rw-r--r-- | devel/gindent/Makefile | 5 | ||||
| -rw-r--r-- | devel/gindent/distinfo | 6 | ||||
| -rw-r--r-- | devel/gindent/files/patch-args.c | 31 | ||||
| -rw-r--r-- | devel/gindent/files/patch-doc:Makefile.in | 10 |
4 files changed, 28 insertions, 24 deletions
diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile index a677b6e4950c..7a9ac824ba1a 100644 --- a/devel/gindent/Makefile +++ b/devel/gindent/Makefile @@ -7,14 +7,13 @@ # PORTNAME= gindent -PORTVERSION= 2.2.9 -PORTREVISION= 2 +PORTVERSION= 2.2.10 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= indent DISTNAME= indent-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= johans@stack.nl COMMENT= GNU indent GNU_CONFIGURE= yes diff --git a/devel/gindent/distinfo b/devel/gindent/distinfo index bfdb14349ef3..7e45907cd9a1 100644 --- a/devel/gindent/distinfo +++ b/devel/gindent/distinfo @@ -1,3 +1,3 @@ -MD5 (indent-2.2.9.tar.gz) = dcdbb163bef928306dee2a0cfc581c89 -SHA256 (indent-2.2.9.tar.gz) = 0b9387bda5639ed54cf91bd607ab055624a07414f7f6882a75be97fd776ce466 -SIZE (indent-2.2.9.tar.gz) = 678173 +MD5 (indent-2.2.10.tar.gz) = be35ea62705733859fbf8caf816d8959 +SHA256 (indent-2.2.10.tar.gz) = 8a9b41be5bfcab5d8c1be74204b10ae78789fc3deabea0775fdced8677292639 +SIZE (indent-2.2.10.tar.gz) = 702667 diff --git a/devel/gindent/files/patch-args.c b/devel/gindent/files/patch-args.c index 42d3d0540b10..970bdf148f61 100644 --- a/devel/gindent/files/patch-args.c +++ b/devel/gindent/files/patch-args.c @@ -1,16 +1,16 @@ ---- src/args.c.orig Mon Nov 11 06:02:48 2002 -+++ src/args.c Mon Mar 1 20:21:53 2004 -@@ -122,6 +122,7 @@ - static int exp_hnl = 0; +--- src/args.c.orig 2008-03-11 19:50:42.000000000 +0100 ++++ src/args.c 2009-03-08 13:04:43.000000000 +0100 +@@ -163,6 +163,7 @@ static int exp_i = 0; + static int exp_il = 0; static int exp_ip = 0; +static int exp_knf = 0; static int exp_kr = 0; static int exp_l = 0; static int exp_lc = 0; -@@ -189,6 +190,30 @@ - * variable must share the explicit flag. */ - } pro_ty; +@@ -237,6 +238,30 @@ + + static void usage (void); +#define BSD_PRO_SETTINGS {"orig", PRO_SETTINGS, 0, ONOFF_NA,\ + (int *) "-nbap\0-nbad\0-bbo\0-hnl\0-bc\0-br\0-brs\0-c33\0-cd33\0-cdb\0-ce\0\ @@ -37,9 +37,9 @@ + &exp_gnu} + #ifdef BERKELEY_DEFAULTS - /* Settings for original defaults */ - const pro_ty pro[] = -@@ -212,61 +237,64 @@ + + /** +@@ -264,63 +289,66 @@ #endif {"pi", PRO_INT, -1, ONOFF_NA, &settings.paren_indent, &exp_pi}, {"pcs", PRO_BOOL, false, ON, &settings.proc_calls_space, &exp_pcs}, @@ -99,6 +99,7 @@ {"nbadp", PRO_BOOL, false, OFF, &settings.blanklines_after_declarations_at_proctop, &exp_badp}, {"nbad", PRO_BOOL, false, OFF, &settings.blanklines_after_declarations, &exp_bad}, {"nbacc", PRO_BOOL, false, OFF, &settings.blanklines_around_conditional_compilation, &exp_bacc}, + {"linux", PRO_SETTINGS, 0, ONOFF_NA, LINUX_SETTINGS_STRING, &exp_linux}, {"lps", PRO_BOOL, false, ON, &settings.leave_preproc_space, &exp_lps}, - {"lp", PRO_BOOL, true, ON, &settings.lineup_to_parens, &exp_lp}, + {"lp", PRO_BOOL, false, ON, &settings.lineup_to_parens, &exp_lp}, @@ -112,6 +113,7 @@ + KNF_PRO_SETTINGS, + {"ip", PRO_INT, 8, ONOFF_NA, &settings.indent_parameters, &exp_ip}, + {"i", PRO_INT, 8, ONOFF_NA, &settings.ind_size, &exp_i}, + {"il", PRO_INT, DEFAULT_LABEL_INDENT, ONOFF_NA, &settings.label_offset, &exp_il}, {"hnl", PRO_BOOL, true, ON, &settings.honour_newlines, &exp_hnl}, {"h", PRO_FUNCTION, 0, ONOFF_NA, (int *) usage, &exp_version}, - {"gnu", PRO_SETTINGS, 0, ONOFF_NA, GNU_SETTINGS_STRING, &exp_gnu}, @@ -130,7 +132,7 @@ {"cp", PRO_INT, 33, ONOFF_NA, &settings.else_endif_col, &exp_cp}, {"cli", PRO_INT, 0, ONOFF_NA, &settings.case_indent, &exp_cli}, {"ci", PRO_INT, 4, ONOFF_NA, &settings.continuation_indent, &exp_ci}, -@@ -287,12 +315,12 @@ +@@ -341,12 +369,12 @@ {"bl", PRO_BOOL, true, OFF, &settings.btype_2, &exp_bl}, {"bfda", PRO_BOOL, false, ON, &settings.break_function_decl_args, &exp_bfda}, {"bfde", PRO_BOOL, false, ON, &settings.break_function_decl_args_end, &exp_bfde}, @@ -147,7 +149,7 @@ {"bacc", PRO_BOOL, false, ON, &settings.blanklines_around_conditional_compilation, &exp_bacc}, {"T", PRO_KEY, 0, ONOFF_NA, 0, &exp_T}, {"ppi", PRO_INT, 0, ONOFF_NA, &settings.force_preproc_width, &exp_ppi}, -@@ -324,7 +352,7 @@ +@@ -381,7 +409,7 @@ #endif {"pi", PRO_INT, -1, ONOFF_NA, &settings.paren_indent, &exp_pi}, {"pcs", PRO_BOOL, true, ON, &settings.proc_calls_space, &exp_pcs}, @@ -156,13 +158,14 @@ {"o", PRO_BOOL, false, ON, &settings.expect_output_file, &exp_o}, {"nv", PRO_BOOL, false, OFF, &settings.verbose, &exp_v}, {"nut", PRO_BOOL, true, OFF, &settings.use_tabs, &exp_ut}, -@@ -367,13 +395,14 @@ +@@ -425,14 +453,15 @@ {"lp", PRO_BOOL, true, ON, &settings.lineup_to_parens, &exp_lp}, {"lc", PRO_INT, DEFAULT_RIGHT_COMMENT_MARGIN, ONOFF_NA, &settings.comment_max_col, &exp_lc}, {"l", PRO_INT, DEFAULT_RIGHT_MARGIN, ONOFF_NA, &settings.max_col, &exp_l}, - {"kr", PRO_SETTINGS, 0, ONOFF_NA, KR_SETTINGS_STRING, &exp_kr}, + KR_PRO_SETTINGS, + KNF_PRO_SETTINGS, + {"il", PRO_INT, DEFAULT_LABEL_INDENT, ONOFF_NA, &settings.label_offset, &exp_il}, {"ip", PRO_INT, 5, ONOFF_NA, &settings.indent_parameters, &exp_ip}, {"i", PRO_INT, 2, ONOFF_NA, &settings.ind_size, &exp_i}, {"hnl", PRO_BOOL, true, ON, &settings.honour_newlines, &exp_hnl}, @@ -173,7 +176,7 @@ {"fca", PRO_BOOL, false, ON, &settings.format_comments, &exp_fca}, {"fc1", PRO_BOOL, false, ON, &settings.format_col1_comments, &exp_fc1}, {"eei", PRO_BOOL, false, ON, &settings.extra_expression_indent, &exp_eei}, -@@ -531,6 +560,9 @@ +@@ -593,6 +622,9 @@ {"blank-lines-after-declarations", "bad"}, {"blank-lines-after-commas", "bc"}, {"blank-before-sizeof", "bs"}, diff --git a/devel/gindent/files/patch-doc:Makefile.in b/devel/gindent/files/patch-doc:Makefile.in index 2c5664e7231d..9fedacf5a048 100644 --- a/devel/gindent/files/patch-doc:Makefile.in +++ b/devel/gindent/files/patch-doc:Makefile.in @@ -1,12 +1,14 @@ ---- doc/Makefile.in.orig Wed May 22 04:01:16 2002 -+++ doc/Makefile.in Sun Sep 15 03:21:16 2002 -@@ -364,9 +364,9 @@ +--- doc/Makefile.in.orig 2008-03-11 19:54:15.000000000 +0100 ++++ doc/Makefile.in 2009-03-08 13:35:49.000000000 +0100 +@@ -602,10 +602,10 @@ + uninstall-pdf-am uninstall-ps-am - all-local: html +-all-local: html -install-data-local: install-html -installdirs-local: installdirs-html -uninstall-local: uninstall-html ++all-local: # html +install-data-local: # install-html +installdirs-local: # installdirs-html +uninstall-local: # uninstall-html |