svn commit: r549725 - in head/devel/gindent: . files
Mateusz Piotrowski
0mp at FreeBSD.org
Wed Sep 23 13:52:47 UTC 2020
Author: 0mp
Date: Wed Sep 23 13:52:45 2020
New Revision: 549725
URL: https://svnweb.freebsd.org/changeset/ports/549725
Log:
devel/gindent: Update to 2.2.12
Changelog:
https://savannah.gnu.org/forum/forum.php?forum_id=9233
Reported by: Repology
Deleted:
head/devel/gindent/files/patch-doc_Makefile.in
Modified:
head/devel/gindent/Makefile
head/devel/gindent/distinfo
head/devel/gindent/files/patch-src_args.c
head/devel/gindent/files/patch-src_indent.h
head/devel/gindent/files/patch-src_output.c
head/devel/gindent/pkg-plist
Modified: head/devel/gindent/Makefile
==============================================================================
--- head/devel/gindent/Makefile Wed Sep 23 13:34:56 2020 (r549724)
+++ head/devel/gindent/Makefile Wed Sep 23 13:52:45 2020 (r549725)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gindent
-PORTVERSION= 2.2.10
-PORTREVISION= 5
+PORTVERSION= 2.2.12
CATEGORIES= devel
MASTER_SITES= GNU/indent
DISTNAME= indent-${PORTVERSION}
@@ -14,7 +13,7 @@ COMMENT= GNU indent
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= localbase:ldflags
+USES= localbase:ldflags makeinfo
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-prefix=g
MAKE_JOBS_UNSAFE= yes
@@ -34,6 +33,9 @@ post-patch:
post-install:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/doc/indent.html ${STAGEDIR}${DOCSDIR}
+ # XXX: Would be nice to use "configure --htmldir" or something similar
+ # to install this document into an appropriate directory automatically.
+ ${INSTALL_DATA} ${STAGEDIR}${PREFIX}/doc/indent/indent.html ${STAGEDIR}${DOCSDIR}
+ ${RM} -r ${STAGEDIR}${PREFIX}/doc
.include <bsd.port.mk>
Modified: head/devel/gindent/distinfo
==============================================================================
--- head/devel/gindent/distinfo Wed Sep 23 13:34:56 2020 (r549724)
+++ head/devel/gindent/distinfo Wed Sep 23 13:52:45 2020 (r549725)
@@ -1,2 +1,3 @@
-SHA256 (indent-2.2.10.tar.gz) = 8a9b41be5bfcab5d8c1be74204b10ae78789fc3deabea0775fdced8677292639
-SIZE (indent-2.2.10.tar.gz) = 702667
+TIMESTAMP = 1600861654
+SHA256 (indent-2.2.12.tar.gz) = e77d68c0211515459b8812118d606812e300097cfac0b4e9fb3472664263bb8b
+SIZE (indent-2.2.12.tar.gz) = 967743
Modified: head/devel/gindent/files/patch-src_args.c
==============================================================================
--- head/devel/gindent/files/patch-src_args.c Wed Sep 23 13:34:56 2020 (r549724)
+++ head/devel/gindent/files/patch-src_args.c Wed Sep 23 13:52:45 2020 (r549725)
@@ -1,6 +1,6 @@
---- src/args.c.orig 2008-03-11 18:50:42 UTC
+--- src/args.c.orig 2018-09-02 20:30:45 UTC
+++ src/args.c
-@@ -163,6 +163,7 @@ static int exp_hnl = 0;
+@@ -188,6 +188,7 @@ static int exp_hnl = 0;
static int exp_i = 0;
static int exp_il = 0;
static int exp_ip = 0;
@@ -8,30 +8,30 @@
static int exp_kr = 0;
static int exp_l = 0;
static int exp_lc = 0;
-@@ -237,6 +238,30 @@ typedef struct
+@@ -269,6 +270,30 @@ typedef struct
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\
++ (char *) "-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}
+
+#define KNF_PRO_SETTINGS {"knf", PRO_SETTINGS, 0, ONOFF_NA,\
-+ (int *) "-bad\0-bap\0-nbbb\0-nbc\0-bbo\0-br\0-brs\0-nbs\0-c33\0-cd33\0-cdb\0\
++ (char *) "-bad\0-bap\0-nbbb\0-nbc\0-bbo\0-br\0-brs\0-nbs\0-c33\0-cd33\0-cdb\0\
+-ce\0-ci4\0-cli0\0-cp33\0-ncs\0-d0\0-di0\0-ndj\0-nfc1\0-nfca\0-hnl\0-i8\0-ip8\0\
+-l79\0-nlp\0-npcs\0-nprs\0-psl\0-sai\0-saf\0-saw\0-sc\0-nsob\0-nss\0",\
+ &exp_knf}
+
+#define KR_PRO_SETTINGS {"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\
++ (char *) "-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}
+
+#define GNU_PRO_SETTINGS {"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\
++ (char *) "-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}
@@ -39,7 +39,7 @@
#ifdef BERKELEY_DEFAULTS
/**
-@@ -264,63 +289,66 @@ const pro_ty pro[] =
+@@ -296,66 +321,69 @@ const pro_ty pro[] =
#endif
{"pi", PRO_INT, -1, ONOFF_NA, &settings.paren_indent, &exp_pi},
{"pcs", PRO_BOOL, false, ON, &settings.proc_calls_space, &exp_pcs},
@@ -69,13 +69,13 @@
{"npmt", PRO_BOOL, false, OFF, &settings.preserve_mtime, &exp_pmt},
#endif
- {"npcs", PRO_BOOL, false, OFF, &settings.proc_calls_space, &exp_pcs},
-+ {"npcs", PRO_BOOL, true, 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},
+ {"nip", PRO_SETTINGS, 0, ONOFF_NA, NIP_SETTINGS_IDX, &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},
+ {"ngts", PRO_BOOL, false, OFF, &settings.gettext_strings, &exp_gts},
{"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},
@@ -100,27 +100,29 @@
{"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},
+ {"linux", PRO_SETTINGS, 0, ONOFF_NA, LINUX_SETTINGS_IDX, &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},
{"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, 0, ONOFF_NA, KR_SETTINGS_IDX, &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, &settings.indent_parameters, &exp_ip},
- {"il", PRO_INT, DEFAULT_LABEL_INDENT, ONOFF_NA, &settings.label_offset, &exp_il},
+ {"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},
+ {"h", PRO_BOOL, 0, ONOFF_NA, NULL, NULL},
+ {"gts", PRO_BOOL, false, ON, &settings.gettext_strings, &exp_gts},
+- {"gnu", PRO_SETTINGS, 0, ONOFF_NA, GNU_SETTINGS_IDX, &exp_gnu},
++ GNU_PRO_SETTINGS,
+ {"fnc", PRO_BOOL, false, ON, &settings.fix_nested_comments, &exp_fnc},
- {"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},
@@ -133,7 +135,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},
-@@ -341,12 +369,12 @@ const pro_ty pro[] =
+@@ -376,12 +404,12 @@ const pro_ty pro[] =
{"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},
@@ -150,34 +152,35 @@
{"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},
-@@ -381,7 +409,7 @@ const pro_ty pro[] =
+@@ -423,7 +451,7 @@ const pro_ty pro[] =
#endif
{"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},
+- {"orig", PRO_SETTINGS, 0, ONOFF_NA, ORIG_SETTINGS_IDX, &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},
-@@ -425,14 +453,15 @@ const pro_ty pro[] =
+@@ -468,7 +496,8 @@ const pro_ty pro[] =
{"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, 0, ONOFF_NA, KR_SETTINGS_IDX, &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},
- {"h", PRO_FUNCTION, 0, ONOFF_NA, (int *) usage, &exp_version},
+@@ -476,7 +505,7 @@ const pro_ty pro[] =
+ {"h", PRO_BOOL, 0, ONOFF_NA, NULL, NULL},
+ {"gts", PRO_BOOL, false, ON, &settings.gettext_strings, &exp_gts},
/* This is now the default. */
-- {"gnu", PRO_SETTINGS, 0, ONOFF_NA, GNU_SETTINGS_STRING, &exp_gnu},
+- {"gnu", PRO_SETTINGS, 0, ONOFF_NA, GNU_SETTINGS_IDX, &exp_gnu},
+ GNU_PRO_SETTINGS,
+ {"fnc", PRO_BOOL, false, ON, &settings.fix_nested_comments, &exp_fnc},
{"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},
-@@ -593,6 +622,9 @@ const long_option_conversion_ty option_c
+@@ -649,6 +678,9 @@ const long_option_conversion_ty option_conversions[] =
{"blank-lines-after-declarations", "bad"},
{"blank-lines-after-commas", "bc"},
{"blank-before-sizeof", "bs"},
@@ -187,12 +190,12 @@
{"berkeley-style", "orig"},
{"berkeley", "orig"},
{"Bill-Shannon", "bs"},
-@@ -798,7 +830,7 @@ extern int set_option(
+@@ -861,7 +893,7 @@ extern int set_option(
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
+ else if (strlen(p->p_name) == 1 && *(p->p_name) == 'h')
{
Modified: head/devel/gindent/files/patch-src_indent.h
==============================================================================
--- head/devel/gindent/files/patch-src_indent.h Wed Sep 23 13:34:56 2020 (r549724)
+++ head/devel/gindent/files/patch-src_indent.h Wed Sep 23 13:52:45 2020 (r549725)
@@ -1,6 +1,6 @@
---- src/indent.h.orig 2008-03-11 18:50:42 UTC
+--- src/indent.h.orig 2018-09-02 20:25:26 UTC
+++ src/indent.h
-@@ -135,9 +135,9 @@ typedef enum bb_code
+@@ -141,9 +141,9 @@ typedef enum bb_code
bb_cast
} bb_code_ty;
Modified: head/devel/gindent/files/patch-src_output.c
==============================================================================
--- head/devel/gindent/files/patch-src_output.c Wed Sep 23 13:34:56 2020 (r549724)
+++ head/devel/gindent/files/patch-src_output.c Wed Sep 23 13:52:45 2020 (r549725)
@@ -1,6 +1,6 @@
---- src/output.c.orig 2008-03-11 18:50:42 UTC
+--- src/output.c.orig 2018-09-05 16:47:56 UTC
+++ src/output.c
-@@ -71,7 +71,7 @@
+@@ -74,7 +74,7 @@
RCSTAG_CC ("$Id$");
@@ -8,4 +8,4 @@
+FILE * output = NULL;
static BOOLEAN inhibited = 0;
static buf_break_st_ty * buf_break_list = NULL;
-
+ buf_break_st_ty * buf_break = NULL;
Modified: head/devel/gindent/pkg-plist
==============================================================================
--- head/devel/gindent/pkg-plist Wed Sep 23 13:34:56 2020 (r549724)
+++ head/devel/gindent/pkg-plist Wed Sep 23 13:52:45 2020 (r549725)
@@ -1,24 +1,37 @@
bin/gindent
-bin/gtexinfo2man
man/man1/gindent.1.gz
%%PORTDOCS%%%%DOCSDIR%%/indent.html
+%%NLS%%share/locale/bg/LC_MESSAGES/indent.mo
%%NLS%%share/locale/ca/LC_MESSAGES/indent.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/indent.mo
%%NLS%%share/locale/da/LC_MESSAGES/indent.mo
%%NLS%%share/locale/de/LC_MESSAGES/indent.mo
+%%NLS%%share/locale/el/LC_MESSAGES/indent.mo
%%NLS%%share/locale/eo/LC_MESSAGES/indent.mo
+%%NLS%%share/locale/es/LC_MESSAGES/indent.mo
%%NLS%%share/locale/et/LC_MESSAGES/indent.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/indent.mo
%%NLS%%share/locale/fi/LC_MESSAGES/indent.mo
%%NLS%%share/locale/fr/LC_MESSAGES/indent.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/indent.mo
%%NLS%%share/locale/gl/LC_MESSAGES/indent.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/indent.mo
%%NLS%%share/locale/hu/LC_MESSAGES/indent.mo
+%%NLS%%share/locale/id/LC_MESSAGES/indent.mo
%%NLS%%share/locale/it/LC_MESSAGES/indent.mo
%%NLS%%share/locale/ja/LC_MESSAGES/indent.mo
%%NLS%%share/locale/ko/LC_MESSAGES/indent.mo
%%NLS%%share/locale/nl/LC_MESSAGES/indent.mo
%%NLS%%share/locale/pl/LC_MESSAGES/indent.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/indent.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/indent.mo
%%NLS%%share/locale/ru/LC_MESSAGES/indent.mo
%%NLS%%share/locale/sk/LC_MESSAGES/indent.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/indent.mo
%%NLS%%share/locale/sv/LC_MESSAGES/indent.mo
%%NLS%%share/locale/tr/LC_MESSAGES/indent.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/indent.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/indent.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/indent.mo
%%NLS%%share/locale/zh_TW.Big5/LC_MESSAGES/indent.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/indent.mo
More information about the svn-ports-head
mailing list