From 01eafafc7414dddc44f98b660bc5c7504f8e4753 Mon Sep 17 00:00:00 2001 From: Ying-Chieh Liao Date: Tue, 25 Jun 2002 06:38:17 +0000 Subject: upgrade to 2.2.8 --- devel/gindent/Makefile | 11 +- devel/gindent/distinfo | 2 +- devel/gindent/files/patch-ab | 4 +- devel/gindent/files/patch-args.c | 326 ++++++++++++++---------------- devel/gindent/files/patch-doc:Makefile.in | 11 + devel/gindent/files/patch-indent.h | 4 +- devel/gindent/files/patch-man:Makefile.in | 11 + devel/gindent/pkg-plist | 18 ++ 8 files changed, 207 insertions(+), 180 deletions(-) create mode 100644 devel/gindent/files/patch-doc:Makefile.in create mode 100644 devel/gindent/files/patch-man:Makefile.in (limited to 'devel') diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile index 173a6d27b7c5..6439766c0f63 100644 --- a/devel/gindent/Makefile +++ b/devel/gindent/Makefile @@ -7,16 +7,21 @@ # PORTNAME= gindent -PORTVERSION= 2.2.6 +PORTVERSION= 2.2.8 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GNU} +MASTER_SITES= ${MASTER_SITE_GNU} \ + http://home.hccnet.nl/d.ingamells/ MASTER_SITE_SUBDIR= indent DISTNAME= indent-${PORTVERSION} MAINTAINER= ports@FreeBSD.org +LIB_DEPENDS= intl:${PORTSDIR}/devel/gettext + GNU_CONFIGURE= yes -CONFIGURE_ARGS= --program-prefix=g +CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS= --program-prefix=g --without-included-gettext MAKE_ARGS= BERKELEY_DEFAULTS=1 MAN1= gindent.1 diff --git a/devel/gindent/distinfo b/devel/gindent/distinfo index 1e7c1ffdae2a..411e0e81915c 100644 --- a/devel/gindent/distinfo +++ b/devel/gindent/distinfo @@ -1 +1 @@ -MD5 (indent-2.2.6.tar.gz) = 1f5f9b27226a3292f857fedcd12a07e4 +MD5 (indent-2.2.8.tar.gz) = fd3c30955dbf8e410cb5d60ae39630c0 diff --git a/devel/gindent/files/patch-ab b/devel/gindent/files/patch-ab index f1df66017df7..7db2e33472c0 100644 --- a/devel/gindent/files/patch-ab +++ b/devel/gindent/files/patch-ab @@ -1,5 +1,5 @@ ---- indent.texinfo.orig Thu Nov 16 10:46:14 2000 -+++ indent.texinfo Sat Nov 18 05:16:14 2000 +--- doc/indent.texinfo.orig Thu Nov 16 10:46:14 2000 ++++ doc/indent.texinfo Sat Nov 18 05:16:14 2000 @@ -17,7 +17,7 @@ @ifinfo @dircategory Indent Code Formatter diff --git a/devel/gindent/files/patch-args.c b/devel/gindent/files/patch-args.c index b3f9e478e829..7d02169efc6a 100644 --- a/devel/gindent/files/patch-args.c +++ b/devel/gindent/files/patch-args.c @@ -1,22 +1,22 @@ ---- args.c.orig Thu Nov 16 19:01:04 2000 -+++ args.c Fri Apr 20 01:32:52 2001 +--- src/args.c.orig Tue Jun 25 14:00:57 2002 ++++ src/args.c Tue Jun 25 14:16:00 2002 @@ -1,3 +1,5 @@ +#define BERKELEY_DEFAULTS 1 + /* Copyright (c) 1999, 2000 Carlo Wood. All rights reserved. - Copyright (c) 1994 Joseph Arceneaux. All rights reserved. - Copyright (c) 1992 Free Software Foundation, Inc. All rights reserved. -@@ -92,6 +94,7 @@ - static int exp_hnl; - static int exp_i; - static int exp_ip; -+static int exp_knf; - static int exp_kr; - static int exp_l; - static int exp_lc; -@@ -208,6 +211,30 @@ - int *p_explicit; - }; + * Copyright (c) 1994 Joseph Arceneaux. All rights reserved. + * Copyright (c) 1992 Free Software Foundation, Inc. All rights reserved. +@@ -113,6 +115,7 @@ + static int exp_hnl = 0; + static int exp_i = 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; +@@ -179,6 +182,30 @@ + * variable must share the explicit flag. */ + } pro_ty; +#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\ @@ -44,165 +44,147 @@ + #ifdef BERKELEY_DEFAULTS /* Settings for original defaults */ - struct pro pro[] = { -@@ -230,39 +257,40 @@ + const pro_ty pro[] = +@@ -202,60 +229,63 @@ #endif - {"pi", PRO_INT, -1, ONOFF_NA, &paren_indent, &exp_pi}, - {"pcs", PRO_BOOL, false, ON, &proc_calls_space, &exp_pcs}, -+ BSD_PRO_SETTINGS, - {"o", PRO_BOOL, false, ON, &expect_output_file, &expect_output_file}, - {"nv", PRO_BOOL, false, OFF, &verbose, &exp_v}, -- {"nut", PRO_BOOL, true, OFF, &use_tabs, &exp_ut}, -- {"nss", PRO_BOOL, false, OFF, &space_sp_semicolon, &exp_ss}, -- {"nsob", PRO_BOOL, false, OFF, &swallow_optional_blanklines, &exp_sob}, -- {"nsc", PRO_BOOL, true, OFF, &star_comment_cont, &exp_sc}, -- {"nsaw", PRO_BOOL, true, OFF, &space_after_while, &exp_saw}, -- {"nsai", PRO_BOOL, true, OFF, &space_after_if, &exp_sai}, -- {"nsaf", PRO_BOOL, true, OFF, &space_after_for, &exp_saf}, -- {"npsl", PRO_BOOL, true, OFF, &procnames_start_line, &exp_psl}, -- {"nprs", PRO_BOOL, false, OFF, &parentheses_space, &exp_prs}, -+ {"nut", PRO_BOOL, false, OFF, &use_tabs, &exp_ut}, -+ {"nss", PRO_BOOL, true, OFF, &space_sp_semicolon, &exp_ss}, -+ {"nsob", PRO_BOOL, true, OFF, &swallow_optional_blanklines, &exp_sob}, -+ {"nsc", PRO_BOOL, false, OFF, &star_comment_cont, &exp_sc}, -+ {"nsaw", PRO_BOOL, false, OFF, &space_after_while, &exp_saw}, -+ {"nsai", PRO_BOOL, false, OFF, &space_after_if, &exp_sai}, -+ {"nsaf", PRO_BOOL, false, OFF, &space_after_for, &exp_saf}, -+ {"npsl", PRO_BOOL, false, OFF, &procnames_start_line, &exp_psl}, -+ {"nprs", PRO_BOOL, true, OFF, &parentheses_space, &exp_prs}, - {"npro", PRO_IGN, 0, ONOFF_NA, 0, &exp_pro}, + {"pi", PRO_INT, -1, ONOFF_NA, &settings.paren_indent, &exp_pi}, + {"pcs", PRO_BOOL, false, ON, &settings.proc_calls_space, &exp_pcs}, ++ BSD_PRO_SETTINGS, + {"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}, +- {"nss", PRO_BOOL, false, OFF, &settings.space_sp_semicolon, &exp_ss}, +- {"nsob", PRO_BOOL, false, OFF, &settings.swallow_optional_blanklines, &exp_sob}, +- {"nsc", PRO_BOOL, true, OFF, &settings.star_comment_cont, &exp_sc}, +- {"nsaw", PRO_BOOL, true, OFF, &settings.space_after_while, &exp_saw}, +- {"nsai", PRO_BOOL, true, OFF, &settings.space_after_if, &exp_sai}, +- {"nsaf", PRO_BOOL, true, OFF, &settings.space_after_for, &exp_saf}, +- {"npsl", PRO_BOOL, true, OFF, &settings.procnames_start_line, &exp_psl}, +- {"nprs", PRO_BOOL, false, OFF, &settings.parentheses_space, &exp_prs}, ++ {"nut", PRO_BOOL, false, OFF, &settings.use_tabs, &exp_ut}, ++ {"nss", PRO_BOOL, true, OFF, &settings.space_sp_semicolon, &exp_ss}, ++ {"nsob", PRO_BOOL, true, OFF, &settings.swallow_optional_blanklines, &exp_sob}, ++ {"nsc", PRO_BOOL, false, OFF, &settings.star_comment_cont, &exp_sc}, ++ {"nsaw", PRO_BOOL, false, OFF, &settings.space_after_while, &exp_saw}, ++ {"nsai", PRO_BOOL, false, OFF, &settings.space_after_if, &exp_sai}, ++ {"nsaf", PRO_BOOL, false, OFF, &settings.space_after_for, &exp_saf}, ++ {"npsl", PRO_BOOL, false, OFF, &settings.procnames_start_line, &exp_psl}, ++ {"nprs", PRO_BOOL, true, OFF, &settings.parentheses_space, &exp_prs}, + {"npro", PRO_IGN, 0, ONOFF_NA, 0, &exp_pro}, #ifdef PRESERVE_MTIME - {"npmt", PRO_BOOL, false, OFF, &preserve_mtime, &exp_pmt}, + {"npmt", PRO_BOOL, false, OFF, &settings.preserve_mtime, &exp_pmt}, #endif -- {"npcs", PRO_BOOL, false, OFF, &proc_calls_space, &exp_pcs}, -+ {"npcs", PRO_BOOL, true, OFF, &proc_calls_space, &exp_pcs}, - {"nlps", PRO_BOOL, false, OFF, &leave_preproc_space, &exp_lps}, - {"nlp", PRO_BOOL, true, OFF, &lineup_to_parens, &exp_lp}, - {"nip", PRO_SETTINGS, 0, ONOFF_NA, (int *) "-ip0", &exp_nip}, -- {"nhnl", PRO_BOOL, true, OFF, &honour_newlines, &exp_hnl}, -+ {"nhnl", PRO_BOOL, false, OFF, &honour_newlines, &exp_hnl}, - {"nfca", PRO_BOOL, true, OFF, &format_comments, &exp_fca}, - {"nfc1", PRO_BOOL, true, OFF, &format_col1_comments, &exp_fc1}, - {"neei", PRO_BOOL, false, OFF, &extra_expression_indent, &exp_eei}, -- {"ndj", PRO_BOOL, false, OFF, &ljust_decl, &exp_dj}, -- {"ncs", PRO_BOOL, true, OFF, &cast_space, &exp_cs}, -- {"nce", PRO_BOOL, true, OFF, &cuddle_else, &exp_ce}, -+ {"ndj", PRO_BOOL, true, OFF, &ljust_decl, &exp_dj}, -+ {"ncs", PRO_BOOL, false, OFF, &cast_space, &exp_cs}, -+ {"nce", PRO_BOOL, false, OFF, &cuddle_else, &exp_ce}, - {"ncdw", PRO_BOOL, false, OFF, &cuddle_do_while, &exp_cdw}, -- {"ncdb", PRO_BOOL, true, OFF, &comment_delimiter_on_blankline, &exp_cdb}, -+ {"ncdb", PRO_BOOL, false, OFF, &comment_delimiter_on_blankline, &exp_cdb}, - {"nbs", PRO_BOOL, false, OFF, &blank_after_sizeof, &exp_bs}, - {"nbfda", PRO_BOOL, false, OFF, &break_function_decl_args, &exp_bfda}, - {"nbc", PRO_BOOL, true, ON, &leave_comma, &exp_bc}, -- {"nbbo", PRO_BOOL, true, OFF, &break_before_boolean_operator, &exp_bbo}, -- {"nbbb", PRO_BOOL, false, OFF, &blanklines_before_blockcomments, &exp_bbb}, -+ {"nbbo", PRO_BOOL, false, OFF, &break_before_boolean_operator, &exp_bbo}, -+ {"nbbb", PRO_BOOL, true, OFF, &blanklines_before_blockcomments, &exp_bbb}, - {"nbap", PRO_BOOL, false, OFF, &blanklines_after_procs, &exp_bap}, - {"nbadp", PRO_BOOL, false, OFF, - &blanklines_after_declarations_at_proctop, &exp_badp}, -@@ -270,29 +298,25 @@ - {"nbacc", PRO_BOOL, false, OFF, - &blanklines_around_conditional_compilation, &exp_bacc}, - {"lps", PRO_BOOL, false, ON, &leave_preproc_space, &exp_lps}, -- {"lp", PRO_BOOL, true, ON, &lineup_to_parens, &exp_lp}, -+ {"lp", PRO_BOOL, false, ON, &lineup_to_parens, &exp_lp}, - {"lc", PRO_INT, DEFAULT_RIGHT_COMMENT_MARGIN, - ONOFF_NA, &comment_max_col, &exp_lc}, - {"l", PRO_INT, DEFAULT_RIGHT_MARGIN, ONOFF_NA, &max_col, &exp_l}, -- {"kr", PRO_SETTINGS, 0, ONOFF_NA, -- (int *) "-nbad\0-bap\0-nbc\0-bbo\0-hnl\0-br\0-brs\0-c33\0-cd33\0-ncdb\0\ ---ce\0-ci4\0-cli0\0-d0\0-di1\0-nfc1\0-i4\0-ip0\0-l75\0-lp\0-npcs\0-nprs\0-npsl\0\ ---cs\0-sai\0-saw\0-saf\0-nsc\0-nsc\0-nsob\0-nfca\0-cp33\0-nss\0", &exp_kr}, -- {"ip", PRO_INT, 4, ONOFF_NA, &indent_parameters, &exp_ip}, -- {"i", PRO_INT, 4, ONOFF_NA, &ind_size, &exp_i}, -+ KR_PRO_SETTINGS, +- {"npcs", PRO_BOOL, false, OFF, &settings.proc_calls_space, &exp_pcs}, ++ {"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}, +- {"nhnl", PRO_BOOL, true, OFF, &settings.honour_newlines, &exp_hnl}, ++ {"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}, + {"neei", PRO_BOOL, false, OFF, &settings.extra_expression_indent, &exp_eei}, +- {"ndj", PRO_BOOL, false, OFF, &settings.ljust_decl, &exp_dj}, +- {"ncs", PRO_BOOL, true, OFF, &settings.cast_space, &exp_cs}, +- {"nce", PRO_BOOL, true, OFF, &settings.cuddle_else, &exp_ce}, ++ {"ndj", PRO_BOOL, true, OFF, &settings.ljust_decl, &exp_dj}, ++ {"ncs", PRO_BOOL, false, OFF, &settings.cast_space, &exp_cs}, ++ {"nce", PRO_BOOL, false, OFF, &settings.cuddle_else, &exp_ce}, + {"ncdw", PRO_BOOL, false, OFF, &settings.cuddle_do_while, &exp_cdw}, +- {"ncdb", PRO_BOOL, true, OFF, &settings.comment_delimiter_on_blankline, &exp_cdb}, ++ {"ncdb", PRO_BOOL, false, OFF, &settings.comment_delimiter_on_blankline, &exp_cdb}, + {"nbs", PRO_BOOL, false, OFF, &settings.blank_after_sizeof, &exp_bs}, + {"nbfda", PRO_BOOL, false, OFF, &settings.break_function_decl_args, &exp_bfda}, + {"nbc", PRO_BOOL, true, ON, &settings.leave_comma, &exp_bc}, +- {"nbbo", PRO_BOOL, true, OFF, &settings.break_before_boolean_operator, &exp_bbo}, +- {"nbbb", PRO_BOOL, false, OFF, &settings.blanklines_before_blockcomments, &exp_bbb}, ++ {"nbbo", PRO_BOOL, false, OFF, &settings.break_before_boolean_operator, &exp_bbo}, ++ {"nbbb", PRO_BOOL, true, OFF, &settings.blanklines_before_blockcomments, &exp_bbb}, + {"nbap", PRO_BOOL, false, OFF, &settings.blanklines_after_procs, &exp_bap}, + {"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}, + {"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}, + {"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}, +- {"ip", PRO_INT, 4, ONOFF_NA, &settings.indent_parameters, &exp_ip}, +- {"i", PRO_INT, 4, ONOFF_NA, &settings.ind_size, &exp_i}, ++ KR_PRO_SETTINGS, +/* This is now the default. */ -+ KNF_PRO_SETTINGS, -+ {"ip", PRO_INT, 8, ONOFF_NA, &indent_parameters, &exp_ip}, -+ {"i", PRO_INT, 8, ONOFF_NA, &ind_size, &exp_i}, - {"hnl", PRO_BOOL, true, ON, &honour_newlines, &exp_hnl}, - {"h", PRO_FUNCTION, 0, ONOFF_NA, (int *) usage, &exp_version}, -- {"gnu", PRO_SETTINGS, 0, ONOFF_NA, -- (int *) "-nbad\0-bap\0-bbo\0-hnl\0-nbc\0-bl\0-bls\0-ncdb\0-cs\0-nce\0\ ---di2\0-ndj\0-nfc1\0-i2\0-ip5\0-lp\0-pcs\0-nprs\0-psl\0-nsc\0-sai\0-saf\0-saw\0-nsob\0\ ---bli2\0-cp1\0-nfca\0", &exp_gnu}, -- {"fca", PRO_BOOL, true, ON, &format_comments, &exp_fca}, -- {"fc1", PRO_BOOL, true, ON, &format_col1_comments, &exp_fc1}, -+ GNU_PRO_SETTINGS, -+ {"fca", PRO_BOOL, false, ON, &format_comments, &exp_fca}, -+ {"fc1", PRO_BOOL, false, ON, &format_col1_comments, &exp_fc1}, - {"eei", PRO_BOOL, false, ON, &extra_expression_indent, &exp_eei}, - {"dj", PRO_BOOL, false, ON, &ljust_decl, &exp_dj}, -- {"di", PRO_INT, 16, ONOFF_NA, &decl_indent, &exp_di}, -+ {"di", PRO_INT, 0, ONOFF_NA, &decl_indent, &exp_di}, - {"d", PRO_INT, 0, ONOFF_NA, &unindent_displace, &exp_d}, -- {"cs", PRO_BOOL, true, ON, &cast_space, &exp_cs}, -+ {"cs", PRO_BOOL, false, ON, &cast_space, &exp_cs}, - {"cp", PRO_INT, 33, ONOFF_NA, &else_endif_col, &exp_cp}, - {"cli", PRO_INT, 0, ONOFF_NA, &case_indent, &exp_cli}, - {"ci", PRO_INT, 4, ONOFF_NA, &continuation_indent, &exp_ci}, -@@ -311,12 +335,12 @@ - {"bli", PRO_INT, 0, ONOFF_NA, &brace_indent, &exp_bli}, - {"bl", PRO_BOOL, true, OFF, &btype_2, &exp_bl}, - {"bfda", PRO_BOOL, false, ON, &break_function_decl_args, &exp_bfda}, -- {"bc", PRO_BOOL, true, OFF, &leave_comma, &exp_bc}, -+ {"bc", PRO_BOOL, false, OFF, &leave_comma, &exp_bc}, - {"bbb", PRO_BOOL, false, ON, &blanklines_before_blockcomments, &exp_bbb}, -- {"bap", PRO_BOOL, false, ON, &blanklines_after_procs, &exp_bap}, -- {"badp", PRO_BOOL, false, ON, -+ {"bap", PRO_BOOL, true, ON, &blanklines_after_procs, &exp_bap}, -+ {"badp", PRO_BOOL, true, ON, - &blanklines_after_declarations_at_proctop, &exp_badp}, -- {"bad", PRO_BOOL, false, ON, &blanklines_after_declarations, &exp_bad}, -+ {"bad", PRO_BOOL, true, ON, &blanklines_after_declarations, &exp_bad}, - {"bacc", PRO_BOOL, false, ON, - &blanklines_around_conditional_compilation, &exp_bacc}, - {"T", PRO_KEY, 0, ONOFF_NA, 0, &exp_T}, -@@ -347,10 +371,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}, + {"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}, +- {"fca", PRO_BOOL, true, ON, &settings.format_comments, &exp_fca}, +- {"fc1", PRO_BOOL, true, ON, &settings.format_col1_comments, &exp_fc1}, ++ GNU_PRO_SETTINGS, ++ {"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}, + {"dj", PRO_BOOL, false, ON, &settings.ljust_decl, &exp_dj}, +- {"di", PRO_INT, 16, ONOFF_NA, &settings.decl_indent, &exp_di}, ++ {"di", PRO_INT, 0, ONOFF_NA, &settings.decl_indent, &exp_di}, + {"d", PRO_INT, 0, ONOFF_NA, &settings.unindent_displace, &exp_d}, +- {"cs", PRO_BOOL, true, ON, &settings.cast_space, &exp_cs}, ++ {"cs", PRO_BOOL, false, ON, &settings.cast_space, &exp_cs}, + {"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}, +@@ -273,12 +303,12 @@ + {"bli", PRO_INT, 0, ONOFF_NA, &settings.brace_indent, &exp_bli}, + {"bl", PRO_BOOL, true, OFF, &settings.btype_2, &exp_bl}, + {"bfda", PRO_BOOL, false, ON, &settings.break_function_decl_args, &exp_bfda}, +- {"bc", PRO_BOOL, true, OFF, &settings.leave_comma, &exp_bc}, ++ {"bc", PRO_BOOL, false, OFF, &settings.leave_comma, &exp_bc}, + {"bbo", PRO_BOOL, true, ON, &settings.break_before_boolean_operator, &exp_bbo}, + {"bbb", PRO_BOOL, false, ON, &settings.blanklines_before_blockcomments, &exp_bbb}, +- {"bap", PRO_BOOL, false, ON, &settings.blanklines_after_procs, &exp_bap}, +- {"badp", PRO_BOOL, false, ON, &settings.blanklines_after_declarations_at_proctop, &exp_badp}, +- {"bad", PRO_BOOL, false, ON, &settings.blanklines_after_declarations, &exp_bad}, ++ {"bap", PRO_BOOL, true, ON, &settings.blanklines_after_procs, &exp_bap}, ++ {"badp", PRO_BOOL, true, ON, &settings.blanklines_after_declarations_at_proctop, &exp_badp}, ++ {"bad", PRO_BOOL, true, ON, &settings.blanklines_after_declarations, &exp_bad}, + {"bacc", PRO_BOOL, false, ON, &settings.blanklines_around_conditional_compilation, &exp_bacc}, + {"T", PRO_KEY, 0, ONOFF_NA, 0, &exp_T}, + /* Signify end of structure. */ +@@ -309,7 +339,7 @@ #endif - {"pi", PRO_INT, -1, ONOFF_NA, &paren_indent, &exp_pi}, - {"pcs", PRO_BOOL, true, ON, &proc_calls_space, &exp_pcs}, -- {"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-ci4\0-cli0\0-cp33\0-di16\0-fc1\0-fca\0-i4\0-l75\0-lp\0-npcs\0-nprs\0\ ---psl\0-sc\0-sai\0-saf\0-saw\0-nsob\0-nss\0-ts8\0", &exp_orig}, -+ BSD_PRO_SETTINGS, - {"o", PRO_BOOL, false, ON, &expect_output_file, &expect_output_file}, - {"nv", PRO_BOOL, false, OFF, &verbose, &exp_v}, - {"nut", PRO_BOOL, true, OFF, &use_tabs, &exp_ut}, -@@ -395,19 +416,14 @@ - {"lc", PRO_INT, DEFAULT_RIGHT_COMMENT_MARGIN, - ONOFF_NA, &comment_max_col, &exp_lc}, - {"l", PRO_INT, DEFAULT_RIGHT_MARGIN, ONOFF_NA, &max_col, &exp_l}, -- {"kr", PRO_SETTINGS, 0, ONOFF_NA, -- (int *) "-nbad\0-bap\0-nbc\0-bbo\0-hnl\0-br\0-brs\0-c33\0-cd33\0\ ---ncdb\0-ce\0-ci4\0-cli0\0-d0\0-di1\0-nfc1\0-i4\0-ip0\0-l75\0-lp\0\ ---npcs\0-nprs\0-npsl\0-sai\0-saf\0-saw\0-cs\0-nsc\0-nsob\0-nfca\0-cp33\0-nss\0", &exp_kr}, -+ KR_PRO_SETTINGS, -+ KNF_PRO_SETTINGS, - {"ip", PRO_INT, 5, ONOFF_NA, &indent_parameters, &exp_ip}, - {"i", PRO_INT, 2, ONOFF_NA, &ind_size, &exp_i}, - {"hnl", PRO_BOOL, true, ON, &honour_newlines, &exp_hnl}, - {"h", PRO_FUNCTION, 0, ONOFF_NA, (int *) usage, &exp_version}, - /* This is now the default. */ -- {"gnu", PRO_SETTINGS, 0, ONOFF_NA, -- (int *) "-nbad\0-bap\0-bbo\0-hnl\0-nbc\0-bl\0-bls\0-ncdb\0-cs\0\ ---nce\0-di2\0-ndj\0-nfc1\0-i2\0-ip5\0-lp\0-pcs\0-nprs\0-psl\0\ ---nsc\0-sai\0-saf\0-saw\0-nsob\0-bli2\0-cp1\0-nfca\0", &exp_gnu}, -+ GNU_PRO_SETTINGS, - {"fca", PRO_BOOL, false, ON, &format_comments, &exp_fca}, - {"fc1", PRO_BOOL, false, ON, &format_col1_comments, &exp_fc1}, - {"eei", PRO_BOOL, false, ON, &extra_expression_indent, &exp_eei}, -@@ -558,6 +574,9 @@ - {"blank-lines-after-declarations", "bad"}, - {"blank-lines-after-commas", "bc"}, - {"blank-before-sizeof", "bs"}, -+ {"berkeley-kernel-style", "knf"}, -+ {"berkeley-kernel-normal-form", "knf"}, -+ {"kernel-normal-form", "knf"}, - {"berkeley-style", "orig"}, - {"berkeley", "orig"}, - {"Bill-Shannon", "bs"}, + {"pi", PRO_INT, -1, ONOFF_NA, &settings.paren_indent, &exp_pi}, + {"pcs", PRO_BOOL, true, ON, &settings.proc_calls_space, &exp_pcs}, +- {"orig", PRO_SETTINGS, 0, ONOFF_NA, ORIG_SETTINGS_STRING, &exp_orig}, ++ BSD_PRO_SETTINGS, + {"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}, +@@ -351,13 +381,14 @@ + {"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, + {"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}, + {"h", PRO_FUNCTION, 0, ONOFF_NA, (int *) usage, &exp_version}, + /* This is now the default. */ +- {"gnu", PRO_SETTINGS, 0, ONOFF_NA, GNU_SETTINGS_STRING, &exp_gnu}, ++ GNU_PRO_SETTINGS, + {"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}, +@@ -507,6 +538,9 @@ + {"blank-lines-after-declarations", "bad"}, + {"blank-lines-after-commas", "bc"}, + {"blank-before-sizeof", "bs"}, ++ {"berkeley-kernel-style", "knf"}, ++ {"berkeley-kernel-normal-form", "knf"}, ++ {"kernel-normal-form", "knf"}, + {"berkeley-style", "orig"}, + {"berkeley", "orig"}, + {"Bill-Shannon", "bs"}, diff --git a/devel/gindent/files/patch-doc:Makefile.in b/devel/gindent/files/patch-doc:Makefile.in new file mode 100644 index 000000000000..b6a375e5d868 --- /dev/null +++ b/devel/gindent/files/patch-doc:Makefile.in @@ -0,0 +1,11 @@ +--- doc/Makefile.in.orig Tue Jun 25 14:31:43 2002 ++++ doc/Makefile.in Tue Jun 25 14:32:50 2002 +@@ -103,7 +103,7 @@ + + info_TEXINFOS = indent.texinfo + +-docdir = $(prefix)/doc/@PACKAGE@ ++docdir = $(prefix)/share/doc/@PACKAGE@ + dvidir = $(docdir) + psdir = $(docdir) + pdfdir = $(docdir) diff --git a/devel/gindent/files/patch-indent.h b/devel/gindent/files/patch-indent.h index 749a55b6e2a2..3443405d7049 100644 --- a/devel/gindent/files/patch-indent.h +++ b/devel/gindent/files/patch-indent.h @@ -1,5 +1,5 @@ ---- indent.h.orig Thu Nov 16 19:01:04 2000 -+++ indent.h Fri Apr 20 01:16:45 2001 +--- src/indent.h.orig Thu Nov 16 19:01:04 2000 ++++ src/indent.h Fri Apr 20 01:16:45 2001 @@ -63 +63 @@ -#define DEFAULT_RIGHT_MARGIN 78 +#define DEFAULT_RIGHT_MARGIN 79 diff --git a/devel/gindent/files/patch-man:Makefile.in b/devel/gindent/files/patch-man:Makefile.in new file mode 100644 index 000000000000..33562efbd9ab --- /dev/null +++ b/devel/gindent/files/patch-man:Makefile.in @@ -0,0 +1,11 @@ +--- man/Makefile.in.orig Tue Jun 25 14:21:59 2002 ++++ man/Makefile.in Tue Jun 25 14:25:40 2002 +@@ -378,7 +378,7 @@ + + + @PACKAGE@.1: @PACKAGE@.1.in ../doc/@PACKAGE@.texinfo texinfo2man Makefile +- texinfo2man @PACKAGE@.1.in ../doc/@PACKAGE@.texinfo > $@ ++ ./texinfo2man @PACKAGE@.1.in ../doc/@PACKAGE@.texinfo > $@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff --git a/devel/gindent/pkg-plist b/devel/gindent/pkg-plist index 9a606daff678..8858e98b212e 100644 --- a/devel/gindent/pkg-plist +++ b/devel/gindent/pkg-plist @@ -1,4 +1,22 @@ bin/gindent +bin/gtexinfo2man @unexec install-info --delete %D/info/indent.info %D/info/dir info/indent.info @exec install-info %D/info/indent.info %D/info/dir +share/locale/ca/LC_MESSAGES/indent.mo +share/locale/da/LC_MESSAGES/indent.mo +share/locale/de/LC_MESSAGES/indent.mo +share/locale/eo/LC_MESSAGES/indent.mo +share/locale/et/LC_MESSAGES/indent.mo +share/locale/fr/LC_MESSAGES/indent.mo +share/locale/gl/LC_MESSAGES/indent.mo +share/locale/ja/LC_MESSAGES/indent.mo +share/locale/ko/LC_MESSAGES/indent.mo +share/locale/nl/LC_MESSAGES/indent.mo +share/locale/pl/LC_MESSAGES/indent.mo +share/locale/pt_BR/LC_MESSAGES/indent.mo +share/locale/ru/LC_MESSAGES/indent.mo +share/locale/sk/LC_MESSAGES/indent.mo +share/locale/sv/LC_MESSAGES/indent.mo +share/locale/tr/LC_MESSAGES/indent.mo +share/locale/zh_TW.Big5/LC_MESSAGES/indent.mo -- cgit v1.2.3