a/b consitency. Cleanup of regress.patch.

3 files changed, 63 insertions, 65 deletions

diff --git a/postgresql-9.0-base.patch b/postgresql-9.0-base.patch
index a4d7b50..45ecda3 100644
--- a/postgresql-9.0-base.patch
+++ b/postgresql-9.0-base.patch
@@ -1,6 +1,6 @@
-diff -Naur postgresql-9.0.3.orig/contrib/Makefile postgresql-9.0.3/contrib/Makefile
---- postgresql-9.0.3.orig/contrib/Makefile	2011-02-02 07:37:16.654175660 -0500
-+++ postgresql-9.0.3/contrib/Makefile	2011-02-08 05:54:00.145582001 -0500
+diff -Naur a/contrib/Makefile b/contrib/Makefile
+--- a/contrib/Makefile	2011-02-02 07:37:16.654175660 -0500
++++ b/contrib/Makefile	2011-02-08 05:54:00.145582001 -0500
 @@ -5,51 +5,10 @@
  include $(top_builddir)/src/Makefile.global
  
@@ -53,9 +53,9 @@ diff -Naur postgresql-9.0.3.orig/contrib/Makefile postgresql-9.0.3/contrib/Makef
  ifeq ($(with_ossp_uuid),yes)
  SUBDIRS += uuid-ossp
  endif
-diff -Naur postgresql-9.0.3.orig/src/backend/Makefile postgresql-9.0.3/src/backend/Makefile
---- postgresql-9.0.3.orig/src/backend/Makefile	2011-02-02 07:37:56.403870592 -0500
-+++ postgresql-9.0.3/src/backend/Makefile	2011-02-08 05:57:26.078497002 -0500
+diff -Naur a/src/backend/Makefile b/src/backend/Makefile
+--- a/src/backend/Makefile	2011-02-02 07:37:56.403870592 -0500
++++ b/src/backend/Makefile	2011-02-08 05:57:26.078497002 -0500
 @@ -45,7 +45,7 @@
  
  ##########################################################################
@@ -99,9 +99,9 @@ diff -Naur postgresql-9.0.3.orig/src/backend/Makefile postgresql-9.0.3/src/backe
  
  install-bin: postgres $(POSTGRES_IMP) installdirs
  	$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
-diff -Naur postgresql-9.0.3.orig/src/bin/Makefile postgresql-9.0.3/src/bin/Makefile
---- postgresql-9.0.3.orig/src/bin/Makefile	2011-02-02 07:38:35.133570047 -0500
-+++ postgresql-9.0.3/src/bin/Makefile	2011-02-08 05:58:48.819847001 -0500
+diff -Naur a/src/bin/Makefile b/src/bin/Makefile
+--- a/src/bin/Makefile	2011-02-02 07:38:35.133570047 -0500
++++ b/src/bin/Makefile	2011-02-08 05:58:48.819847001 -0500
 @@ -13,8 +13,7 @@
  top_builddir = ../..
  include $(top_builddir)/src/Makefile.global
@@ -112,9 +112,9 @@ diff -Naur postgresql-9.0.3.orig/src/bin/Makefile postgresql-9.0.3/src/bin/Makef
  ifeq ($(PORTNAME), win32)
  SUBDIRS+=pgevent
  endif
-diff -Naur postgresql-9.0.3.orig/src/include/pg_config_manual.h postgresql-9.0.3/src/include/pg_config_manual.h
---- postgresql-9.0.3.orig/src/include/pg_config_manual.h	2011-02-02 07:38:45.143493902 -0500
-+++ postgresql-9.0.3/src/include/pg_config_manual.h	2011-02-08 05:59:32.021437001 -0500
+diff -Naur a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
+--- a/src/include/pg_config_manual.h	2011-02-02 07:38:45.143493902 -0500
++++ b/src/include/pg_config_manual.h	2011-02-08 05:59:32.021437001 -0500
 @@ -141,7 +141,7 @@
   * here's where to twiddle it.  You can also override this at runtime
   * with the postmaster's -k switch.
