[gentoo-commits] proj/pgsql-patches:9.1 commit in: /

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/pgsql-patches:9.1 commit in: /
@ 2011-03-19 22:51 Aaron Swenson
  0 siblings, 0 replies; 13+ messages in thread
From: Aaron Swenson @ 2011-03-19 22:51 UTC (permalink / raw
  To: gentoo-commits

commit:     fc2fd56fc214a9724d194b3b5f622170517287a3
Author:     Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 19 22:50:19 2011 +0000
Commit:     Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Sat Mar 19 22:50:19 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pgsql-patches.git;a=commit;h=fc2fd56f

a/b consistency.

---
 postgresql-9.1alpha4-autoconf.patch |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/postgresql-9.1alpha4-autoconf.patch b/postgresql-9.1alpha4-autoconf.patch
index d88e2ac..2ba6e3f 100644
--- a/postgresql-9.1alpha4-autoconf.patch
+++ b/postgresql-9.1alpha4-autoconf.patch
@@ -1,4 +1,4 @@
-diff -Naur from/configure.in to/configure.in
+diff -Naur a/configure.in b/configure.in
 --- from/configure.in	2010-07-08 22:43:12.000000000 -0400
 +++ to/configure.in	2010-07-12 00:13:37.585527031 -0400
 @@ -19,10 +19,6 @@



^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/pgsql-patches:9.1 commit in: /
@ 2011-03-19 23:27 Aaron Swenson
  0 siblings, 0 replies; 13+ messages in thread
From: Aaron Swenson @ 2011-03-19 23:27 UTC (permalink / raw
  To: gentoo-commits

commit:     bb7cde36901e6078812ddd85709ad77df82be22f
Author:     Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 19 23:26:58 2011 +0000
Commit:     Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Sat Mar 19 23:26:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pgsql-patches.git;a=commit;h=bb7cde36

Really a/b consistent.

---
 postgresql-9.1alpha4-autoconf.patch |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/postgresql-9.1alpha4-autoconf.patch b/postgresql-9.1alpha4-autoconf.patch
index 2ba6e3f..a2027a7 100644
--- a/postgresql-9.1alpha4-autoconf.patch
+++ b/postgresql-9.1alpha4-autoconf.patch
@@ -1,6 +1,6 @@
 diff -Naur a/configure.in b/configure.in
---- from/configure.in	2010-07-08 22:43:12.000000000 -0400
-+++ to/configure.in	2010-07-12 00:13:37.585527031 -0400
+--- a/configure.in	2010-07-08 22:43:12.000000000 -0400
++++ b/configure.in	2010-07-12 00:13:37.585527031 -0400
 @@ -19,10 +19,6 @@
  
  AC_INIT([PostgreSQL], [9.1alpha4], [pgsql-bugs@postgresql.org])



^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/pgsql-patches:9.1 commit in: /
@ 2011-03-30  9:49 Aaron Swenson
  0 siblings, 0 replies; 13+ messages in thread
From: Aaron Swenson @ 2011-03-30  9:49 UTC (permalink / raw
  To: gentoo-commits

commit:     ae46fa28f4d88c709404cc326998482dfc4c42f9
Author:     Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 30 00:33:41 2011 +0000
Commit:     Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Wed Mar 30 00:33:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pgsql-patches.git;a=commit;h=ae46fa28

Filename consistent with other branches.

---
 ...esql-9.1alpha4-autoconf.patch => autoconf.patch |    0
 postgresql-9.1alpha4-base.patch => base.patch      |    0
 ...gresql-9.1alpha4-regress.patch => regress.patch |    0
 postgresql-9.1alpha4-server.patch => server.patch  |    0
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/postgresql-9.1alpha4-autoconf.patch b/autoconf.patch
similarity index 100%
rename from postgresql-9.1alpha4-autoconf.patch
rename to autoconf.patch

diff --git a/postgresql-9.1alpha4-base.patch b/base.patch
similarity index 100%
rename from postgresql-9.1alpha4-base.patch
rename to base.patch

diff --git a/postgresql-9.1alpha4-regress.patch b/regress.patch
similarity index 100%
rename from postgresql-9.1alpha4-regress.patch
rename to regress.patch

diff --git a/postgresql-9.1alpha4-server.patch b/server.patch
similarity index 100%
rename from postgresql-9.1alpha4-server.patch
rename to server.patch



^ permalink raw reply	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/pgsql-patches:9.1 commit in: /
@ 2011-03-30  9:49 Aaron Swenson
  0 siblings, 0 replies; 13+ messages in thread
From: Aaron Swenson @ 2011-03-30  9:49 UTC (permalink / raw
  To: gentoo-commits

commit:     9b91cddb03b5c23d9e7f583520586afad2ced728
Author:     Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 30 09:49:16 2011 +0000
Commit:     Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Wed Mar 30 09:49:16 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pgsql-patches.git;a=commit;h=9b91cddb

Updated for 9.1alpha5

---
 base.patch |   27 +++++++++++++--------------
 1 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/base.patch b/base.patch
index cf2cb3f..c55bb77 100644
--- a/base.patch
+++ b/base.patch
@@ -1,7 +1,7 @@
 diff -Naur a/contrib/Makefile b/contrib/Makefile
---- a/contrib/Makefile	2011-03-09 09:19:24.000000000 -0500
-+++ b/contrib/Makefile	2011-03-18 18:44:16.832829001 -0400
-@@ -5,55 +5,10 @@
+--- a/contrib/Makefile	2011-03-28 09:42:09.000000000 -0400
++++ b/contrib/Makefile	2011-03-29 20:18:08.394999851 -0400
+@@ -5,54 +5,10 @@
  include $(top_builddir)/src/Makefile.global
  
  SUBDIRS = \
@@ -53,13 +53,12 @@ diff -Naur a/contrib/Makefile b/contrib/Makefile
 -ifeq ($(with_openssl),yes)
 -SUBDIRS += sslinfo
 -endif
--
+ 
  ifeq ($(with_ossp_uuid),yes)
  SUBDIRS += uuid-ossp
- endif
 diff -Naur a/src/Makefile b/src/Makefile
---- a/src/Makefile	2011-03-09 09:19:24.000000000 -0500
-+++ b/src/Makefile	2011-03-18 18:52:50.115898001 -0400
+--- a/src/Makefile	2011-03-28 09:42:09.000000000 -0400
++++ b/src/Makefile	2011-03-29 20:19:45.356494851 -0400
 @@ -14,17 +14,11 @@
  
  SUBDIRS = \
@@ -80,8 +79,8 @@ diff -Naur a/src/Makefile b/src/Makefile
  # There are too many interdependencies between the subdirectories, so
  # don't attempt parallel make here.
 diff -Naur a/src/backend/Makefile b/src/backend/Makefile
---- a/src/backend/Makefile	2011-03-09 09:19:24.000000000 -0500
-+++ b/src/backend/Makefile	2011-03-18 18:48:58.775898001 -0400
+--- a/src/backend/Makefile	2011-03-28 09:42:09.000000000 -0400
++++ b/src/backend/Makefile	2011-03-29 20:24:25.836184851 -0400
 @@ -45,7 +45,7 @@
  
  ##########################################################################
@@ -100,7 +99,7 @@ diff -Naur a/src/backend/Makefile b/src/backend/Makefile
  
  # run this unconditionally to avoid needing to know its dependencies here:
  submake-schemapg:
-@@ -203,23 +203,7 @@
+@@ -205,23 +205,7 @@
  
  ##########################################################################
  
@@ -126,8 +125,8 @@ diff -Naur a/src/backend/Makefile b/src/backend/Makefile
  install-bin: postgres $(POSTGRES_IMP) installdirs
  	$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
 diff -Naur a/src/bin/Makefile b/src/bin/Makefile
---- a/src/bin/Makefile	2011-03-09 09:19:24.000000000 -0500
-+++ b/src/bin/Makefile	2011-03-18 18:50:41.615898001 -0400
+--- a/src/bin/Makefile	2011-03-28 09:42:09.000000000 -0400
++++ b/src/bin/Makefile	2011-03-29 20:25:34.162004851 -0400
 @@ -13,8 +13,7 @@
  top_builddir = ../..
  include $(top_builddir)/src/Makefile.global
@@ -139,8 +138,8 @@ diff -Naur a/src/bin/Makefile b/src/bin/Makefile
  SUBDIRS+=pgevent
  endif
 diff -Naur a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
---- a/src/include/pg_config_manual.h	2011-03-09 09:19:24.000000000 -0500
-+++ b/src/include/pg_config_manual.h	2011-03-18 18:51:36.835898001 -0400
+--- a/src/include/pg_config_manual.h	2011-03-28 09:42:09.000000000 -0400
++++ b/src/include/pg_config_manual.h	2011-03-29 20:26:50.973579851 -0400
 @@ -141,7 +141,7 @@
   * here's where to twiddle it.  You can also override this at runtime
   * with the postmaster's -k switch.



^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/pgsql-patches:9.1 commit in: /
@ 2011-07-04 22:55 Aaron Swenson
  0 siblings, 0 replies; 13+ messages in thread
From: Aaron Swenson @ 2011-07-04 22:55 UTC (permalink / raw
  To: gentoo-commits

commit:     4996bbe6286d64eb4ac7dba22e516e9779acb3af
Author:     Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  3 01:58:33 2011 +0000
Commit:     Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 01:58:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pgsql-patches.git;a=commit;h=4996bbe6

Updated for 9.1beta2

---
 autoconf.patch |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/autoconf.patch b/autoconf.patch
index 2a82580..0eeeabf 100644
--- a/autoconf.patch
+++ b/autoconf.patch
@@ -1,9 +1,9 @@
 diff -Naur a/configure.in b/configure.in
---- a/configure.in	2011-04-27 17:17:22.000000000 -0400
-+++ b/configure.in	2011-05-02 18:02:31.471665153 -0400
+--- a/configure.in	2011-06-09 19:40:42.000000000 -0400
++++ b/configure.in	2011-06-25 16:18:43.649614947 -0400
 @@ -19,10 +19,6 @@
  
- AC_INIT([PostgreSQL], [9.1beta1], [pgsql-bugs@postgresql.org])
+ AC_INIT([PostgreSQL], [9.1beta2], [pgsql-bugs@postgresql.org])
  
 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required.
 -Untested combinations of 'autoconf' and PostgreSQL versions are not



^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/pgsql-patches:9.1 commit in: /
@ 2011-07-04 22:55 Aaron Swenson
  0 siblings, 0 replies; 13+ messages in thread
From: Aaron Swenson @ 2011-07-04 22:55 UTC (permalink / raw
  To: gentoo-commits

commit:     04438018ea6236a1018e5e3a3676fcc755358664
Author:     Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  4 22:55:13 2011 +0000
Commit:     Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Mon Jul  4 22:55:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pgsql-patches.git;a=commit;h=04438018

Adding 'pg_dump' back in.

---
 base.patch |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/base.patch b/base.patch
index 9c53e1b..4c8d1b2 100644
--- a/base.patch
+++ b/base.patch
@@ -133,7 +133,7 @@ diff -Naur a/src/bin/Makefile b/src/bin/Makefile
  
 -SUBDIRS = initdb pg_ctl pg_dump \
 -	psql scripts pg_config pg_controldata pg_resetxlog pg_basebackup
-+SUBDIRS = psql scripts pg_config
++SUBDIRS = pg_dump psql scripts pg_config
  ifeq ($(PORTNAME), win32)
  SUBDIRS+=pgevent
  endif



^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/pgsql-patches:9.1 commit in: /
@ 2011-07-04 22:55 Aaron Swenson
  0 siblings, 0 replies; 13+ messages in thread
From: Aaron Swenson @ 2011-07-04 22:55 UTC (permalink / raw
  To: gentoo-commits

commit:     f15bfd5e94ee08640ffe900a5eb4fe793abec673
Author:     Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Mon May  2 23:05:52 2011 +0000
Commit:     Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Mon May  2 23:05:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pgsql-patches.git;a=commit;h=f15bfd5e

Update for PostgreSQL 9.1beta1

---
 autoconf.patch |    6 ++--
 base.patch     |   22 ++++++++++----------
 regress.patch  |   16 +++++++-------
 server.patch   |   62 ++++++++++++++++++++++++++++----------------------------
 4 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/autoconf.patch b/autoconf.patch
index a2027a7..2a82580 100644
--- a/autoconf.patch
+++ b/autoconf.patch
@@ -1,9 +1,9 @@
 diff -Naur a/configure.in b/configure.in
---- a/configure.in	2010-07-08 22:43:12.000000000 -0400
-+++ b/configure.in	2010-07-12 00:13:37.585527031 -0400
+--- a/configure.in	2011-04-27 17:17:22.000000000 -0400
++++ b/configure.in	2011-05-02 18:02:31.471665153 -0400
 @@ -19,10 +19,6 @@
  
- AC_INIT([PostgreSQL], [9.1alpha4], [pgsql-bugs@postgresql.org])
+ AC_INIT([PostgreSQL], [9.1beta1], [pgsql-bugs@postgresql.org])
  
 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required.
 -Untested combinations of 'autoconf' and PostgreSQL versions are not

diff --git a/base.patch b/base.patch
index c55bb77..9c53e1b 100644
--- a/base.patch
+++ b/base.patch
@@ -1,6 +1,6 @@
 diff -Naur a/contrib/Makefile b/contrib/Makefile
---- a/contrib/Makefile	2011-03-28 09:42:09.000000000 -0400
-+++ b/contrib/Makefile	2011-03-29 20:18:08.394999851 -0400
+--- a/contrib/Makefile	2011-04-27 17:17:22.000000000 -0400
++++ b/contrib/Makefile	2011-05-02 18:13:25.185010280 -0400
 @@ -5,54 +5,10 @@
  include $(top_builddir)/src/Makefile.global
  
@@ -57,8 +57,8 @@ diff -Naur a/contrib/Makefile b/contrib/Makefile
  ifeq ($(with_ossp_uuid),yes)
  SUBDIRS += uuid-ossp
 diff -Naur a/src/Makefile b/src/Makefile
---- a/src/Makefile	2011-03-28 09:42:09.000000000 -0400
-+++ b/src/Makefile	2011-03-29 20:19:45.356494851 -0400
+--- a/src/Makefile	2011-04-27 17:17:22.000000000 -0400
++++ b/src/Makefile	2011-05-02 18:14:24.435313471 -0400
 @@ -14,17 +14,11 @@
  
  SUBDIRS = \
@@ -79,8 +79,8 @@ diff -Naur a/src/Makefile b/src/Makefile
  # There are too many interdependencies between the subdirectories, so
  # don't attempt parallel make here.
 diff -Naur a/src/backend/Makefile b/src/backend/Makefile
---- a/src/backend/Makefile	2011-03-28 09:42:09.000000000 -0400
-+++ b/src/backend/Makefile	2011-03-29 20:24:25.836184851 -0400
+--- a/src/backend/Makefile	2011-04-27 17:17:22.000000000 -0400
++++ b/src/backend/Makefile	2011-05-02 18:19:06.946759115 -0400
 @@ -45,7 +45,7 @@
  
  ##########################################################################
@@ -125,21 +125,21 @@ diff -Naur a/src/backend/Makefile b/src/backend/Makefile
  install-bin: postgres $(POSTGRES_IMP) installdirs
  	$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
 diff -Naur a/src/bin/Makefile b/src/bin/Makefile
---- a/src/bin/Makefile	2011-03-28 09:42:09.000000000 -0400
-+++ b/src/bin/Makefile	2011-03-29 20:25:34.162004851 -0400
+--- a/src/bin/Makefile	2011-04-27 17:17:22.000000000 -0400
++++ b/src/bin/Makefile	2011-05-02 18:20:49.697284900 -0400
 @@ -13,8 +13,7 @@
  top_builddir = ../..
  include $(top_builddir)/src/Makefile.global
  
 -SUBDIRS = initdb pg_ctl pg_dump \
 -	psql scripts pg_config pg_controldata pg_resetxlog pg_basebackup
-+SUBDIRS = pg_dump psql scripts pg_config
++SUBDIRS = psql scripts pg_config
  ifeq ($(PORTNAME), win32)
  SUBDIRS+=pgevent
  endif
 diff -Naur a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
---- a/src/include/pg_config_manual.h	2011-03-28 09:42:09.000000000 -0400
-+++ b/src/include/pg_config_manual.h	2011-03-29 20:26:50.973579851 -0400
+--- a/src/include/pg_config_manual.h	2011-04-27 17:17:22.000000000 -0400
++++ b/src/include/pg_config_manual.h	2011-05-02 18:21:59.197640542 -0400
 @@ -141,7 +141,7 @@
   * here's where to twiddle it.  You can also override this at runtime
   * with the postmaster's -k switch.

diff --git a/regress.patch b/regress.patch
index a42ed7e..cf706a6 100644
--- a/regress.patch
+++ b/regress.patch
@@ -1,7 +1,7 @@
 diff -Naur a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
---- a/src/test/regress/pg_regress.c	2011-03-09 09:19:24.000000000 -0500
-+++ b/src/test/regress/pg_regress.c	2011-03-18 22:07:11.104847001 -0400
-@@ -803,7 +803,7 @@
+--- a/src/test/regress/pg_regress.c	2011-04-27 17:17:22.000000000 -0400
++++ b/src/test/regress/pg_regress.c	2011-05-02 19:01:20.470763739 -0400
+@@ -806,7 +806,7 @@
  		datadir = tmp;
  
  		/* psql will be installed into temp-install bindir */
@@ -10,7 +10,7 @@ diff -Naur a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
  
  		/*
  		 * Set up shared library paths to include the temp install.
-@@ -901,7 +901,7 @@
+@@ -906,7 +906,7 @@
  
  	/* And now we can build and execute the shell command */
  	snprintf(psql_cmd, sizeof(psql_cmd),
@@ -19,7 +19,7 @@ diff -Naur a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
  			 psqldir ? psqldir : "",
  			 psqldir ? "/" : "",
  			 query_escaped,
-@@ -2178,8 +2178,8 @@
+@@ -2207,8 +2207,8 @@
  		 * Check if there is a postmaster running already.
  		 */
  		snprintf(buf2, sizeof(buf2),
@@ -30,7 +30,7 @@ diff -Naur a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
  
  		for (i = 0; i < 16; i++)
  		{
-@@ -2210,7 +2210,7 @@
+@@ -2239,7 +2239,7 @@
  		 */
  		header(_("starting postmaster"));
  		snprintf(buf, sizeof(buf),
@@ -40,8 +40,8 @@ diff -Naur a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
  				 debug ? " -d 5" : "",
  				 hostname ? hostname : "",
 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-03-09 09:19:24.000000000 -0500
-+++ b/src/test/regress/pg_regress_main.c	2011-03-18 22:10:05.263089001 -0400
+--- a/src/test/regress/pg_regress_main.c	2011-04-27 17:17:22.000000000 -0400
++++ b/src/test/regress/pg_regress_main.c	2011-05-02 19:02:23.571086780 -0400
 @@ -64,7 +64,7 @@
  						   "%s ", launcher);
  

diff --git a/server.patch b/server.patch
index d2703f1..f3bc148 100644
--- a/server.patch
+++ b/server.patch
@@ -1,6 +1,6 @@
 diff -Naur a/GNUmakefile.in b/GNUmakefile.in
---- a/GNUmakefile.in	2011-03-09 09:19:24.000000000 -0500
-+++ b/GNUmakefile.in	2011-03-18 19:17:04.815898001 -0400
+--- a/GNUmakefile.in	2011-04-27 17:17:22.000000000 -0400
++++ b/GNUmakefile.in	2011-05-02 18:32:41.400926770 -0400
 @@ -8,7 +8,7 @@
  top_builddir = .
  include $(top_builddir)/src/Makefile.global
@@ -34,8 +34,8 @@ diff -Naur a/GNUmakefile.in b/GNUmakefile.in
  $(call recurse,distprep,doc src config contrib)
  
 diff -Naur a/contrib/Makefile b/contrib/Makefile
---- a/contrib/Makefile	2011-03-09 09:19:24.000000000 -0500
-+++ b/contrib/Makefile	2011-03-18 19:10:24.415898001 -0400
+--- a/contrib/Makefile	2011-04-27 17:17:22.000000000 -0400
++++ b/contrib/Makefile	2011-05-02 18:34:03.901348935 -0400
 @@ -26,7 +26,6 @@
  		isn		\
  		lo		\
@@ -63,8 +63,8 @@ diff -Naur a/contrib/Makefile b/contrib/Makefile
  ifeq ($(with_openssl),yes)
  SUBDIRS += sslinfo
 diff -Naur a/contrib/adminpack/Makefile b/contrib/adminpack/Makefile
---- a/contrib/adminpack/Makefile	2011-03-09 09:19:24.000000000 -0500
-+++ b/contrib/adminpack/Makefile	2011-03-18 19:08:19.375898001 -0400
+--- a/contrib/adminpack/Makefile	2011-04-27 17:17:22.000000000 -0400
++++ b/contrib/adminpack/Makefile	2011-05-02 18:35:24.991763884 -0400
 @@ -2,7 +2,7 @@
  
  MODULE_big = adminpack
@@ -75,8 +75,8 @@ diff -Naur a/contrib/adminpack/Makefile b/contrib/adminpack/Makefile
  EXTENSION = adminpack
  DATA = adminpack--1.0.sql
 diff -Naur a/contrib/dblink/Makefile b/contrib/dblink/Makefile
---- a/contrib/dblink/Makefile	2011-03-09 09:19:24.000000000 -0500
-+++ b/contrib/dblink/Makefile	2011-03-18 19:09:04.655898001 -0400
+--- a/contrib/dblink/Makefile	2011-04-27 17:17:22.000000000 -0400
++++ b/contrib/dblink/Makefile	2011-05-02 18:36:02.701956851 -0400
 @@ -2,7 +2,7 @@
  
  MODULE_big = dblink
@@ -87,13 +87,12 @@ diff -Naur a/contrib/dblink/Makefile b/contrib/dblink/Makefile
  SHLIB_PREREQS = submake-libpq
  
 diff -Naur a/contrib/uuid-ossp/Makefile b/contrib/uuid-ossp/Makefile
---- a/contrib/uuid-ossp/Makefile	2011-03-09 09:19:24.000000000 -0500
-+++ b/contrib/uuid-ossp/Makefile	2011-03-18 19:11:40.055898001 -0400
-@@ -1,12 +1,14 @@
+--- a/contrib/uuid-ossp/Makefile	2011-04-27 17:17:22.000000000 -0400
++++ b/contrib/uuid-ossp/Makefile	2011-05-02 18:38:24.893721477 -0400
+@@ -1,12 +1,12 @@
  # contrib/uuid-ossp/Makefile
- 
+-
 +PG_CPPFLAGS += "-DHAVE_OSSP_UUID_H"
-+
  MODULE_big = uuid-ossp
  OBJS = uuid-ossp.o
  
@@ -106,21 +105,22 @@ diff -Naur a/contrib/uuid-ossp/Makefile b/contrib/uuid-ossp/Makefile
  ifdef USE_PGXS
  PG_CONFIG = pg_config
 diff -Naur a/contrib/xml2/Makefile b/contrib/xml2/Makefile
---- a/contrib/xml2/Makefile	2011-03-09 09:19:24.000000000 -0500
-+++ b/contrib/xml2/Makefile	2011-03-18 19:13:29.625898001 -0400
-@@ -8,7 +8,8 @@
+--- a/contrib/xml2/Makefile	2011-04-27 17:17:22.000000000 -0400
++++ b/contrib/xml2/Makefile	2011-05-02 18:41:30.824673350 -0400
+@@ -7,8 +7,8 @@
+ DATA = xml2--1.0.sql xml2--unpackaged--1.0.sql
  
  REGRESS = xml2
- 
+-
 -SHLIB_LINK += $(filter -lxslt, $(LIBS)) $(filter -lxml2, $(LIBS))
-+PG_CPPFLAGS = $(shell xml2-config --cflags)                                    
++PG_CPPFLAGS = $(shell xml2-config --cflags)
 +SHLIB_LINK += $(shell xml2-config --libs) $(shell xslt-config --libs)
  
  ifdef USE_PGXS
  PG_CONFIG = pg_config
 diff -Naur a/src/Makefile b/src/Makefile
---- a/src/Makefile	2011-03-09 09:19:24.000000000 -0500
-+++ b/src/Makefile	2011-03-18 19:43:49.633641001 -0400
+--- a/src/Makefile	2011-04-27 17:17:22.000000000 -0400
++++ b/src/Makefile	2011-05-02 18:43:02.395142144 -0400
 @@ -18,12 +18,9 @@
  	backend \
  	backend/utils/mb/conversion_procs \
@@ -144,9 +144,9 @@ diff -Naur a/src/Makefile b/src/Makefile
  install-local: installdirs-local
  	$(INSTALL_DATA) Makefile.global '$(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.global'
 diff -Naur a/src/Makefile.global.in b/src/Makefile.global.in
---- a/src/Makefile.global.in	2011-03-09 09:19:24.000000000 -0500
-+++ b/src/Makefile.global.in	2011-03-18 19:59:53.876991001 -0400
-@@ -474,6 +474,7 @@
+--- a/src/Makefile.global.in	2011-04-27 17:17:22.000000000 -0400
++++ b/src/Makefile.global.in	2011-05-02 18:45:16.765830055 -0400
+@@ -480,6 +480,7 @@
     LDFLAGS += $(PROFILE)
  endif
  
@@ -155,8 +155,8 @@ diff -Naur a/src/Makefile.global.in b/src/Makefile.global.in
  ##########################################################################
  #
 diff -Naur a/src/bin/Makefile b/src/bin/Makefile
---- a/src/bin/Makefile	2011-03-09 09:19:24.000000000 -0500
-+++ b/src/bin/Makefile	2011-03-18 19:29:28.872631001 -0400
+--- a/src/bin/Makefile	2011-04-27 17:17:22.000000000 -0400
++++ b/src/bin/Makefile	2011-05-02 18:47:05.106384704 -0400
 @@ -13,8 +13,7 @@
  top_builddir = ../..
  include $(top_builddir)/src/Makefile.global
@@ -168,8 +168,8 @@ diff -Naur a/src/bin/Makefile b/src/bin/Makefile
  SUBDIRS+=pgevent
  endif
 diff -Naur a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
---- a/src/bin/initdb/Makefile	2011-03-09 09:19:24.000000000 -0500
-+++ b/src/bin/initdb/Makefile	2011-03-18 19:27:46.042631001 -0400
+--- a/src/bin/initdb/Makefile	2011-04-27 17:17:22.000000000 -0400
++++ b/src/bin/initdb/Makefile	2011-05-02 18:48:35.636848175 -0400
 @@ -16,7 +16,7 @@
  top_builddir = ../../..
  include $(top_builddir)/src/Makefile.global
@@ -180,8 +180,8 @@ diff -Naur a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
  OBJS=	initdb.o encnames.o pqsignal.o $(WIN32RES)
  
 diff -Naur a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
---- a/src/include/pg_config_manual.h	2011-03-09 09:19:24.000000000 -0500
-+++ b/src/include/pg_config_manual.h	2011-03-18 19:30:57.712631001 -0400
+--- a/src/include/pg_config_manual.h	2011-04-27 17:17:22.000000000 -0400
++++ b/src/include/pg_config_manual.h	2011-05-02 18:49:38.277168861 -0400
 @@ -141,7 +141,7 @@
   * here's where to twiddle it.  You can also override this at runtime
   * with the postmaster's -k switch.
@@ -192,8 +192,8 @@ diff -Naur a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
  /*
   * The random() function is expected to yield values between 0 and
 diff -Naur a/src/port/Makefile b/src/port/Makefile
---- a/src/port/Makefile	2011-03-09 09:19:24.000000000 -0500
-+++ b/src/port/Makefile	2011-03-18 20:01:10.986991001 -0400
+--- a/src/port/Makefile	2011-04-27 17:17:22.000000000 -0400
++++ b/src/port/Makefile	2011-05-02 18:50:27.707421919 -0400
 @@ -37,11 +37,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)



^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/pgsql-patches:9.1 commit in: /
@ 2011-07-13 21:52 Aaron Swenson
  0 siblings, 0 replies; 13+ messages in thread
From: Aaron Swenson @ 2011-07-13 21:52 UTC (permalink / raw
  To: gentoo-commits

commit:     ddb050b7b96da2db7f120ccebcc47d109298f6b2
Author:     Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 21:52:33 2011 +0000
Commit:     Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 21:52:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pgsql-patches.git;a=commit;h=ddb050b7

Updated for beta 3

---
 base.patch |   40 +++++++++++++++++++++-------------------
 1 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/base.patch b/base.patch
index 4c8d1b2..9a1b711 100644
--- a/base.patch
+++ b/base.patch
@@ -1,7 +1,7 @@
-diff -Naur a/contrib/Makefile b/contrib/Makefile
---- a/contrib/Makefile	2011-04-27 17:17:22.000000000 -0400
-+++ b/contrib/Makefile	2011-05-02 18:13:25.185010280 -0400
-@@ -5,54 +5,10 @@
+diff -Naur postgresql-9.1beta3.orig/contrib/Makefile postgresql-9.1beta3/contrib/Makefile
+--- postgresql-9.1beta3.orig/contrib/Makefile	2011-07-07 20:12:33.000000000 -0400
++++ postgresql-9.1beta3/contrib/Makefile	2011-07-13 17:33:27.267411316 -0400
+@@ -5,56 +5,10 @@
  include $(top_builddir)/src/Makefile.global
  
  SUBDIRS = \
@@ -52,13 +52,15 @@ diff -Naur a/contrib/Makefile b/contrib/Makefile
  
 -ifeq ($(with_openssl),yes)
 -SUBDIRS += sslinfo
+-else
+-ALWAYS_SUBDIRS += sslinfo
 -endif
  
  ifeq ($(with_ossp_uuid),yes)
  SUBDIRS += uuid-ossp
-diff -Naur a/src/Makefile b/src/Makefile
---- a/src/Makefile	2011-04-27 17:17:22.000000000 -0400
-+++ b/src/Makefile	2011-05-02 18:14:24.435313471 -0400
+diff -Naur postgresql-9.1beta3.orig/src/Makefile postgresql-9.1beta3/src/Makefile
+--- postgresql-9.1beta3.orig/src/Makefile	2011-07-07 20:12:33.000000000 -0400
++++ postgresql-9.1beta3/src/Makefile	2011-07-13 17:44:20.182005354 -0400
 @@ -14,17 +14,11 @@
  
  SUBDIRS = \
@@ -78,9 +80,9 @@ diff -Naur a/src/Makefile b/src/Makefile
  
  # There are too many interdependencies between the subdirectories, so
  # don't attempt parallel make here.
-diff -Naur a/src/backend/Makefile b/src/backend/Makefile
---- a/src/backend/Makefile	2011-04-27 17:17:22.000000000 -0400
-+++ b/src/backend/Makefile	2011-05-02 18:19:06.946759115 -0400
+diff -Naur postgresql-9.1beta3.orig/src/backend/Makefile postgresql-9.1beta3/src/backend/Makefile
+--- postgresql-9.1beta3.orig/src/backend/Makefile	2011-07-07 20:12:33.000000000 -0400
++++ postgresql-9.1beta3/src/backend/Makefile	2011-07-13 17:47:18.641651141 -0400
 @@ -45,7 +45,7 @@
  
  ##########################################################################
@@ -99,7 +101,7 @@ diff -Naur a/src/backend/Makefile b/src/backend/Makefile
  
  # run this unconditionally to avoid needing to know its dependencies here:
  submake-schemapg:
-@@ -205,23 +205,7 @@
+@@ -206,23 +206,7 @@
  
  ##########################################################################
  
@@ -124,9 +126,9 @@ diff -Naur a/src/backend/Makefile b/src/backend/Makefile
  
  install-bin: postgres $(POSTGRES_IMP) installdirs
  	$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
-diff -Naur a/src/bin/Makefile b/src/bin/Makefile
---- a/src/bin/Makefile	2011-04-27 17:17:22.000000000 -0400
-+++ b/src/bin/Makefile	2011-05-02 18:20:49.697284900 -0400
+diff -Naur postgresql-9.1beta3.orig/src/bin/Makefile postgresql-9.1beta3/src/bin/Makefile
+--- postgresql-9.1beta3.orig/src/bin/Makefile	2011-07-07 20:12:33.000000000 -0400
++++ postgresql-9.1beta3/src/bin/Makefile	2011-07-13 17:49:20.174599808 -0400
 @@ -13,8 +13,7 @@
  top_builddir = ../..
  include $(top_builddir)/src/Makefile.global
@@ -134,12 +136,12 @@ diff -Naur a/src/bin/Makefile b/src/bin/Makefile
 -SUBDIRS = initdb pg_ctl pg_dump \
 -	psql scripts pg_config pg_controldata pg_resetxlog pg_basebackup
 +SUBDIRS = pg_dump psql scripts pg_config
+ 
  ifeq ($(PORTNAME), win32)
- SUBDIRS+=pgevent
- endif
-diff -Naur a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
---- a/src/include/pg_config_manual.h	2011-04-27 17:17:22.000000000 -0400
-+++ b/src/include/pg_config_manual.h	2011-05-02 18:21:59.197640542 -0400
+ SUBDIRS += pgevent
+diff -Naur postgresql-9.1beta3.orig/src/include/pg_config_manual.h postgresql-9.1beta3/src/include/pg_config_manual.h
+--- postgresql-9.1beta3.orig/src/include/pg_config_manual.h	2011-07-07 20:12:33.000000000 -0400
++++ postgresql-9.1beta3/src/include/pg_config_manual.h	2011-07-13 17:50:30.010547932 -0400
 @@ -141,7 +141,7 @@
   * here's where to twiddle it.  You can also override this at runtime
   * with the postmaster's -k switch.



^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/pgsql-patches:9.1 commit in: /
@ 2011-07-14 10:55 Aaron Swenson
  0 siblings, 0 replies; 13+ messages in thread
From: Aaron Swenson @ 2011-07-14 10:55 UTC (permalink / raw
  To: gentoo-commits

commit:     e1bc1e281fab3afa90d7ac66f033e8de0d161141
Author:     Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 14 10:55:07 2011 +0000
Commit:     Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 10:55:07 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pgsql-patches.git;a=commit;h=e1bc1e28

Updated for Beta 3

---
 server.patch |   78 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/server.patch b/server.patch
index f3bc148..fbbb34c 100644
--- a/server.patch
+++ b/server.patch
@@ -1,6 +1,6 @@
-diff -Naur a/GNUmakefile.in b/GNUmakefile.in
---- a/GNUmakefile.in	2011-04-27 17:17:22.000000000 -0400
-+++ b/GNUmakefile.in	2011-05-02 18:32:41.400926770 -0400
+diff -Naur postgresql-9.1beta3.orig/GNUmakefile.in postgresql-9.1beta3/GNUmakefile.in
+--- postgresql-9.1beta3.orig/GNUmakefile.in	2011-07-07 20:12:33.000000000 -0400
++++ postgresql-9.1beta3/GNUmakefile.in	2011-07-14 06:41:47.153039815 -0400
 @@ -8,7 +8,7 @@
  top_builddir = .
  include $(top_builddir)/src/Makefile.global
@@ -33,9 +33,9 @@ diff -Naur a/GNUmakefile.in b/GNUmakefile.in
  
  $(call recurse,distprep,doc src config contrib)
  
-diff -Naur a/contrib/Makefile b/contrib/Makefile
---- a/contrib/Makefile	2011-04-27 17:17:22.000000000 -0400
-+++ b/contrib/Makefile	2011-05-02 18:34:03.901348935 -0400
+diff -Naur postgresql-9.1beta3.orig/contrib/Makefile postgresql-9.1beta3/contrib/Makefile
+--- postgresql-9.1beta3.orig/contrib/Makefile	2011-07-07 20:12:33.000000000 -0400
++++ postgresql-9.1beta3/contrib/Makefile	2011-07-14 06:42:56.928990954 -0400
 @@ -26,7 +26,6 @@
  		isn		\
  		lo		\
@@ -62,9 +62,9 @@ diff -Naur a/contrib/Makefile b/contrib/Makefile
  
  ifeq ($(with_openssl),yes)
  SUBDIRS += sslinfo
-diff -Naur a/contrib/adminpack/Makefile b/contrib/adminpack/Makefile
---- a/contrib/adminpack/Makefile	2011-04-27 17:17:22.000000000 -0400
-+++ b/contrib/adminpack/Makefile	2011-05-02 18:35:24.991763884 -0400
+diff -Naur postgresql-9.1beta3.orig/contrib/adminpack/Makefile postgresql-9.1beta3/contrib/adminpack/Makefile
+--- postgresql-9.1beta3.orig/contrib/adminpack/Makefile	2011-07-07 20:12:33.000000000 -0400
++++ postgresql-9.1beta3/contrib/adminpack/Makefile	2011-07-14 06:44:00.275315180 -0400
 @@ -2,7 +2,7 @@
  
  MODULE_big = adminpack
@@ -74,9 +74,9 @@ diff -Naur a/contrib/adminpack/Makefile b/contrib/adminpack/Makefile
  
  EXTENSION = adminpack
  DATA = adminpack--1.0.sql
-diff -Naur a/contrib/dblink/Makefile b/contrib/dblink/Makefile
---- a/contrib/dblink/Makefile	2011-04-27 17:17:22.000000000 -0400
-+++ b/contrib/dblink/Makefile	2011-05-02 18:36:02.701956851 -0400
+diff -Naur postgresql-9.1beta3.orig/contrib/dblink/Makefile postgresql-9.1beta3/contrib/dblink/Makefile
+--- postgresql-9.1beta3.orig/contrib/dblink/Makefile	2011-07-07 20:12:33.000000000 -0400
++++ postgresql-9.1beta3/contrib/dblink/Makefile	2011-07-14 06:44:35.943245493 -0400
 @@ -2,7 +2,7 @@
  
  MODULE_big = dblink
@@ -86,9 +86,9 @@ diff -Naur a/contrib/dblink/Makefile b/contrib/dblink/Makefile
  SHLIB_LINK = $(libpq)
  SHLIB_PREREQS = submake-libpq
  
-diff -Naur a/contrib/uuid-ossp/Makefile b/contrib/uuid-ossp/Makefile
---- a/contrib/uuid-ossp/Makefile	2011-04-27 17:17:22.000000000 -0400
-+++ b/contrib/uuid-ossp/Makefile	2011-05-02 18:38:24.893721477 -0400
+diff -Naur postgresql-9.1beta3.orig/contrib/uuid-ossp/Makefile postgresql-9.1beta3/contrib/uuid-ossp/Makefile
+--- postgresql-9.1beta3.orig/contrib/uuid-ossp/Makefile	2011-07-07 20:12:33.000000000 -0400
++++ postgresql-9.1beta3/contrib/uuid-ossp/Makefile	2011-07-14 06:45:36.909707816 -0400
 @@ -1,12 +1,12 @@
  # contrib/uuid-ossp/Makefile
 -
@@ -104,9 +104,9 @@ diff -Naur a/contrib/uuid-ossp/Makefile b/contrib/uuid-ossp/Makefile
  
  ifdef USE_PGXS
  PG_CONFIG = pg_config
-diff -Naur a/contrib/xml2/Makefile b/contrib/xml2/Makefile
---- a/contrib/xml2/Makefile	2011-04-27 17:17:22.000000000 -0400
-+++ b/contrib/xml2/Makefile	2011-05-02 18:41:30.824673350 -0400
+diff -Naur postgresql-9.1beta3.orig/contrib/xml2/Makefile postgresql-9.1beta3/contrib/xml2/Makefile
+--- postgresql-9.1beta3.orig/contrib/xml2/Makefile	2011-07-07 20:12:33.000000000 -0400
++++ postgresql-9.1beta3/contrib/xml2/Makefile	2011-07-14 06:46:58.764958033 -0400
 @@ -7,8 +7,8 @@
  DATA = xml2--1.0.sql xml2--unpackaged--1.0.sql
  
@@ -118,9 +118,9 @@ diff -Naur a/contrib/xml2/Makefile b/contrib/xml2/Makefile
  
  ifdef USE_PGXS
  PG_CONFIG = pg_config
-diff -Naur a/src/Makefile b/src/Makefile
---- a/src/Makefile	2011-04-27 17:17:22.000000000 -0400
-+++ b/src/Makefile	2011-05-02 18:43:02.395142144 -0400
+diff -Naur postgresql-9.1beta3.orig/src/Makefile postgresql-9.1beta3/src/Makefile
+--- postgresql-9.1beta3.orig/src/Makefile	2011-07-07 20:12:33.000000000 -0400
++++ postgresql-9.1beta3/src/Makefile	2011-07-14 06:47:51.001926898 -0400
 @@ -18,12 +18,9 @@
  	backend \
  	backend/utils/mb/conversion_procs \
@@ -143,10 +143,10 @@ diff -Naur a/src/Makefile b/src/Makefile
  
  install-local: installdirs-local
  	$(INSTALL_DATA) Makefile.global '$(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.global'
-diff -Naur a/src/Makefile.global.in b/src/Makefile.global.in
---- a/src/Makefile.global.in	2011-04-27 17:17:22.000000000 -0400
-+++ b/src/Makefile.global.in	2011-05-02 18:45:16.765830055 -0400
-@@ -480,6 +480,7 @@
+diff -Naur postgresql-9.1beta3.orig/src/Makefile.global.in postgresql-9.1beta3/src/Makefile.global.in
+--- postgresql-9.1beta3.orig/src/Makefile.global.in	2011-07-07 20:12:33.000000000 -0400
++++ postgresql-9.1beta3/src/Makefile.global.in	2011-07-14 06:49:18.006878297 -0400
+@@ -482,6 +482,7 @@
     LDFLAGS += $(PROFILE)
  endif
  
@@ -154,9 +154,9 @@ diff -Naur a/src/Makefile.global.in b/src/Makefile.global.in
  
  ##########################################################################
  #
-diff -Naur a/src/bin/Makefile b/src/bin/Makefile
---- a/src/bin/Makefile	2011-04-27 17:17:22.000000000 -0400
-+++ b/src/bin/Makefile	2011-05-02 18:47:05.106384704 -0400
+diff -Naur postgresql-9.1beta3.orig/src/bin/Makefile postgresql-9.1beta3/src/bin/Makefile
+--- postgresql-9.1beta3.orig/src/bin/Makefile	2011-07-07 20:12:33.000000000 -0400
++++ postgresql-9.1beta3/src/bin/Makefile	2011-07-14 06:50:50.241526233 -0400
 @@ -13,8 +13,7 @@
  top_builddir = ../..
  include $(top_builddir)/src/Makefile.global
@@ -164,12 +164,12 @@ diff -Naur a/src/bin/Makefile b/src/bin/Makefile
 -SUBDIRS = initdb pg_ctl pg_dump \
 -	psql scripts pg_config pg_controldata pg_resetxlog pg_basebackup
 +SUBDIRS = initdb pg_ctl pg_controldata pg_resetxlog pg_basebackup
+ 
  ifeq ($(PORTNAME), win32)
- SUBDIRS+=pgevent
- endif
-diff -Naur a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
---- a/src/bin/initdb/Makefile	2011-04-27 17:17:22.000000000 -0400
-+++ b/src/bin/initdb/Makefile	2011-05-02 18:48:35.636848175 -0400
+ SUBDIRS += pgevent
+diff -Naur postgresql-9.1beta3.orig/src/bin/initdb/Makefile postgresql-9.1beta3/src/bin/initdb/Makefile
+--- postgresql-9.1beta3.orig/src/bin/initdb/Makefile	2011-07-07 20:12:33.000000000 -0400
++++ postgresql-9.1beta3/src/bin/initdb/Makefile	2011-07-14 06:51:45.035409539 -0400
 @@ -16,7 +16,7 @@
  top_builddir = ../../..
  include $(top_builddir)/src/Makefile.global
@@ -179,9 +179,9 @@ diff -Naur a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
  
  OBJS=	initdb.o encnames.o pqsignal.o $(WIN32RES)
  
-diff -Naur a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
---- a/src/include/pg_config_manual.h	2011-04-27 17:17:22.000000000 -0400
-+++ b/src/include/pg_config_manual.h	2011-05-02 18:49:38.277168861 -0400
+diff -Naur postgresql-9.1beta3.orig/src/include/pg_config_manual.h postgresql-9.1beta3/src/include/pg_config_manual.h
+--- postgresql-9.1beta3.orig/src/include/pg_config_manual.h	2011-07-07 20:12:33.000000000 -0400
++++ postgresql-9.1beta3/src/include/pg_config_manual.h	2011-07-14 06:52:41.122154922 -0400
 @@ -141,7 +141,7 @@
   * here's where to twiddle it.  You can also override this at runtime
   * with the postmaster's -k switch.
@@ -191,9 +191,9 @@ diff -Naur a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
  
  /*
   * The random() function is expected to yield values between 0 and
-diff -Naur a/src/port/Makefile b/src/port/Makefile
---- a/src/port/Makefile	2011-04-27 17:17:22.000000000 -0400
-+++ b/src/port/Makefile	2011-05-02 18:50:27.707421919 -0400
+diff -Naur postgresql-9.1beta3.orig/src/port/Makefile postgresql-9.1beta3/src/port/Makefile
+--- postgresql-9.1beta3.orig/src/port/Makefile	2011-07-07 20:12:33.000000000 -0400
++++ postgresql-9.1beta3/src/port/Makefile	2011-07-14 06:53:45.988390846 -0400
 @@ -37,11 +37,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)



^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/pgsql-patches:9.1 commit in: /
@ 2011-08-08 10:58 Aaron Swenson
  0 siblings, 0 replies; 13+ messages in thread
From: Aaron Swenson @ 2011-08-08 10:58 UTC (permalink / raw
  To: gentoo-commits

commit:     1a29cf9e6996b736aa39bf752fc1c823620b8a6f
Author:     Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  2 01:30:41 2011 +0000
Commit:     Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Tue Aug  2 01:30:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pgsql-patches.git;a=commit;h=1a29cf9e

bool.patch to fix PPC{,64} defining it to . . . something. pg_ctl-exit-status.patch to emit the proper exit status when server isn't running.

---
 bool.patch               |   11 +++++++++++
 pg_ctl-exit-status.patch |   12 ++++++++++++
 2 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/bool.patch b/bool.patch
new file mode 100644
index 0000000..a338be6
--- /dev/null
+++ b/bool.patch
@@ -0,0 +1,11 @@
+diff -Naur a/src/include/c.h b/src/include/c.h
+--- a/src/include/c.h	2011-04-14 23:19:01.000000000 -0400
++++ b/src/include/c.h	2011-07-31 18:23:00.648671437 -0400
+@@ -170,6 +170,7 @@
+  */
+ 
+ #ifndef __cplusplus
++#undef bool
+ 
+ #ifndef bool
+ typedef char bool;

diff --git a/pg_ctl-exit-status.patch b/pg_ctl-exit-status.patch
new file mode 100644
index 0000000..f55c9ac
--- /dev/null
+++ b/pg_ctl-exit-status.patch
@@ -0,0 +1,12 @@
+diff -Naur a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
+--- a/src/bin/pg_ctl/pg_ctl.c	2011-04-14 23:18:15.000000000 -0400
++++ b/src/bin/pg_ctl/pg_ctl.c	2011-08-01 19:44:54.009993121 -0400
+@@ -975,7 +975,7 @@
+ 		}
+ 	}
+ 	printf(_("%s: no server running\n"), progname);
+-	exit(1);
++	exit(3);
+ }
+ 
+ 



^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/pgsql-patches:9.1 commit in: /
@ 2011-08-27 22:00 Aaron Swenson
  0 siblings, 0 replies; 13+ messages in thread
From: Aaron Swenson @ 2011-08-27 22:00 UTC (permalink / raw
  To: gentoo-commits

commit:     de3603fc159da1422f5dbfe208b50faa42ecd72f
Author:     Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 27 21:59:32 2011 +0000
Commit:     Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Sat Aug 27 21:59:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pgsql-patches.git;a=commit;h=de3603fc

Updated for 9.1rc1

---
 autoconf.patch           |    6 +-
 base.patch               |   68 +++++++-------
 bool.patch               |    6 +-
 pg_ctl-exit-status.patch |    6 +-
 server.patch             |  229 +++++++++++++++++++++++-----------------------
 5 files changed, 157 insertions(+), 158 deletions(-)

diff --git a/autoconf.patch b/autoconf.patch
index 0eeeabf..da62bbf 100644
--- a/autoconf.patch
+++ b/autoconf.patch
@@ -1,9 +1,9 @@
 diff -Naur a/configure.in b/configure.in
---- a/configure.in	2011-06-09 19:40:42.000000000 -0400
-+++ b/configure.in	2011-06-25 16:18:43.649614947 -0400
+--- a/configure.in	2011-08-18 17:23:13.000000000 -0400
++++ b/configure.in	2011-08-27 14:31:11.341460966 -0400
 @@ -19,10 +19,6 @@
  
- AC_INIT([PostgreSQL], [9.1beta2], [pgsql-bugs@postgresql.org])
+ AC_INIT([PostgreSQL], [9.1rc1], [pgsql-bugs@postgresql.org])
  
 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required.
 -Untested combinations of 'autoconf' and PostgreSQL versions are not

diff --git a/base.patch b/base.patch
index 9a1b711..580e08f 100644
--- a/base.patch
+++ b/base.patch
@@ -1,6 +1,6 @@
-diff -Naur postgresql-9.1beta3.orig/contrib/Makefile postgresql-9.1beta3/contrib/Makefile
---- postgresql-9.1beta3.orig/contrib/Makefile	2011-07-07 20:12:33.000000000 -0400
-+++ postgresql-9.1beta3/contrib/Makefile	2011-07-13 17:33:27.267411316 -0400
+diff -Naur a/contrib/Makefile b/contrib/Makefile
+--- a/contrib/Makefile	2011-08-18 17:23:13.000000000 -0400
++++ b/contrib/Makefile	2011-08-27 14:36:55.246794233 -0400
 @@ -5,56 +5,10 @@
  include $(top_builddir)/src/Makefile.global
  
@@ -58,31 +58,9 @@ diff -Naur postgresql-9.1beta3.orig/contrib/Makefile postgresql-9.1beta3/contrib
  
  ifeq ($(with_ossp_uuid),yes)
  SUBDIRS += uuid-ossp
-diff -Naur postgresql-9.1beta3.orig/src/Makefile postgresql-9.1beta3/src/Makefile
---- postgresql-9.1beta3.orig/src/Makefile	2011-07-07 20:12:33.000000000 -0400
-+++ postgresql-9.1beta3/src/Makefile	2011-07-13 17:44:20.182005354 -0400
-@@ -14,17 +14,11 @@
- 
- SUBDIRS = \
- 	port \
--	timezone \
- 	backend \
--	backend/utils/mb/conversion_procs \
--	backend/snowball \
- 	include \
- 	interfaces \
--	backend/replication/libpqwalreceiver \
- 	bin \
--	pl \
--	makefiles \
--	test/regress
-+	makefiles
- 
- # There are too many interdependencies between the subdirectories, so
- # don't attempt parallel make here.
-diff -Naur postgresql-9.1beta3.orig/src/backend/Makefile postgresql-9.1beta3/src/backend/Makefile
---- postgresql-9.1beta3.orig/src/backend/Makefile	2011-07-07 20:12:33.000000000 -0400
-+++ postgresql-9.1beta3/src/backend/Makefile	2011-07-13 17:47:18.641651141 -0400
+diff -Naur a/src/backend/Makefile b/src/backend/Makefile
+--- a/src/backend/Makefile	2011-08-18 17:23:13.000000000 -0400
++++ b/src/backend/Makefile	2011-08-27 14:40:35.484593573 -0400
 @@ -45,7 +45,7 @@
  
  ##########################################################################
@@ -126,9 +104,9 @@ diff -Naur postgresql-9.1beta3.orig/src/backend/Makefile postgresql-9.1beta3/src
  
  install-bin: postgres $(POSTGRES_IMP) installdirs
  	$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
-diff -Naur postgresql-9.1beta3.orig/src/bin/Makefile postgresql-9.1beta3/src/bin/Makefile
---- postgresql-9.1beta3.orig/src/bin/Makefile	2011-07-07 20:12:33.000000000 -0400
-+++ postgresql-9.1beta3/src/bin/Makefile	2011-07-13 17:49:20.174599808 -0400
+diff -Naur a/src/bin/Makefile b/src/bin/Makefile
+--- a/src/bin/Makefile	2011-08-18 17:23:13.000000000 -0400
++++ b/src/bin/Makefile	2011-08-27 14:41:38.598231520 -0400
 @@ -13,8 +13,7 @@
  top_builddir = ../..
  include $(top_builddir)/src/Makefile.global
@@ -139,9 +117,9 @@ diff -Naur postgresql-9.1beta3.orig/src/bin/Makefile postgresql-9.1beta3/src/bin
  
  ifeq ($(PORTNAME), win32)
  SUBDIRS += pgevent
-diff -Naur postgresql-9.1beta3.orig/src/include/pg_config_manual.h postgresql-9.1beta3/src/include/pg_config_manual.h
---- postgresql-9.1beta3.orig/src/include/pg_config_manual.h	2011-07-07 20:12:33.000000000 -0400
-+++ postgresql-9.1beta3/src/include/pg_config_manual.h	2011-07-13 17:50:30.010547932 -0400
+diff -Naur a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
+--- a/src/include/pg_config_manual.h	2011-08-18 17:23:13.000000000 -0400
++++ b/src/include/pg_config_manual.h	2011-08-27 14:42:56.600368661 -0400
 @@ -141,7 +141,7 @@
   * here's where to twiddle it.  You can also override this at runtime
   * with the postmaster's -k switch.
@@ -151,3 +129,25 @@ diff -Naur postgresql-9.1beta3.orig/src/include/pg_config_manual.h postgresql-9.
  
  /*
   * The random() function is expected to yield values between 0 and
+diff -Naur a/src/Makefile b/src/Makefile
+--- a/src/Makefile	2011-08-18 17:23:13.000000000 -0400
++++ b/src/Makefile	2011-08-27 14:38:05.049757875 -0400
+@@ -14,17 +14,11 @@
+ 
+ SUBDIRS = \
+ 	port \
+-	timezone \
+ 	backend \
+-	backend/utils/mb/conversion_procs \
+-	backend/snowball \
+ 	include \
+ 	interfaces \
+-	backend/replication/libpqwalreceiver \
+ 	bin \
+-	pl \
+-	makefiles \
+-	test/regress
++	makefiles
+ 
+ # There are too many interdependencies between the subdirectories, so
+ # don't attempt parallel make here.

diff --git a/bool.patch b/bool.patch
index a338be6..53f502a 100644
--- a/bool.patch
+++ b/bool.patch
@@ -1,7 +1,7 @@
 diff -Naur a/src/include/c.h b/src/include/c.h
---- a/src/include/c.h	2011-04-14 23:19:01.000000000 -0400
-+++ b/src/include/c.h	2011-07-31 18:23:00.648671437 -0400
-@@ -170,6 +170,7 @@
+--- a/src/include/c.h	2011-08-18 17:23:13.000000000 -0400
++++ b/src/include/c.h	2011-08-27 14:48:50.154729275 -0400
+@@ -179,6 +179,7 @@
   */
  
  #ifndef __cplusplus

diff --git a/pg_ctl-exit-status.patch b/pg_ctl-exit-status.patch
index f55c9ac..6f78167 100644
--- a/pg_ctl-exit-status.patch
+++ b/pg_ctl-exit-status.patch
@@ -1,7 +1,7 @@
 diff -Naur a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
---- a/src/bin/pg_ctl/pg_ctl.c	2011-04-14 23:18:15.000000000 -0400
-+++ b/src/bin/pg_ctl/pg_ctl.c	2011-08-01 19:44:54.009993121 -0400
-@@ -975,7 +975,7 @@
+--- a/src/bin/pg_ctl/pg_ctl.c	2011-08-18 17:23:13.000000000 -0400
++++ b/src/bin/pg_ctl/pg_ctl.c	2011-08-27 17:18:26.424185561 -0400
+@@ -1184,7 +1184,7 @@
  		}
  	}
  	printf(_("%s: no server running\n"), progname);

diff --git a/server.patch b/server.patch
index fbbb34c..4e50514 100644
--- a/server.patch
+++ b/server.patch
@@ -1,41 +1,30 @@
-diff -Naur postgresql-9.1beta3.orig/GNUmakefile.in postgresql-9.1beta3/GNUmakefile.in
---- postgresql-9.1beta3.orig/GNUmakefile.in	2011-07-07 20:12:33.000000000 -0400
-+++ postgresql-9.1beta3/GNUmakefile.in	2011-07-14 06:41:47.153039815 -0400
-@@ -8,7 +8,7 @@
- top_builddir = .
- include $(top_builddir)/src/Makefile.global
- 
--$(call recurse,all install,src config)
-+$(call recurse,all install,src)
- 
- all:
- 	+@echo "All of PostgreSQL successfully made. Ready to install."
-@@ -16,7 +16,7 @@
- docs:
- 	$(MAKE) -C doc all
- 
--$(call recurse,world,doc src config contrib,all)
-+$(call recurse,world,doc src contrib,all)
- world:
- 	+@echo "PostgreSQL, contrib, and documentation successfully made. Ready to install."
- 
-@@ -29,11 +29,11 @@
- install-docs:
- 	$(MAKE) -C doc install
+diff -Naur a/contrib/adminpack/Makefile b/contrib/adminpack/Makefile
+--- a/contrib/adminpack/Makefile	2011-08-18 17:23:13.000000000 -0400
++++ b/contrib/adminpack/Makefile	2011-08-27 17:43:07.864849241 -0400
+@@ -2,7 +2,7 @@
  
--$(call recurse,install-world,doc src config contrib,install)
-+$(call recurse,install-world,doc src contrib,install)
- install-world:
- 	+@echo "PostgreSQL, contrib, and documentation installation complete."
+ MODULE_big = adminpack
+ OBJS = adminpack.o
+-PG_CPPFLAGS = -I$(libpq_srcdir)
++PG_CPPFLAGS = -I$(libpq_srcdir) -I../../src/include/
  
--$(call recurse,installdirs uninstall coverage,doc src config)
-+$(call recurse,installdirs uninstall coverage,doc src)
+ EXTENSION = adminpack
+ DATA = adminpack--1.0.sql
+diff -Naur a/contrib/dblink/Makefile b/contrib/dblink/Makefile
+--- a/contrib/dblink/Makefile	2011-08-18 17:23:13.000000000 -0400
++++ b/contrib/dblink/Makefile	2011-08-27 17:43:48.350768066 -0400
+@@ -2,7 +2,7 @@
  
- $(call recurse,distprep,doc src config contrib)
+ MODULE_big = dblink
+ OBJS	= dblink.o
+-PG_CPPFLAGS = -I$(libpq_srcdir)
++PG_CPPFLAGS = -I$(libpq_srcdir) -I../../src/include/
+ SHLIB_LINK = $(libpq)
+ SHLIB_PREREQS = submake-libpq
  
-diff -Naur postgresql-9.1beta3.orig/contrib/Makefile postgresql-9.1beta3/contrib/Makefile
---- postgresql-9.1beta3.orig/contrib/Makefile	2011-07-07 20:12:33.000000000 -0400
-+++ postgresql-9.1beta3/contrib/Makefile	2011-07-14 06:42:56.928990954 -0400
+diff -Naur a/contrib/Makefile b/contrib/Makefile
+--- a/contrib/Makefile	2011-08-18 17:23:13.000000000 -0400
++++ b/contrib/Makefile	2011-08-27 17:41:23.565363128 -0400
 @@ -26,7 +26,6 @@
  		isn		\
  		lo		\
@@ -62,36 +51,12 @@ diff -Naur postgresql-9.1beta3.orig/contrib/Makefile postgresql-9.1beta3/contrib
  
  ifeq ($(with_openssl),yes)
  SUBDIRS += sslinfo
-diff -Naur postgresql-9.1beta3.orig/contrib/adminpack/Makefile postgresql-9.1beta3/contrib/adminpack/Makefile
---- postgresql-9.1beta3.orig/contrib/adminpack/Makefile	2011-07-07 20:12:33.000000000 -0400
-+++ postgresql-9.1beta3/contrib/adminpack/Makefile	2011-07-14 06:44:00.275315180 -0400
-@@ -2,7 +2,7 @@
- 
- MODULE_big = adminpack
- OBJS = adminpack.o
--PG_CPPFLAGS = -I$(libpq_srcdir)
-+PG_CPPFLAGS = -I$(libpq_srcdir) -I../../src/include/
- 
- EXTENSION = adminpack
- DATA = adminpack--1.0.sql
-diff -Naur postgresql-9.1beta3.orig/contrib/dblink/Makefile postgresql-9.1beta3/contrib/dblink/Makefile
---- postgresql-9.1beta3.orig/contrib/dblink/Makefile	2011-07-07 20:12:33.000000000 -0400
-+++ postgresql-9.1beta3/contrib/dblink/Makefile	2011-07-14 06:44:35.943245493 -0400
-@@ -2,7 +2,7 @@
- 
- MODULE_big = dblink
- OBJS	= dblink.o
--PG_CPPFLAGS = -I$(libpq_srcdir)
-+PG_CPPFLAGS = -I$(libpq_srcdir) -I../../src/include/
- SHLIB_LINK = $(libpq)
- SHLIB_PREREQS = submake-libpq
- 
-diff -Naur postgresql-9.1beta3.orig/contrib/uuid-ossp/Makefile postgresql-9.1beta3/contrib/uuid-ossp/Makefile
---- postgresql-9.1beta3.orig/contrib/uuid-ossp/Makefile	2011-07-07 20:12:33.000000000 -0400
-+++ postgresql-9.1beta3/contrib/uuid-ossp/Makefile	2011-07-14 06:45:36.909707816 -0400
-@@ -1,12 +1,12 @@
+diff -Naur a/contrib/uuid-ossp/Makefile b/contrib/uuid-ossp/Makefile
+--- a/contrib/uuid-ossp/Makefile	2011-08-18 17:23:13.000000000 -0400
++++ b/contrib/uuid-ossp/Makefile	2011-08-27 17:45:43.166793814 -0400
+@@ -1,12 +1,13 @@
  # contrib/uuid-ossp/Makefile
--
+ 
 +PG_CPPFLAGS += "-DHAVE_OSSP_UUID_H"
  MODULE_big = uuid-ossp
  OBJS = uuid-ossp.o
@@ -104,23 +69,94 @@ diff -Naur postgresql-9.1beta3.orig/contrib/uuid-ossp/Makefile postgresql-9.1bet
  
  ifdef USE_PGXS
  PG_CONFIG = pg_config
-diff -Naur postgresql-9.1beta3.orig/contrib/xml2/Makefile postgresql-9.1beta3/contrib/xml2/Makefile
---- postgresql-9.1beta3.orig/contrib/xml2/Makefile	2011-07-07 20:12:33.000000000 -0400
-+++ postgresql-9.1beta3/contrib/xml2/Makefile	2011-07-14 06:46:58.764958033 -0400
-@@ -7,8 +7,8 @@
- DATA = xml2--1.0.sql xml2--unpackaged--1.0.sql
+diff -Naur a/contrib/xml2/Makefile b/contrib/xml2/Makefile
+--- a/contrib/xml2/Makefile	2011-08-18 17:23:13.000000000 -0400
++++ b/contrib/xml2/Makefile	2011-08-27 17:47:07.078335070 -0400
+@@ -8,7 +8,8 @@
  
  REGRESS = xml2
--
+ 
 -SHLIB_LINK += $(filter -lxslt, $(LIBS)) $(filter -lxml2, $(LIBS))
 +PG_CPPFLAGS = $(shell xml2-config --cflags)
 +SHLIB_LINK += $(shell xml2-config --libs) $(shell xslt-config --libs)
  
  ifdef USE_PGXS
  PG_CONFIG = pg_config
-diff -Naur postgresql-9.1beta3.orig/src/Makefile postgresql-9.1beta3/src/Makefile
---- postgresql-9.1beta3.orig/src/Makefile	2011-07-07 20:12:33.000000000 -0400
-+++ postgresql-9.1beta3/src/Makefile	2011-07-14 06:47:51.001926898 -0400
+diff -Naur a/GNUmakefile.in b/GNUmakefile.in
+--- a/GNUmakefile.in	2011-08-18 17:23:13.000000000 -0400
++++ b/GNUmakefile.in	2011-08-27 17:40:13.102466128 -0400
+@@ -8,7 +8,7 @@
+ top_builddir = .
+ include $(top_builddir)/src/Makefile.global
+ 
+-$(call recurse,all install,src config)
++$(call recurse,all install,src)
+ 
+ all:
+ 	+@echo "All of PostgreSQL successfully made. Ready to install."
+@@ -16,7 +16,7 @@
+ docs:
+ 	$(MAKE) -C doc all
+ 
+-$(call recurse,world,doc src config contrib,all)
++$(call recurse,world,doc src contrib,all)
+ world:
+ 	+@echo "PostgreSQL, contrib, and documentation successfully made. Ready to install."
+ 
+@@ -29,11 +29,11 @@
+ install-docs:
+ 	$(MAKE) -C doc install
+ 
+-$(call recurse,install-world,doc src config contrib,install)
++$(call recurse,install-world,doc src contrib,install)
+ install-world:
+ 	+@echo "PostgreSQL, contrib, and documentation installation complete."
+ 
+-$(call recurse,installdirs uninstall coverage,doc src config)
++$(call recurse,installdirs uninstall coverage,doc src)
+ 
+ $(call recurse,distprep,doc src config contrib)
+ 
+diff -Naur a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
+--- a/src/bin/initdb/Makefile	2011-08-18 17:23:13.000000000 -0400
++++ b/src/bin/initdb/Makefile	2011-08-27 17:51:46.200198057 -0400
+@@ -16,7 +16,7 @@
+ top_builddir = ../../..
+ include $(top_builddir)/src/Makefile.global
+ 
+-override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS)
++override CPPFLAGS := -DFRONTEND -I$(top_srcdir)/src/interfaces/libpq $(CPPFLAGS)
+ 
+ OBJS=	initdb.o encnames.o pqsignal.o $(WIN32RES)
+ 
+diff -Naur a/src/bin/Makefile b/src/bin/Makefile
+--- a/src/bin/Makefile	2011-08-18 17:23:13.000000000 -0400
++++ b/src/bin/Makefile	2011-08-27 17:50:31.507727467 -0400
+@@ -13,8 +13,7 @@
+ top_builddir = ../..
+ include $(top_builddir)/src/Makefile.global
+ 
+-SUBDIRS = initdb pg_ctl pg_dump \
+-	psql scripts pg_config pg_controldata pg_resetxlog pg_basebackup
++SUBDIRS = initdb pg_ctl pg_controldata pg_resetxlog pg_basebackup
+ 
+ ifeq ($(PORTNAME), win32)
+ SUBDIRS += pgevent
+diff -Naur a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
+--- a/src/include/pg_config_manual.h	2011-08-18 17:23:13.000000000 -0400
++++ b/src/include/pg_config_manual.h	2011-08-27 17:53:01.442613210 -0400
+@@ -141,7 +141,7 @@
+  * here's where to twiddle it.  You can also override this at runtime
+  * with the postmaster's -k switch.
+  */
+-#define DEFAULT_PGSOCKET_DIR  "/tmp"
++#define DEFAULT_PGSOCKET_DIR  "@GENTOO_PORTAGE_EPREFIX@/var/run/postgresql"
+ 
+ /*
+  * The random() function is expected to yield values between 0 and
+diff -Naur a/src/Makefile b/src/Makefile
+--- a/src/Makefile	2011-08-18 17:23:13.000000000 -0400
++++ b/src/Makefile	2011-08-27 17:48:06.462348836 -0400
 @@ -18,12 +18,9 @@
  	backend \
  	backend/utils/mb/conversion_procs \
@@ -143,9 +179,9 @@ diff -Naur postgresql-9.1beta3.orig/src/Makefile postgresql-9.1beta3/src/Makefil
  
  install-local: installdirs-local
  	$(INSTALL_DATA) Makefile.global '$(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.global'
-diff -Naur postgresql-9.1beta3.orig/src/Makefile.global.in postgresql-9.1beta3/src/Makefile.global.in
---- postgresql-9.1beta3.orig/src/Makefile.global.in	2011-07-07 20:12:33.000000000 -0400
-+++ postgresql-9.1beta3/src/Makefile.global.in	2011-07-14 06:49:18.006878297 -0400
+diff -Naur a/src/Makefile.global.in b/src/Makefile.global.in
+--- a/src/Makefile.global.in	2011-08-18 17:23:13.000000000 -0400
++++ b/src/Makefile.global.in	2011-08-27 17:49:15.185421175 -0400
 @@ -482,6 +482,7 @@
     LDFLAGS += $(PROFILE)
  endif
@@ -154,46 +190,9 @@ diff -Naur postgresql-9.1beta3.orig/src/Makefile.global.in postgresql-9.1beta3/s
  
  ##########################################################################
  #
-diff -Naur postgresql-9.1beta3.orig/src/bin/Makefile postgresql-9.1beta3/src/bin/Makefile
---- postgresql-9.1beta3.orig/src/bin/Makefile	2011-07-07 20:12:33.000000000 -0400
-+++ postgresql-9.1beta3/src/bin/Makefile	2011-07-14 06:50:50.241526233 -0400
-@@ -13,8 +13,7 @@
- top_builddir = ../..
- include $(top_builddir)/src/Makefile.global
- 
--SUBDIRS = initdb pg_ctl pg_dump \
--	psql scripts pg_config pg_controldata pg_resetxlog pg_basebackup
-+SUBDIRS = initdb pg_ctl pg_controldata pg_resetxlog pg_basebackup
- 
- ifeq ($(PORTNAME), win32)
- SUBDIRS += pgevent
-diff -Naur postgresql-9.1beta3.orig/src/bin/initdb/Makefile postgresql-9.1beta3/src/bin/initdb/Makefile
---- postgresql-9.1beta3.orig/src/bin/initdb/Makefile	2011-07-07 20:12:33.000000000 -0400
-+++ postgresql-9.1beta3/src/bin/initdb/Makefile	2011-07-14 06:51:45.035409539 -0400
-@@ -16,7 +16,7 @@
- top_builddir = ../../..
- include $(top_builddir)/src/Makefile.global
- 
--override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS)
-+override CPPFLAGS := -DFRONTEND -I$(top_srcdir)/src/interfaces/libpq $(CPPFLAGS)
- 
- OBJS=	initdb.o encnames.o pqsignal.o $(WIN32RES)
- 
-diff -Naur postgresql-9.1beta3.orig/src/include/pg_config_manual.h postgresql-9.1beta3/src/include/pg_config_manual.h
---- postgresql-9.1beta3.orig/src/include/pg_config_manual.h	2011-07-07 20:12:33.000000000 -0400
-+++ postgresql-9.1beta3/src/include/pg_config_manual.h	2011-07-14 06:52:41.122154922 -0400
-@@ -141,7 +141,7 @@
-  * here's where to twiddle it.  You can also override this at runtime
-  * with the postmaster's -k switch.
-  */
--#define DEFAULT_PGSOCKET_DIR  "/tmp"
-+#define DEFAULT_PGSOCKET_DIR  "@GENTOO_PORTAGE_EPREFIX@/var/run/postgresql"
- 
- /*
-  * The random() function is expected to yield values between 0 and
-diff -Naur postgresql-9.1beta3.orig/src/port/Makefile postgresql-9.1beta3/src/port/Makefile
---- postgresql-9.1beta3.orig/src/port/Makefile	2011-07-07 20:12:33.000000000 -0400
-+++ postgresql-9.1beta3/src/port/Makefile	2011-07-14 06:53:45.988390846 -0400
+diff -Naur a/src/port/Makefile b/src/port/Makefile
+--- a/src/port/Makefile	2011-08-18 17:23:13.000000000 -0400
++++ b/src/port/Makefile	2011-08-27 17:54:10.765625070 -0400
 @@ -37,11 +37,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)



^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/pgsql-patches:9.1 commit in: /
@ 2011-09-17 15:15 Aaron Swenson
  0 siblings, 0 replies; 13+ messages in thread
From: Aaron Swenson @ 2011-09-17 15:15 UTC (permalink / raw
  To: gentoo-commits

commit:     50aff85462fdb2bbac83a3b70752872d04d7a41e
Author:     Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 17 15:15:00 2011 +0000
Commit:     Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Sat Sep 17 15:15:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pgsql-patches.git;a=commit;h=50aff854

Updated for 9.1.0.

---
 autoconf.patch |    6 +++---
 base.patch     |   20 ++++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/autoconf.patch b/autoconf.patch
index da62bbf..e68a853 100644
--- a/autoconf.patch
+++ b/autoconf.patch
@@ -1,9 +1,9 @@
 diff -Naur a/configure.in b/configure.in
---- a/configure.in	2011-08-18 17:23:13.000000000 -0400
-+++ b/configure.in	2011-08-27 14:31:11.341460966 -0400
+--- a/configure.in	2011-09-08 17:13:27.000000000 -0400
++++ b/configure.in	2011-09-16 21:49:14.560579320 -0400
 @@ -19,10 +19,6 @@
  
- AC_INIT([PostgreSQL], [9.1rc1], [pgsql-bugs@postgresql.org])
+ AC_INIT([PostgreSQL], [9.1.0], [pgsql-bugs@postgresql.org])
  
 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required.
 -Untested combinations of 'autoconf' and PostgreSQL versions are not

diff --git a/base.patch b/base.patch
index 580e08f..25117b0 100644
--- a/base.patch
+++ b/base.patch
@@ -1,6 +1,6 @@
 diff -Naur a/contrib/Makefile b/contrib/Makefile
---- a/contrib/Makefile	2011-08-18 17:23:13.000000000 -0400
-+++ b/contrib/Makefile	2011-08-27 14:36:55.246794233 -0400
+--- a/contrib/Makefile	2011-09-08 17:13:27.000000000 -0400
++++ b/contrib/Makefile	2011-09-16 21:58:34.080579316 -0400
 @@ -5,56 +5,10 @@
  include $(top_builddir)/src/Makefile.global
  
@@ -59,8 +59,8 @@ diff -Naur a/contrib/Makefile b/contrib/Makefile
  ifeq ($(with_ossp_uuid),yes)
  SUBDIRS += uuid-ossp
 diff -Naur a/src/backend/Makefile b/src/backend/Makefile
---- a/src/backend/Makefile	2011-08-18 17:23:13.000000000 -0400
-+++ b/src/backend/Makefile	2011-08-27 14:40:35.484593573 -0400
+--- a/src/backend/Makefile	2011-09-08 17:13:27.000000000 -0400
++++ b/src/backend/Makefile	2011-09-16 22:01:48.400579314 -0400
 @@ -45,7 +45,7 @@
  
  ##########################################################################
@@ -105,8 +105,8 @@ diff -Naur a/src/backend/Makefile b/src/backend/Makefile
  install-bin: postgres $(POSTGRES_IMP) installdirs
  	$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
 diff -Naur a/src/bin/Makefile b/src/bin/Makefile
---- a/src/bin/Makefile	2011-08-18 17:23:13.000000000 -0400
-+++ b/src/bin/Makefile	2011-08-27 14:41:38.598231520 -0400
+--- a/src/bin/Makefile	2011-09-08 17:13:27.000000000 -0400
++++ b/src/bin/Makefile	2011-09-16 22:03:48.250579314 -0400
 @@ -13,8 +13,7 @@
  top_builddir = ../..
  include $(top_builddir)/src/Makefile.global
@@ -118,8 +118,8 @@ diff -Naur a/src/bin/Makefile b/src/bin/Makefile
  ifeq ($(PORTNAME), win32)
  SUBDIRS += pgevent
 diff -Naur a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
---- a/src/include/pg_config_manual.h	2011-08-18 17:23:13.000000000 -0400
-+++ b/src/include/pg_config_manual.h	2011-08-27 14:42:56.600368661 -0400
+--- a/src/include/pg_config_manual.h	2011-09-08 17:13:27.000000000 -0400
++++ b/src/include/pg_config_manual.h	2011-09-16 22:27:52.480579304 -0400
 @@ -141,7 +141,7 @@
   * here's where to twiddle it.  You can also override this at runtime
   * with the postmaster's -k switch.
@@ -130,8 +130,8 @@ diff -Naur a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
  /*
   * The random() function is expected to yield values between 0 and
 diff -Naur a/src/Makefile b/src/Makefile
---- a/src/Makefile	2011-08-18 17:23:13.000000000 -0400
-+++ b/src/Makefile	2011-08-27 14:38:05.049757875 -0400
+--- a/src/Makefile	2011-09-08 17:13:27.000000000 -0400
++++ b/src/Makefile	2011-09-16 22:29:17.650579302 -0400
 @@ -14,17 +14,11 @@
  
  SUBDIRS = \



^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/pgsql-patches:9.1 commit in: /
@ 2011-09-18 18:22 Aaron Swenson
  0 siblings, 0 replies; 13+ messages in thread
From: Aaron Swenson @ 2011-09-18 18:22 UTC (permalink / raw
  To: gentoo-commits

commit:     bd42c87b0bf18957a35ada6f999d436cb5de3b26
Author:     Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 18 18:21:27 2011 +0000
Commit:     Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 18:21:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pgsql-patches.git;a=commit;h=bd42c87b

Updated for 9.1.0

---
 server.patch |   55 +++++++++++++++++++++++++++++--------------------------
 1 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/server.patch b/server.patch
index 4e50514..2cbec0b 100644
--- a/server.patch
+++ b/server.patch
@@ -1,6 +1,6 @@
 diff -Naur a/contrib/adminpack/Makefile b/contrib/adminpack/Makefile
---- a/contrib/adminpack/Makefile	2011-08-18 17:23:13.000000000 -0400
-+++ b/contrib/adminpack/Makefile	2011-08-27 17:43:07.864849241 -0400
+--- a/contrib/adminpack/Makefile	2011-09-08 17:13:27.000000000 -0400
++++ b/contrib/adminpack/Makefile	2011-09-17 11:42:03.576618001 -0400
 @@ -2,7 +2,7 @@
  
  MODULE_big = adminpack
@@ -11,8 +11,8 @@ diff -Naur a/contrib/adminpack/Makefile b/contrib/adminpack/Makefile
  EXTENSION = adminpack
  DATA = adminpack--1.0.sql
 diff -Naur a/contrib/dblink/Makefile b/contrib/dblink/Makefile
---- a/contrib/dblink/Makefile	2011-08-18 17:23:13.000000000 -0400
-+++ b/contrib/dblink/Makefile	2011-08-27 17:43:48.350768066 -0400
+--- a/contrib/dblink/Makefile	2011-09-08 17:13:27.000000000 -0400
++++ b/contrib/dblink/Makefile	2011-09-17 11:42:44.500618001 -0400
 @@ -2,7 +2,7 @@
  
  MODULE_big = dblink
@@ -23,8 +23,8 @@ diff -Naur a/contrib/dblink/Makefile b/contrib/dblink/Makefile
  SHLIB_PREREQS = submake-libpq
  
 diff -Naur a/contrib/Makefile b/contrib/Makefile
---- a/contrib/Makefile	2011-08-18 17:23:13.000000000 -0400
-+++ b/contrib/Makefile	2011-08-27 17:41:23.565363128 -0400
+--- a/contrib/Makefile	2011-09-08 17:13:27.000000000 -0400
++++ b/contrib/Makefile	2011-09-17 11:44:08.068618001 -0400
 @@ -26,7 +26,6 @@
  		isn		\
  		lo		\
@@ -52,8 +52,8 @@ diff -Naur a/contrib/Makefile b/contrib/Makefile
  ifeq ($(with_openssl),yes)
  SUBDIRS += sslinfo
 diff -Naur a/contrib/uuid-ossp/Makefile b/contrib/uuid-ossp/Makefile
---- a/contrib/uuid-ossp/Makefile	2011-08-18 17:23:13.000000000 -0400
-+++ b/contrib/uuid-ossp/Makefile	2011-08-27 17:45:43.166793814 -0400
+--- a/contrib/uuid-ossp/Makefile	2011-09-08 17:13:27.000000000 -0400
++++ b/contrib/uuid-ossp/Makefile	2011-09-17 11:45:18.240618001 -0400
 @@ -1,12 +1,13 @@
  # contrib/uuid-ossp/Makefile
  
@@ -70,21 +70,21 @@ diff -Naur a/contrib/uuid-ossp/Makefile b/contrib/uuid-ossp/Makefile
  ifdef USE_PGXS
  PG_CONFIG = pg_config
 diff -Naur a/contrib/xml2/Makefile b/contrib/xml2/Makefile
---- a/contrib/xml2/Makefile	2011-08-18 17:23:13.000000000 -0400
-+++ b/contrib/xml2/Makefile	2011-08-27 17:47:07.078335070 -0400
+--- a/contrib/xml2/Makefile	2011-09-08 17:13:27.000000000 -0400
++++ b/contrib/xml2/Makefile	2011-09-17 11:46:25.216618000 -0400
 @@ -8,7 +8,8 @@
  
  REGRESS = xml2
  
--SHLIB_LINK += $(filter -lxslt, $(LIBS)) $(filter -lxml2, $(LIBS))
+-SHLIB_LINK += $(filter -lxslt, $(LIBS)) -lxml2
 +PG_CPPFLAGS = $(shell xml2-config --cflags)
 +SHLIB_LINK += $(shell xml2-config --libs) $(shell xslt-config --libs)
  
  ifdef USE_PGXS
  PG_CONFIG = pg_config
 diff -Naur a/GNUmakefile.in b/GNUmakefile.in
---- a/GNUmakefile.in	2011-08-18 17:23:13.000000000 -0400
-+++ b/GNUmakefile.in	2011-08-27 17:40:13.102466128 -0400
+--- a/GNUmakefile.in	2011-09-08 17:13:27.000000000 -0400
++++ b/GNUmakefile.in	2011-09-17 11:48:36.620618001 -0400
 @@ -8,7 +8,7 @@
  top_builddir = .
  include $(top_builddir)/src/Makefile.global
@@ -103,7 +103,7 @@ diff -Naur a/GNUmakefile.in b/GNUmakefile.in
  world:
  	+@echo "PostgreSQL, contrib, and documentation successfully made. Ready to install."
  
-@@ -29,11 +29,11 @@
+@@ -32,14 +32,14 @@
  install-docs:
  	$(MAKE) -C doc install
  
@@ -112,14 +112,17 @@ diff -Naur a/GNUmakefile.in b/GNUmakefile.in
  install-world:
  	+@echo "PostgreSQL, contrib, and documentation installation complete."
  
+ # build src/ before contrib/
+ install-world-contrib-recurse: install-world-src-recurse
+ 
 -$(call recurse,installdirs uninstall coverage,doc src config)
 +$(call recurse,installdirs uninstall coverage,doc src)
  
  $(call recurse,distprep,doc src config contrib)
  
 diff -Naur a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
---- a/src/bin/initdb/Makefile	2011-08-18 17:23:13.000000000 -0400
-+++ b/src/bin/initdb/Makefile	2011-08-27 17:51:46.200198057 -0400
+--- a/src/bin/initdb/Makefile	2011-09-08 17:13:27.000000000 -0400
++++ b/src/bin/initdb/Makefile	2011-09-17 11:50:16.832618001 -0400
 @@ -16,7 +16,7 @@
  top_builddir = ../../..
  include $(top_builddir)/src/Makefile.global
@@ -130,8 +133,8 @@ diff -Naur a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
  OBJS=	initdb.o encnames.o pqsignal.o $(WIN32RES)
  
 diff -Naur a/src/bin/Makefile b/src/bin/Makefile
---- a/src/bin/Makefile	2011-08-18 17:23:13.000000000 -0400
-+++ b/src/bin/Makefile	2011-08-27 17:50:31.507727467 -0400
+--- a/src/bin/Makefile	2011-09-08 17:13:27.000000000 -0400
++++ b/src/bin/Makefile	2011-09-17 11:51:14.628618001 -0400
 @@ -13,8 +13,7 @@
  top_builddir = ../..
  include $(top_builddir)/src/Makefile.global
@@ -143,8 +146,8 @@ diff -Naur a/src/bin/Makefile b/src/bin/Makefile
  ifeq ($(PORTNAME), win32)
  SUBDIRS += pgevent
 diff -Naur a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
---- a/src/include/pg_config_manual.h	2011-08-18 17:23:13.000000000 -0400
-+++ b/src/include/pg_config_manual.h	2011-08-27 17:53:01.442613210 -0400
+--- a/src/include/pg_config_manual.h	2011-09-08 17:13:27.000000000 -0400
++++ b/src/include/pg_config_manual.h	2011-09-17 11:52:23.292618001 -0400
 @@ -141,7 +141,7 @@
   * here's where to twiddle it.  You can also override this at runtime
   * with the postmaster's -k switch.
@@ -155,8 +158,8 @@ diff -Naur a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
  /*
   * The random() function is expected to yield values between 0 and
 diff -Naur a/src/Makefile b/src/Makefile
---- a/src/Makefile	2011-08-18 17:23:13.000000000 -0400
-+++ b/src/Makefile	2011-08-27 17:48:06.462348836 -0400
+--- a/src/Makefile	2011-09-08 17:13:27.000000000 -0400
++++ b/src/Makefile	2011-09-17 12:12:29.580618000 -0400
 @@ -18,12 +18,9 @@
  	backend \
  	backend/utils/mb/conversion_procs \
@@ -180,8 +183,8 @@ diff -Naur a/src/Makefile b/src/Makefile
  install-local: installdirs-local
  	$(INSTALL_DATA) Makefile.global '$(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.global'
 diff -Naur a/src/Makefile.global.in b/src/Makefile.global.in
---- a/src/Makefile.global.in	2011-08-18 17:23:13.000000000 -0400
-+++ b/src/Makefile.global.in	2011-08-27 17:49:15.185421175 -0400
+--- a/src/Makefile.global.in	2011-09-08 17:13:27.000000000 -0400
++++ b/src/Makefile.global.in	2011-09-17 12:14:57.972618000 -0400
 @@ -482,6 +482,7 @@
     LDFLAGS += $(PROFILE)
  endif
@@ -191,8 +194,8 @@ diff -Naur a/src/Makefile.global.in b/src/Makefile.global.in
  ##########################################################################
  #
 diff -Naur a/src/port/Makefile b/src/port/Makefile
---- a/src/port/Makefile	2011-08-18 17:23:13.000000000 -0400
-+++ b/src/port/Makefile	2011-08-27 17:54:10.765625070 -0400
+--- a/src/port/Makefile	2011-09-08 17:13:27.000000000 -0400
++++ b/src/port/Makefile	2011-09-17 12:15:46.196618001 -0400
 @@ -37,11 +37,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)



^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2011-09-18 18:22 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-13 21:52 [gentoo-commits] proj/pgsql-patches:9.1 commit in: / Aaron Swenson
  -- strict thread matches above, loose matches on Subject: below --
2011-09-18 18:22 Aaron Swenson
2011-09-17 15:15 Aaron Swenson
2011-08-27 22:00 Aaron Swenson
2011-08-08 10:58 Aaron Swenson
2011-07-14 10:55 Aaron Swenson
2011-07-04 22:55 Aaron Swenson
2011-07-04 22:55 Aaron Swenson
2011-07-04 22:55 Aaron Swenson
2011-03-30  9:49 Aaron Swenson
2011-03-30  9:49 Aaron Swenson
2011-03-19 23:27 Aaron Swenson
2011-03-19 22:51 Aaron Swenson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox