Attachment #40457 for bug #63590

View | Details | Raw Unified | Return to bug 63590
Collapse All | Expand All




#

PORTNAME=	gindent
PORTVERSION=	2.2.9
PORTREVISION=	3
CATEGORIES=	devel
MASTER_SITES=	${MASTER_SITE_GNU}
		${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR=	indent
DISTNAME=	indent-${PORTVERSION}


USE_GETTEXT=	yes
USE_REINPLACE=	yes
GNU_CONFIGURE=	yes
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DBERKELEY_DEFAULTS=1" \
		LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS=	--program-prefix=g
MAKE_ARGS=	BERKELEY_DEFAULTS=1

MAN1=		gindent.1
INFO=		indent

post-patch:
	@${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
		's|malloc\.h|stdlib.h|g'

.if !defined(NOPORTDOCS)
post-install:
.if !defined(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/doc/indent.html ${DOCSDIR}
.endif

Lines 1-2 Link Here

(-)devel/gindent/distinfo (-2 / +2 lines)
1	MD5 (indent-2.2.8a.tar.gz) = 7416fdbd031dee7429063ebbdba87691	1	MD5 (indent-2.2.9.tar.gz) = dcdbb163bef928306dee2a0cfc581c89
2	SIZE (indent-2.2.8a.tar.gz) = 594855	2	SIZE (indent-2.2.9.tar.gz) = 678173




--- 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 @@
+#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_hnl  = 0;
 static int exp_i    = 0;
 static int exp_ip   = 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;
 

 #ifdef BERKELEY_DEFAULTS
 /* Settings for original defaults */
 const pro_ty pro[] =
@@ -212,61 +237,64 @@
 #endif
     {"pi",      PRO_INT,                               -1, ONOFF_NA, &settings.paren_indent,                     &exp_pi},
     {"pcs",     PRO_BOOL,                           false,       ON, &settings.proc_calls_space,                 &exp_pcs},

+    {"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},
     {"nbfde",   PRO_BOOL,                           false,      OFF, &settings.break_function_decl_args_end,     &exp_bfde},
     {"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},

     {"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 @@
     {"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},
     {"bfde",    PRO_BOOL,                           false,       ON, &settings.break_function_decl_args_end,     &exp_bfde},
-    {"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},

+    {"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},
     {"ppi",     PRO_INT,                                0, ONOFF_NA, &settings.force_preproc_width,              &exp_ppi},
@@ -324,7 +352,7 @@
 #endif
     {"pi",      PRO_INT,                               -1, ONOFF_NA, &settings.paren_indent,                     &exp_pi},
     {"pcs",     PRO_BOOL,                            true,       ON, &settings.proc_calls_space,                 &exp_pcs},

     {"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 @@
     {"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},

     {"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 @@
     {"blank-lines-after-declarations",              "bad"},
     {"blank-lines-after-commas",                    "bc"},
     {"blank-before-sizeof",                         "bs"},




bin/gindent
bin/gtexinfo2man
%%PORTDOCS%%%%DOCSDIR%%/indent.html
info/indent.info
@exec install-info %D/info/indent.info %D/info/dir
%%PORTDOCS%%share/doc/gindent/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/fi/LC_MESSAGES/indent.mo
share/locale/fr/LC_MESSAGES/indent.mo
share/locale/gl/LC_MESSAGES/indent.mo
share/locale/hu/LC_MESSAGES/indent.mo
share/locale/it/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/sv/LC_MESSAGES/indent.mo
share/locale/tr/LC_MESSAGES/indent.mo
share/locale/zh_TW.Big5/LC_MESSAGES/indent.mo
%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 63590

Lines 7-17 Link Here

(-)devel/gindent/Makefile (-10 / +8 lines)
7	#	7	#
8		8
9	PORTNAME= gindent	9	PORTNAME= gindent
10	PORTVERSION= 2.2.8a	10	PORTVERSION= 2.2.9
11	PORTREVISION= 3
12	CATEGORIES= devel	11	CATEGORIES= devel
13	MASTER_SITES= http://home.hccnet.nl/d.ingamells/ \	12	MASTER_SITES= ${MASTER_SITE_GNU}
14	${MASTER_SITE_GNU}
15	MASTER_SITE_SUBDIR= indent	13	MASTER_SITE_SUBDIR= indent
16	DISTNAME= indent-${PORTVERSION}	14	DISTNAME= indent-${PORTVERSION}
17		15
Lines 21-40 Link Here
21	USE_GETTEXT= yes	19	USE_GETTEXT= yes
22	USE_REINPLACE= yes	20	USE_REINPLACE= yes
23	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
24	CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}	22	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
25	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	23	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DBERKELEY_DEFAULTS=1" \
26	LDFLAGS="-L${LOCALBASE}/lib"	24	LDFLAGS="-L${LOCALBASE}/lib"
27	CONFIGURE_ARGS= --program-prefix=g	25	CONFIGURE_ARGS= --program-prefix=g
28	MAKE_ARGS= BERKELEY_DEFAULTS=1
29		26
30	MAN1= gindent.1	27	MAN1= gindent.1
		28	INFO= indent
31		29
32	post-patch:	30	post-patch:
33	@${GREP} -lR "malloc.h" ${WRKSRC} \| ${XARGS} \	31	@${GREP} -lR "malloc\.h" ${WRKSRC} \| ${XARGS} ${REINPLACE_CMD} -e \
34	${REINPLACE_CMD} -e "s/malloc.h/stdlib.h/g"	32	's\|malloc\.h\|stdlib.h\|g'
35		33
36	.if !defined(NOPORTDOCS)
37	post-install:	34	post-install:
		35	.if !defined(NOPORTDOCS)
38	@${MKDIR} ${DOCSDIR}	36	@${MKDIR} ${DOCSDIR}
39	${INSTALL_DATA} ${WRKSRC}/doc/indent.html ${DOCSDIR}	37	${INSTALL_DATA} ${WRKSRC}/doc/indent.html ${DOCSDIR}
40	.endif	38	.endif

Lines 1-12 Link Here

(-)devel/gindent/files/patch-args.c (-17 / +12 lines)
1	--- src/args.c.orig Tue Jun 25 14:00:57 2002	1	--- src/args.c.orig Mon Nov 11 06:02:48 2002
2	+++ src/args.c Tue Jun 25 14:16:00 2002	2	+++ src/args.c Mon Mar 1 20:21:53 2004
3	@@ -1,3 +1,5 @@	3	@@ -122,6 +122,7 @@
4	+#define BERKELEY_DEFAULTS 1
5	+
6	/* Copyright (c) 1999, 2000 Carlo Wood. All rights reserved.
7	* Copyright (c) 1994 Joseph Arceneaux. All rights reserved.
8	* Copyright (c) 1992 Free Software Foundation, Inc. All rights reserved.
9	@@ -113,6 +115,7 @@
10	static int exp_hnl = 0;	4	static int exp_hnl = 0;
11	static int exp_i = 0;	5	static int exp_i = 0;
12	static int exp_ip = 0;	6	static int exp_ip = 0;
Lines 14-20 Link Here
14	static int exp_kr = 0;	8	static int exp_kr = 0;
15	static int exp_l = 0;	9	static int exp_l = 0;
16	static int exp_lc = 0;	10	static int exp_lc = 0;
17	@@ -179,6 +182,30 @@	11	@@ -189,6 +190,30 @@
18	* variable must share the explicit flag. */	12	* variable must share the explicit flag. */
19	} pro_ty;	13	} pro_ty;
20		14
Lines 45-51 Link Here
45	#ifdef BERKELEY_DEFAULTS	39	#ifdef BERKELEY_DEFAULTS
46	/* Settings for original defaults */	40	/* Settings for original defaults */
47	const pro_ty pro[] =	41	const pro_ty pro[] =
48	@@ -202,60 +229,63 @@	42	@@ -212,61 +237,64 @@
49	#endif	43	#endif
50	{"pi", PRO_INT, -1, ONOFF_NA, &settings.paren_indent, &exp_pi},	44	{"pi", PRO_INT, -1, ONOFF_NA, &settings.paren_indent, &exp_pi},
51	{"pcs", PRO_BOOL, false, ON, &settings.proc_calls_space, &exp_pcs},	45	{"pcs", PRO_BOOL, false, ON, &settings.proc_calls_space, &exp_pcs},
Lines 95-100 Link Here
95	+ {"ncdb", PRO_BOOL, false, OFF, &settings.comment_delimiter_on_blankline, &exp_cdb},	89	+ {"ncdb", PRO_BOOL, false, OFF, &settings.comment_delimiter_on_blankline, &exp_cdb},
96	{"nbs", PRO_BOOL, false, OFF, &settings.blank_after_sizeof, &exp_bs},	90	{"nbs", PRO_BOOL, false, OFF, &settings.blank_after_sizeof, &exp_bs},
97	{"nbfda", PRO_BOOL, false, OFF, &settings.break_function_decl_args, &exp_bfda},	91	{"nbfda", PRO_BOOL, false, OFF, &settings.break_function_decl_args, &exp_bfda},
		92	{"nbfde", PRO_BOOL, false, OFF, &settings.break_function_decl_args_end, &exp_bfde},
98	{"nbc", PRO_BOOL, true, ON, &settings.leave_comma, &exp_bc},	93	{"nbc", PRO_BOOL, true, ON, &settings.leave_comma, &exp_bc},
99	- {"nbbo", PRO_BOOL, true, OFF, &settings.break_before_boolean_operator, &exp_bbo},	94	- {"nbbo", PRO_BOOL, true, OFF, &settings.break_before_boolean_operator, &exp_bbo},
100	- {"nbbb", PRO_BOOL, false, OFF, &settings.blanklines_before_blockcomments, &exp_bbb},	95	- {"nbbb", PRO_BOOL, false, OFF, &settings.blanklines_before_blockcomments, &exp_bbb},
Lines 135-144 Link Here
135	{"cp", PRO_INT, 33, ONOFF_NA, &settings.else_endif_col, &exp_cp},	130	{"cp", PRO_INT, 33, ONOFF_NA, &settings.else_endif_col, &exp_cp},
136	{"cli", PRO_INT, 0, ONOFF_NA, &settings.case_indent, &exp_cli},	131	{"cli", PRO_INT, 0, ONOFF_NA, &settings.case_indent, &exp_cli},
137	{"ci", PRO_INT, 4, ONOFF_NA, &settings.continuation_indent, &exp_ci},	132	{"ci", PRO_INT, 4, ONOFF_NA, &settings.continuation_indent, &exp_ci},
138	@@ -273,12 +303,12 @@	133	@@ -287,12 +315,12 @@
139	{"bli", PRO_INT, 0, ONOFF_NA, &settings.brace_indent, &exp_bli},
140	{"bl", PRO_BOOL, true, OFF, &settings.btype_2, &exp_bl},	134	{"bl", PRO_BOOL, true, OFF, &settings.btype_2, &exp_bl},
141	{"bfda", PRO_BOOL, false, ON, &settings.break_function_decl_args, &exp_bfda},	135	{"bfda", PRO_BOOL, false, ON, &settings.break_function_decl_args, &exp_bfda},
		136	{"bfde", PRO_BOOL, false, ON, &settings.break_function_decl_args_end, &exp_bfde},
142	- {"bc", PRO_BOOL, true, OFF, &settings.leave_comma, &exp_bc},	137	- {"bc", PRO_BOOL, true, OFF, &settings.leave_comma, &exp_bc},
143	+ {"bc", PRO_BOOL, false, OFF, &settings.leave_comma, &exp_bc},	138	+ {"bc", PRO_BOOL, false, OFF, &settings.leave_comma, &exp_bc},
144	{"bbo", PRO_BOOL, true, ON, &settings.break_before_boolean_operator, &exp_bbo},	139	{"bbo", PRO_BOOL, true, ON, &settings.break_before_boolean_operator, &exp_bbo},
Lines 151-158 Link Here
151	+ {"bad", PRO_BOOL, true, ON, &settings.blanklines_after_declarations, &exp_bad},	146	+ {"bad", PRO_BOOL, true, ON, &settings.blanklines_after_declarations, &exp_bad},
152	{"bacc", PRO_BOOL, false, ON, &settings.blanklines_around_conditional_compilation, &exp_bacc},	147	{"bacc", PRO_BOOL, false, ON, &settings.blanklines_around_conditional_compilation, &exp_bacc},
153	{"T", PRO_KEY, 0, ONOFF_NA, 0, &exp_T},	148	{"T", PRO_KEY, 0, ONOFF_NA, 0, &exp_T},
154	/* Signify end of structure. */	149	{"ppi", PRO_INT, 0, ONOFF_NA, &settings.force_preproc_width, &exp_ppi},
155	@@ -309,7 +339,7 @@	150	@@ -324,7 +352,7 @@
156	#endif	151	#endif
157	{"pi", PRO_INT, -1, ONOFF_NA, &settings.paren_indent, &exp_pi},	152	{"pi", PRO_INT, -1, ONOFF_NA, &settings.paren_indent, &exp_pi},
158	{"pcs", PRO_BOOL, true, ON, &settings.proc_calls_space, &exp_pcs},	153	{"pcs", PRO_BOOL, true, ON, &settings.proc_calls_space, &exp_pcs},
Lines 161-167 Link Here
161	{"o", PRO_BOOL, false, ON, &settings.expect_output_file, &exp_o},	156	{"o", PRO_BOOL, false, ON, &settings.expect_output_file, &exp_o},
162	{"nv", PRO_BOOL, false, OFF, &settings.verbose, &exp_v},	157	{"nv", PRO_BOOL, false, OFF, &settings.verbose, &exp_v},
163	{"nut", PRO_BOOL, true, OFF, &settings.use_tabs, &exp_ut},	158	{"nut", PRO_BOOL, true, OFF, &settings.use_tabs, &exp_ut},
164	@@ -351,13 +381,14 @@	159	@@ -367,13 +395,14 @@
165	{"lp", PRO_BOOL, true, ON, &settings.lineup_to_parens, &exp_lp},	160	{"lp", PRO_BOOL, true, ON, &settings.lineup_to_parens, &exp_lp},
166	{"lc", PRO_INT, DEFAULT_RIGHT_COMMENT_MARGIN, ONOFF_NA, &settings.comment_max_col, &exp_lc},	161	{"lc", PRO_INT, DEFAULT_RIGHT_COMMENT_MARGIN, ONOFF_NA, &settings.comment_max_col, &exp_lc},
167	{"l", PRO_INT, DEFAULT_RIGHT_MARGIN, ONOFF_NA, &settings.max_col, &exp_l},	162	{"l", PRO_INT, DEFAULT_RIGHT_MARGIN, ONOFF_NA, &settings.max_col, &exp_l},
Lines 178-184 Link Here
178	{"fca", PRO_BOOL, false, ON, &settings.format_comments, &exp_fca},	173	{"fca", PRO_BOOL, false, ON, &settings.format_comments, &exp_fca},
179	{"fc1", PRO_BOOL, false, ON, &settings.format_col1_comments, &exp_fc1},	174	{"fc1", PRO_BOOL, false, ON, &settings.format_col1_comments, &exp_fc1},
180	{"eei", PRO_BOOL, false, ON, &settings.extra_expression_indent, &exp_eei},	175	{"eei", PRO_BOOL, false, ON, &settings.extra_expression_indent, &exp_eei},
181	@@ -507,6 +538,9 @@	176	@@ -531,6 +560,9 @@
182	{"blank-lines-after-declarations", "bad"},	177	{"blank-lines-after-declarations", "bad"},
183	{"blank-lines-after-commas", "bc"},	178	{"blank-lines-after-commas", "bc"},
184	{"blank-before-sizeof", "bs"},	179	{"blank-before-sizeof", "bs"},

Lines 1-16 Link Here

(-)devel/gindent/pkg-plist (-5 / +5 lines)
1	bin/gindent	1	bin/gindent
2	bin/gtexinfo2man	2	bin/gtexinfo2man
3	@unexec install-info --delete %D/info/indent.info %D/info/dir	3	%%PORTDOCS%%%%DOCSDIR%%/indent.html
4	info/indent.info
5	@exec install-info %D/info/indent.info %D/info/dir
6	%%PORTDOCS%%share/doc/gindent/indent.html
7	share/locale/ca/LC_MESSAGES/indent.mo	4	share/locale/ca/LC_MESSAGES/indent.mo
8	share/locale/da/LC_MESSAGES/indent.mo	5	share/locale/da/LC_MESSAGES/indent.mo
9	share/locale/de/LC_MESSAGES/indent.mo	6	share/locale/de/LC_MESSAGES/indent.mo
10	share/locale/eo/LC_MESSAGES/indent.mo	7	share/locale/eo/LC_MESSAGES/indent.mo
11	share/locale/et/LC_MESSAGES/indent.mo	8	share/locale/et/LC_MESSAGES/indent.mo
		9	share/locale/fi/LC_MESSAGES/indent.mo
12	share/locale/fr/LC_MESSAGES/indent.mo	10	share/locale/fr/LC_MESSAGES/indent.mo
13	share/locale/gl/LC_MESSAGES/indent.mo	11	share/locale/gl/LC_MESSAGES/indent.mo
		12	share/locale/hu/LC_MESSAGES/indent.mo
		13	share/locale/it/LC_MESSAGES/indent.mo
14	share/locale/ja/LC_MESSAGES/indent.mo	14	share/locale/ja/LC_MESSAGES/indent.mo
15	share/locale/ko/LC_MESSAGES/indent.mo	15	share/locale/ko/LC_MESSAGES/indent.mo
16	share/locale/nl/LC_MESSAGES/indent.mo	16	share/locale/nl/LC_MESSAGES/indent.mo
Lines 21-24 Link Here
21	share/locale/sv/LC_MESSAGES/indent.mo	21	share/locale/sv/LC_MESSAGES/indent.mo
22	share/locale/tr/LC_MESSAGES/indent.mo	22	share/locale/tr/LC_MESSAGES/indent.mo
23	share/locale/zh_TW.Big5/LC_MESSAGES/indent.mo	23	share/locale/zh_TW.Big5/LC_MESSAGES/indent.mo
24	%%PORTDOCS%%@dirrm share/doc/gindent	24	%%PORTDOCS%%@dirrm %%DOCSDIR%%