@@ -124,9 +124,9 @@ diff -Naur postgresql-9.0.3.orig/src/include/pg_config_manual.h postgresql-9.0.3
  
  /*
   * The random() function is expected to yield values between 0 and
-diff -Naur postgresql-9.0.3.orig/src/Makefile postgresql-9.0.3/src/Makefile
---- postgresql-9.0.3.orig/src/Makefile	2011-02-02 07:37:56.283870942 -0500
-+++ postgresql-9.0.3/src/Makefile	2011-02-08 06:00:51.591202002 -0500
+diff -Naur a/src/Makefile b/src/Makefile
+--- a/src/Makefile	2011-02-02 07:37:56.283870942 -0500
++++ b/src/Makefile	2011-02-08 06:00:51.591202002 -0500
 @@ -15,17 +15,11 @@
  
  all install installdirs uninstall distprep:
diff --git a/postgresql-9.0-regress.patch b/postgresql-9.0-regress.patch
index c68b663..c975370 100644
--- a/postgresql-9.0-regress.patch
+++ b/postgresql-9.0-regress.patch
@@ -1,18 +1,16 @@
-diff -Naur postgresql-8.4.7.orig/src/test/regress/pg_regress.c postgresql-8.4.7/src/test/regress/pg_regress.c
---- postgresql-8.4.7.orig/src/test/regress/pg_regress.c	2011-02-02 07:36:51.264416667 -0500
-+++ postgresql-8.4.7/src/test/regress/pg_regress.c	2011-02-06 15:32:38.662748002 -0500
-@@ -790,8 +790,8 @@
- 		sprintf(tmp, "%s/install/%s", temp_install, datadir);
+diff -Naur a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
+--- a/src/test/regress/pg_regress.c	2011-01-27 21:21:31.000000000 -0500
++++ b/src/test/regress/pg_regress.c	2011-03-20 15:23:52.892570541 -0400
+@@ -801,7 +801,7 @@
  		datadir = tmp;
  
--		/* psql will be installed into temp-install bindir */
+ 		/* psql will be installed into temp-install bindir */
 -		psqldir = bindir;
