Phase 2 pgindent run for v12.

Switch to 2.1 version of pg_bsd_indent.  This formats
multiline function declarations "correctly", that is with
additional lines of parameter declarations indented to match
where the first line's left parenthesis is.

Discussion: https://postgr.es/m/CAEepm=0P3FeTXRcU5B2W3jv3PgRVZ-kGUXLGfd42FFhUROO3ug@mail.gmail.com

src/include/catalog/pg_type.h

@@ -330,7 +330,8 @@ extern void GenerateTypeDependencies(Oid typeObjectId,
 									 Form_pg_type typeForm,
 									 Node *defaultExpr,
 									 void *typacl,
-						 char relationKind, /* only for relation rowtypes */
+									 char relationKind, /* only for relation
+														 * rowtypes */
 									 bool isImplicitArray,
 									 bool isDependentType,
 									 bool rebuild);

src/interfaces/libpq/libpq-fe.h

@@ -567,7 +567,8 @@ extern void PQprintTuples(const PGresult *res,
 						  FILE *fout,	/* output stream */
 						  int printAttName, /* print attribute names */
 						  int terseOutput,	/* delimiter bars */
-			  int width);		/* width of column, if 0, use variable width */
+						  int width);	/* width of column, if 0, use variable
+										 * width */
 
 
 /* === in fe-lobj.c === */

src/tools/pgindent/pgindent

@@ -12,7 +12,7 @@ use IO::Handle;
 use Getopt::Long;
 
 # Update for pg_bsd_indent version
-my $INDENT_VERSION = "2.0";
+my $INDENT_VERSION = "2.1";
 
 # Our standard indent settings
 my $indent_opts =
@@ -250,22 +250,6 @@ sub post_indent
 	# Use a single space before '*' in function return types
 	$source =~ s!^([A-Za-z_]\S*)[ \t]+\*$!$1 *!gm;
 
-	# Move prototype names to the same line as return type.  Useful
-	# for ctags.  Indent should do this, but it does not.  It formats
-	# prototypes just like real functions.
-
-	my $ident   = qr/[a-zA-Z_][a-zA-Z_0-9]*/;
-	my $comment = qr!/\*.*\*/!;
-
-	$source =~ s!
-			(\n$ident[^(\n]*)\n                  # e.g. static void
-			(
-				$ident\(\n?                      # func_name(
-				(.*,([ \t]*$comment)?\n)*        # args b4 final ln
-				.*\);([ \t]*$comment)?$          # final line
-			)
-		!$1 . (substr($1,-1,1) eq '*' ? '' : ' ') . $2!gmxe;
-
 	return $source;
 }