cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to gindent-2.2.8

Browse Source 
- Add KNF (-knf) option
- Enable BERKELEY option by default
- Use gettext port rather than building its own
From Jim Geovedi <jim@corebsd.or.id>, thanks!
This commit is contained in:
pvalchev 2002-08-26 02:55:09 +00:00
parent 2c028d9a97
commit 20135bc426
9 changed files with 286 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
devel/gindent/Makefile
View File

@ -1,24 +1,27 @@
# $OpenBSD: Makefile,v 1.20 2002/05/13 18:50:39 espie Exp $
# $OpenBSD: Makefile,v 1.21 2002/08/26 02:55:09 pvalchev Exp $
COMMENT= "GNU utility to indent C source files"
DISTNAME= indent-2.2.6
DISTNAME= indent-2.2.8
CATEGORIES= devel
NEED_VERSION= 1.402
MASTER_SITES= ${MASTER_SITE_GNU:=indent/}
HOMEPAGE= http://www.gnu.org/software/indent/
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --program-prefix="g"
SEPARATE_BUILD= concurrent
MASTER_SITES= ${MASTER_SITE_GNU:=indent/}
post-extract:
@rm ${WRKSRC}/indent.info*
MODULES= gettext
NO_REGRESS= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --program-prefix="g" --without-included-gettext
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
MAKE_ARGS= BERKELEY_DEFAULTS=1
.include <bsd.port.mk>

6
devel/gindent/distinfo
View File

@ -1,3 +1,3 @@
MD5 (indent-2.2.6.tar.gz) = 1f5f9b27226a3292f857fedcd12a07e4
RMD160 (indent-2.2.6.tar.gz) = fef0d364d9d0448baa0d52f9e481ef08fba85f91
SHA1 (indent-2.2.6.tar.gz) = 02e18781f5879e71b170e7db34eea725ac3d5072
MD5 (indent-2.2.8.tar.gz) = fd3c30955dbf8e410cb5d60ae39630c0
RMD160 (indent-2.2.8.tar.gz) = a73c9567f931e5b50420b5570655245946bf87c4
SHA1 (indent-2.2.8.tar.gz) = 264d12746b18f295844fcc8605dae429bc73ee2e

12
devel/gindent/patches/patch-doc_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-doc_Makefile_in,v 1.1 2002/08/26 02:55:09 pvalchev Exp $
--- doc/Makefile.in.orig Fri Mar 22 03:41:34 2002
+++ doc/Makefile.in Fri Aug 23 06:00:37 2002
@@ -103,7 +103,7 @@ TEXI2PDF = @TEXI2PDF@
info_TEXINFOS = indent.texinfo
-docdir = $(prefix)/doc/@PACKAGE@
+docdir = $(prefix)/share/doc/@PACKAGE@
dvidir = $(docdir)
psdir = $(docdir)
pdfdir = $(docdir)

12
devel/gindent/patches/patch-doc_indent_texinfo Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-doc_indent_texinfo,v 1.1 2002/08/26 02:55:09 pvalchev Exp $
--- doc/indent.texinfo.orig Fri Aug 23 05:59:00 2002
+++ doc/indent.texinfo Fri Aug 23 05:59:14 2002
@@ -13,7 +13,7 @@
@dircategory Indent Code Formatter
@direntry
-* Indent: (indent). C code formatter.
+* GNU Indent: (indent). C code formatter.
@end direntry

12
devel/gindent/patches/patch-man_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-man_Makefile_in,v 1.1 2002/08/26 02:55:09 pvalchev Exp $
--- man/Makefile.in.orig Fri Mar 22 03:41:34 2002
+++ man/Makefile.in Fri Aug 23 06:16:31 2002
@@ -378,7 +378,7 @@ uninstall-man: uninstall-man1
@PACKAGE@.1: @PACKAGE@.1.in ../doc/@PACKAGE@.texinfo texinfo2man Makefile
- texinfo2man @PACKAGE@.1.in ../doc/@PACKAGE@.texinfo > $@
+ ../man/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:

10
devel/gindent/patches/patch-man_texinfo2man_c Normal file
View File

@ -0,0 +1,10 @@
$OpenBSD: patch-man_texinfo2man_c,v 1.1 2002/08/26 02:55:09 pvalchev Exp $
--- man/texinfo2man.c.orig Thu Jan 17 12:28:51 2002
+++ man/texinfo2man.c Sun Aug 25 20:37:07 2002
@@ -1,5 +1,5 @@
#include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
#include <string.h>
#include <ctype.h>

191
devel/gindent/patches/patch-src_args_c Normal file
View File

@ -0,0 +1,191 @@
$OpenBSD: patch-src_args_c,v 1.1 2002/08/26 02:55:09 pvalchev Exp $
--- src/args.c.orig Fri Mar 15 14:48:45 2002
+++ src/args.c Fri Aug 23 06:00:16 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.
@@ -113,6 +115,7 @@ static int exp_gnu = 0;
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 @@ typedef struct pro
* 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\
+-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\
+-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\
+-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\
+-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}
+
#ifdef BERKELEY_DEFAULTS
/* Settings for original defaults */
const pro_ty pro[] =
@@ -202,60 +229,63 @@ 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},
+ 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, &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},
{"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, &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 @@ const pro_ty pro[] =
{"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 @@ 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},
+ 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 @@ 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,
+ 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 @@ const long_option_conversion_ty option_c
{"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"},

13
devel/gindent/patches/patch-src_globs_c Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-src_globs_c,v 1.1 2002/08/26 02:55:09 pvalchev Exp $
--- src/globs.c.orig Fri Mar 15 00:48:45 2002
+++ src/globs.c Sun Aug 25 20:37:31 2002
@@ -19,9 +19,6 @@
#include "indent.h"
#include "globs.h"
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
#include <stdlib.h>
#include <errno.h>

22
devel/gindent/pkg/PLIST
View File

@ -1,6 +1,26 @@
@comment $OpenBSD: PLIST,v 1.5 2001/01/08 20:18:50 avsm Exp $
@comment $OpenBSD: PLIST,v 1.6 2002/08/26 02:55:09 pvalchev Exp $
@unexec install-info --delete --info-dir=%D/info %D/info/indent.info
bin/gindent
bin/gtexinfo2man
info/indent.info
man/man1/gindent.1
share/doc/indent/indent.html
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
@dirrm share/doc/indent
@exec install-info --info-dir=%D/info %D/info/indent.info