-+		/* psql will be installed into temp-install bindir
-+		   psqldir = bindir; */
++		/* psqldir = bindir; */
  
  		/*
  		 * Set up shared library paths to include the temp install.
-@@ -889,7 +889,7 @@
+@@ -899,7 +899,7 @@
  
  	/* And now we can build and execute the shell command */
  	snprintf(psql_cmd, sizeof(psql_cmd),
@@ -21,7 +19,7 @@ diff -Naur postgresql-8.4.7.orig/src/test/regress/pg_regress.c postgresql-8.4.7/
  			 psqldir ? psqldir : "",
  			 psqldir ? "/" : "",
  			 query_escaped,
-@@ -2137,8 +2137,8 @@
+@@ -2155,8 +2155,8 @@
  		 * Check if there is a postmaster running already.
  		 */
  		snprintf(buf2, sizeof(buf2),
@@ -32,7 +30,7 @@ diff -Naur postgresql-8.4.7.orig/src/test/regress/pg_regress.c postgresql-8.4.7/
  
  		for (i = 0; i < 16; i++)
  		{
-@@ -2169,7 +2169,7 @@
+@@ -2187,7 +2187,7 @@
  		 */
  		header(_("starting postmaster"));
  		snprintf(buf, sizeof(buf),
@@ -41,9 +39,9 @@ diff -Naur postgresql-8.4.7.orig/src/test/regress/pg_regress.c postgresql-8.4.7/
  				 bindir, temp_install,
  				 debug ? " -d 5" : "",
  				 hostname ? hostname : "",
-diff -Naur postgresql-8.4.7.orig/src/test/regress/pg_regress_main.c postgresql-8.4.7/src/test/regress/pg_regress_main.c
---- postgresql-8.4.7.orig/src/test/regress/pg_regress_main.c	2011-02-02 07:36:51.344375302 -0500
-+++ postgresql-8.4.7/src/test/regress/pg_regress_main.c	2011-02-06 15:33:06.318913001 -0500
+diff -Naur a/src/test/regress/pg_regress_main.c b/src/test/regress/pg_regress_main.c
+--- a/src/test/regress/pg_regress_main.c	2011-01-27 21:21:31.000000000 -0500
++++ b/src/test/regress/pg_regress_main.c	2011-03-20 15:24:36.420795540 -0400
 @@ -59,7 +59,7 @@
  	add_stringlist_item(expectfiles, expectfile);
  
diff --git a/postgresql-9.0-server.patch b/postgresql-9.0-server.patch
index e746239..377e381 100644
--- a/postgresql-9.0-server.patch
+++ b/postgresql-9.0-server.patch
@@ -1,6 +1,6 @@
-diff -Naur postgresql-9.0.3.orig/contrib/adminpack/Makefile postgresql-9.0.3/contrib/adminpack/Makefile
---- postgresql-9.0.3.orig/contrib/adminpack/Makefile	2011-02-02 07:37:16.724174266 -0500
-+++ postgresql-9.0.3/contrib/adminpack/Makefile	2011-02-06 18:46:37.086945001 -0500
+diff -Naur a/contrib/adminpack/Makefile b/contrib/adminpack/Makefile
+--- a/contrib/adminpack/Makefile	2011-02-02 07:37:16.724174266 -0500
++++ b/contrib/adminpack/Makefile	2011-02-06 18:46:37.086945001 -0500
 @@ -1,7 +1,7 @@
  # $PostgreSQL: pgsql/contrib/adminpack/Makefile,v 1.6 2007/11/10 23:59:50 momjian Exp $
  
@@ -10,9 +10,9 @@ diff -Naur postgresql-9.0.3.orig/contrib/adminpack/Makefile postgresql-9.0.3/con
  DATA_built = adminpack.sql
  DATA = uninstall_adminpack.sql
  OBJS = adminpack.o
-diff -Naur postgresql-9.0.3.orig/contrib/dblink/Makefile postgresql-9.0.3/contrib/dblink/Makefile
---- postgresql-9.0.3.orig/contrib/dblink/Makefile	2011-02-02 07:37:19.904150270 -0500
-+++ postgresql-9.0.3/contrib/dblink/Makefile	2011-02-06 18:47:10.086945001 -0500
+diff -Naur a/contrib/dblink/Makefile b/contrib/dblink/Makefile
+--- a/contrib/dblink/Makefile	2011-02-02 07:37:19.904150270 -0500
++++ b/contrib/dblink/Makefile	2011-02-06 18:47:10.086945001 -0500
 @@ -1,7 +1,7 @@
  # $PostgreSQL: pgsql/contrib/dblink/Makefile,v 1.15 2007/11/10 23:59:50 momjian Exp $
  
@@ -22,9 +22,9 @@ diff -Naur postgresql-9.0.3.orig/contrib/dblink/Makefile postgresql-9.0.3/contri
  OBJS	= dblink.o
  SHLIB_LINK = $(libpq)
  
-diff -Naur postgresql-9.0.3.orig/contrib/Makefile postgresql-9.0.3/contrib/Makefile
---- postgresql-9.0.3.orig/contrib/Makefile	2011-02-02 07:37:16.654175660 -0500
-+++ postgresql-9.0.3/contrib/Makefile	2011-02-06 19:04:09.240560001 -0500
+diff -Naur a/contrib/Makefile b/contrib/Makefile
+--- a/contrib/Makefile	2011-02-02 07:37:16.654175660 -0500
++++ b/contrib/Makefile	2011-02-06 19:04:09.240560001 -0500
 @@ -23,7 +23,6 @@
  		isn		\
  		lo		\
@@ -51,9 +51,9 @@ diff -Naur postgresql-9.0.3.orig/contrib/Makefile postgresql-9.0.3/contrib/Makef
  
  ifeq ($(with_openssl),yes)
  SUBDIRS += sslinfo
-diff -Naur postgresql-9.0.3.orig/contrib/uuid-ossp/Makefile postgresql-9.0.3/contrib/uuid-ossp/Makefile
---- postgresql-9.0.3.orig/contrib/uuid-ossp/Makefile	2011-02-02 07:37:26.354099087 -0500
-+++ postgresql-9.0.3/contrib/uuid-ossp/Makefile	2011-02-06 18:50:15.566945002 -0500
+diff -Naur a/contrib/uuid-ossp/Makefile b/contrib/uuid-ossp/Makefile
+--- a/contrib/uuid-ossp/Makefile	2011-02-02 07:37:26.354099087 -0500
++++ b/contrib/uuid-ossp/Makefile	2011-02-06 18:50:15.566945002 -0500
 @@ -1,11 +1,12 @@
  # $PostgreSQL: pgsql/contrib/uuid-ossp/Makefile,v 1.4 2007/11/13 00:13:19 tgl Exp $
 +PG_CPPFLAGS += "-DHAVE_OSSP_UUID_H"
@@ -68,9 +68,9 @@ diff -Naur postgresql-9.0.3.orig/contrib/uuid-ossp/Makefile postgresql-9.0.3/con
  
  ifdef USE_PGXS
  PG_CONFIG = pg_config
-diff -Naur postgresql-9.0.3.orig/contrib/xml2/Makefile postgresql-9.0.3/contrib/xml2/Makefile
---- postgresql-9.0.3.orig/contrib/xml2/Makefile	2011-02-02 07:37:26.444099780 -0500
-+++ postgresql-9.0.3/contrib/xml2/Makefile	2011-02-06 18:53:04.816945002 -0500
+diff -Naur a/contrib/xml2/Makefile b/contrib/xml2/Makefile
+--- a/contrib/xml2/Makefile	2011-02-02 07:37:26.444099780 -0500
++++ b/contrib/xml2/Makefile	2011-02-06 18:53:04.816945002 -0500
 @@ -4,7 +4,8 @@
  
  OBJS = xpath.o xslt_proc.o
@@ -81,9 +81,9 @@ diff -Naur postgresql-9.0.3.orig/contrib/xml2/Makefile postgresql-9.0.3/contrib/
  
  DATA_built = pgxml.sql
  DATA = uninstall_pgxml.sql
-diff -Naur postgresql-9.0.3.orig/GNUmakefile.in postgresql-9.0.3/GNUmakefile.in
---- postgresql-9.0.3.orig/GNUmakefile.in	2011-02-02 07:37:14.644191250 -0500
-+++ postgresql-9.0.3/GNUmakefile.in	2011-02-06 18:55:44.316945002 -0500
+diff -Naur a/GNUmakefile.in b/GNUmakefile.in
+--- a/GNUmakefile.in	2011-02-02 07:37:14.644191250 -0500
++++ b/GNUmakefile.in	2011-02-06 18:55:44.316945002 -0500
 @@ -10,7 +10,6 @@
  
  all:
@@ -108,9 +108,9 @@ diff -Naur postgresql-9.0.3.orig/GNUmakefile.in postgresql-9.0.3/GNUmakefile.in
  
  distprep:
  	$(MAKE) -C doc $@
-diff -Naur postgresql-9.0.3.orig/src/bin/initdb/Makefile postgresql-9.0.3/src/bin/initdb/Makefile
---- postgresql-9.0.3.orig/src/bin/initdb/Makefile	2011-02-02 07:38:35.193570971 -0500
-+++ postgresql-9.0.3/src/bin/initdb/Makefile	2011-02-06 18:57:13.786945002 -0500
+diff -Naur a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
+--- a/src/bin/initdb/Makefile	2011-02-02 07:38:35.193570971 -0500
++++ b/src/bin/initdb/Makefile	2011-02-06 18:57:13.786945002 -0500
 @@ -16,7 +16,7 @@
  top_builddir = ../../..
  include $(top_builddir)/src/Makefile.global
@@ -120,9 +120,9 @@ diff -Naur postgresql-9.0.3.orig/src/bin/initdb/Makefile postgresql-9.0.3/src/bi
  
  OBJS=	initdb.o encnames.o pqsignal.o $(WIN32RES)
  
-diff -Naur postgresql-9.0.3.orig/src/bin/Makefile postgresql-9.0.3/src/bin/Makefile
---- postgresql-9.0.3.orig/src/bin/Makefile	2011-02-02 07:38:35.133570047 -0500
-+++ postgresql-9.0.3/src/bin/Makefile	2011-02-06 18:58:37.556945000 -0500
+diff -Naur a/src/bin/Makefile b/src/bin/Makefile
+--- a/src/bin/Makefile	2011-02-02 07:38:35.133570047 -0500
++++ b/src/bin/Makefile	2011-02-06 18:58:37.556945000 -0500
 @@ -13,8 +13,7 @@
  top_builddir = ../..
  include $(top_builddir)/src/Makefile.global
@@ -133,9 +133,9 @@ diff -Naur postgresql-9.0.3.orig/src/bin/Makefile postgresql-9.0.3/src/bin/Makef
  ifeq ($(PORTNAME), win32)
  SUBDIRS+=pgevent
  endif
-diff -Naur postgresql-9.0.3.orig/src/include/pg_config_manual.h postgresql-9.0.3/src/include/pg_config_manual.h
---- postgresql-9.0.3.orig/src/include/pg_config_manual.h	2011-02-02 07:38:45.143493902 -0500
-+++ postgresql-9.0.3/src/include/pg_config_manual.h	2011-02-06 18:59:24.906945001 -0500
+diff -Naur a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
+--- a/src/include/pg_config_manual.h	2011-02-02 07:38:45.143493902 -0500
++++ b/src/include/pg_config_manual.h	2011-02-06 18:59:24.906945001 -0500
 @@ -141,7 +141,7 @@
   * here's where to twiddle it.  You can also override this at runtime
   * with the postmaster's -k switch.
@@ -145,9 +145,9 @@ diff -Naur postgresql-9.0.3.orig/src/include/pg_config_manual.h postgresql-9.0.3
  
  /*
   * The random() function is expected to yield values between 0 and
-diff -Naur postgresql-9.0.3.orig/src/Makefile postgresql-9.0.3/src/Makefile
---- postgresql-9.0.3.orig/src/Makefile	2011-02-02 07:37:56.283870942 -0500
-+++ postgresql-9.0.3/src/Makefile	2011-02-06 19:00:45.076945001 -0500
+diff -Naur a/src/Makefile b/src/Makefile
+--- a/src/Makefile	2011-02-02 07:37:56.283870942 -0500
++++ b/src/Makefile	2011-02-06 19:00:45.076945001 -0500
 @@ -19,15 +19,12 @@
  	$(MAKE) -C backend $@
  	$(MAKE) -C backend/utils/mb/conversion_procs $@
@@ -165,9 +165,9 @@ diff -Naur postgresql-9.0.3.orig/src/Makefile postgresql-9.0.3/src/Makefile
  
  install-local: installdirs-local
  	$(INSTALL_DATA) Makefile.global '$(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.global'
-diff -Naur postgresql-9.0.3.orig/src/Makefile.global.in postgresql-9.0.3/src/Makefile.global.in
---- postgresql-9.0.3.orig/src/Makefile.global.in	2011-02-02 07:37:56.313868792 -0500
-+++ postgresql-9.0.3/src/Makefile.global.in	2011-02-06 19:02:14.716945002 -0500
+diff -Naur a/src/Makefile.global.in b/src/Makefile.global.in
+--- a/src/Makefile.global.in	2011-02-02 07:37:56.313868792 -0500
++++ b/src/Makefile.global.in	2011-02-06 19:02:14.716945002 -0500
 @@ -458,6 +458,7 @@
     LDFLAGS += $(PROFILE)
  endif
@@ -176,9 +176,9 @@ diff -Naur postgresql-9.0.3.orig/src/Makefile.global.in postgresql-9.0.3/src/Mak
  
  ##########################################################################
  #
-diff -Naur postgresql-9.0.3.orig/src/port/Makefile postgresql-9.0.3/src/port/Makefile
---- postgresql-9.0.3.orig/src/port/Makefile	2011-02-02 07:38:59.183388185 -0500
-+++ postgresql-9.0.3/src/port/Makefile	2011-02-06 19:04:00.876945002 -0500
+diff -Naur a/src/port/Makefile b/src/port/Makefile
+--- a/src/port/Makefile	2011-02-02 07:38:59.183388185 -0500
++++ b/src/port/Makefile	2011-02-06 19:04:00.876945002 -0500
 @@ -39,11 +39,10 @@
  # foo_srv.o and foo.o are both built from foo.c, but only foo.o has -DFRONTEND
  OBJS_SRV = $(OBJS:%.o=%_srv.o)