4 files changed, 27 insertions, 34 deletions

diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile
index 31a19c27f117..ec3799f1feff 100644
--- a/devel/gindent/Makefile
+++ b/devel/gindent/Makefile
@@ -7,11 +7,9 @@
 #
 
 PORTNAME=	gindent
-PORTVERSION=	2.2.8a
-PORTREVISION=	3
+PORTVERSION=	2.2.9
 CATEGORIES=	devel
-MASTER_SITES=	http://home.hccnet.nl/d.ingamells/ \
-		${MASTER_SITE_GNU}
+MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	indent
 DISTNAME=	indent-${PORTVERSION}
 
@@ -21,20 +19,20 @@ COMMENT=	GNU indent
 USE_GETTEXT=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+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"
+	@${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
diff --git a/devel/gindent/distinfo b/devel/gindent/distinfo
index 03ad019e036b..8ecad0e0049e 100644
--- a/devel/gindent/distinfo
+++ b/devel/gindent/distinfo
@@ -1,2 +1,2 @@
-MD5 (indent-2.2.8a.tar.gz) = 7416fdbd031dee7429063ebbdba87691
-SIZE (indent-2.2.8a.tar.gz) = 594855
+MD5 (indent-2.2.9.tar.gz) = dcdbb163bef928306dee2a0cfc581c89
+SIZE (indent-2.2.9.tar.gz) = 678173
diff --git a/devel/gindent/files/patch-args.c b/devel/gindent/files/patch-args.c
index 7d02169efc6a..42d3d0540b10 100644
--- a/devel/gindent/files/patch-args.c
+++ b/devel/gindent/files/patch-args.c
@@ -1,12 +1,6 @@
---- 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.
-@@ -113,6 +115,7 @@
+--- 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;
  static int exp_i    = 0;
  static int exp_ip   = 0;
@@ -14,7 +8,7 @@
  static int exp_kr   = 0;
  static int exp_l    = 0;
  static int exp_lc   = 0;
-@@ -179,6 +182,30 @@
+@@ -189,6 +190,30 @@
                                   * variable must share the explicit flag.  */
  } pro_ty;
  
@@ -45,7 +39,7 @@
  #ifdef BERKELEY_DEFAULTS
  /* Settings for original defaults */
  const pro_ty pro[] =
-@@ -202,60 +229,63 @@
+@@ -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},
@@ -95,6 +89,7 @@
 +    {"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},
@@ -135,10 +130,10 @@
      {"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},
+@@ -287,12 +315,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},
 -    {"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},
@@ -151,8 +146,8 @@
 +    {"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 @@
+     {"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},
@@ -161,7 +156,7 @@
      {"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 @@
+@@ -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},
@@ -178,7 +173,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},
-@@ -507,6 +538,9 @@
+@@ -531,6 +560,9 @@
      {"blank-lines-after-declarations",              "bad"},
      {"blank-lines-after-commas",                    "bc"},
      {"blank-before-sizeof",                         "bs"},
diff --git a/devel/gindent/pkg-plist b/devel/gindent/pkg-plist
index ef83850f185d..5394c149bf33 100644
--- a/devel/gindent/pkg-plist
+++ b/devel/gindent/pkg-plist
@@ -1,16 +1,16 @@
 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
-%%PORTDOCS%%share/doc/gindent/indent.html
+%%PORTDOCS%%%%DOCSDIR%%/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
@@ -21,4 +21,4 @@ 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
-%%PORTDOCS%%@dirrm share/doc/gindent
+%%PORTDOCS%%@dirrm %%DOCSDIR%%