From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0CACE1381F3 for ; Sun, 9 Jun 2013 01:58:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C99F2E084C; Sun, 9 Jun 2013 01:58:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3F0CAE084C for ; Sun, 9 Jun 2013 01:58:21 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 04A7333E0CF for ; Sun, 9 Jun 2013 01:58:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 78FF2E468F for ; Sun, 9 Jun 2013 01:58:18 +0000 (UTC) From: "Aaron Swenson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Swenson" Message-ID: <1370743065.3817ec9e3cf3566ece28a1213fd7b226c31fe28d.titanofold@gentoo> Subject: [gentoo-commits] proj/pgsql-patches:patches-9.3 commit in: / X-VCS-Repository: proj/pgsql-patches X-VCS-Files: base.patch X-VCS-Directories: / X-VCS-Committer: titanofold X-VCS-Committer-Name: Aaron Swenson X-VCS-Revision: 3817ec9e3cf3566ece28a1213fd7b226c31fe28d X-VCS-Branch: patches-9.3 Date: Sun, 9 Jun 2013 01:58:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d81c38aa-86ef-4b0f-81f4-18813a00425c X-Archives-Hash: 6058875eafc7939db438eeebc3f820d4 commit: 3817ec9e3cf3566ece28a1213fd7b226c31fe28d Author: Aaron W. Swenson gentoo org> AuthorDate: Sun Jun 9 01:57:45 2013 +0000 Commit: Aaron Swenson gentoo org> CommitDate: Sun Jun 9 01:57:45 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/pgsql-patches.git;a=commit;h=3817ec9e Update for 9.3 --- base.patch | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/base.patch b/base.patch index 20afa59..0a43d26 100644 --- a/base.patch +++ b/base.patch @@ -1,7 +1,7 @@ diff -Naur a/contrib/Makefile b/contrib/Makefile ---- a/contrib/Makefile 2012-05-10 18:35:09.000000000 -0400 -+++ b/contrib/Makefile 2012-05-20 09:33:47.892622992 -0400 -@@ -5,58 +5,10 @@ +--- a/contrib/Makefile 2013-05-06 20:57:06.000000000 +0000 ++++ b/contrib/Makefile 2013-06-09 01:48:22.351874929 +0000 +@@ -5,61 +5,10 @@ include $(top_builddir)/src/Makefile.global SUBDIRS = \ @@ -43,6 +43,8 @@ diff -Naur a/contrib/Makefile b/contrib/Makefile - pgcrypto \ - pgrowlocks \ - pgstattuple \ +- pg_xlogdump \ +- postgres_fdw \ - seg \ - spi \ - tablefunc \ @@ -50,7 +52,9 @@ diff -Naur a/contrib/Makefile b/contrib/Makefile - test_parser \ - tsearch2 \ - unaccent \ - vacuumlo +- vacuumlo \ +- worker_spi ++ vacuumlo -ifeq ($(with_openssl),yes) -SUBDIRS += sslinfo @@ -61,9 +65,9 @@ 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 2012-05-10 18:35:09.000000000 -0400 -+++ b/src/backend/Makefile 2012-05-20 09:36:24.446654842 -0400 -@@ -45,7 +45,7 @@ +--- a/src/backend/Makefile 2013-05-06 20:57:06.000000000 +0000 ++++ b/src/backend/Makefile 2013-06-09 01:50:19.655864258 +0000 +@@ -47,7 +47,7 @@ ########################################################################## @@ -72,7 +76,7 @@ diff -Naur a/src/backend/Makefile b/src/backend/Makefile ifneq ($(PORTNAME), cygwin) ifneq ($(PORTNAME), win32) -@@ -114,7 +114,7 @@ +@@ -116,7 +116,7 @@ endif # aix # Update the commonly used headers before building the subdirectories @@ -81,7 +85,7 @@ diff -Naur a/src/backend/Makefile b/src/backend/Makefile # run this unconditionally to avoid needing to know its dependencies here: submake-schemapg: -@@ -207,23 +207,7 @@ +@@ -209,23 +209,8 @@ ########################################################################## @@ -103,12 +107,13 @@ diff -Naur a/src/backend/Makefile b/src/backend/Makefile - $(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample' - $(INSTALL_DATA) $(srcdir)/access/transam/recovery.conf.sample '$(DESTDIR)$(datadir)/recovery.conf.sample' +install: ++ 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 2012-05-10 18:35:09.000000000 -0400 -+++ b/src/bin/Makefile 2012-05-20 09:41:18.489958216 -0400 +--- a/src/bin/Makefile 2013-05-06 20:57:06.000000000 +0000 ++++ b/src/bin/Makefile 2013-06-09 01:51:56.143824442 +0000 @@ -13,8 +13,7 @@ top_builddir = ../.. include $(top_builddir)/src/Makefile.global @@ -120,23 +125,23 @@ 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 2012-05-10 18:35:09.000000000 -0400 -+++ b/src/include/pg_config_manual.h 2012-05-20 09:38:48.325846035 -0400 +--- a/src/include/pg_config_manual.h 2013-05-06 20:57:06.000000000 +0000 ++++ b/src/include/pg_config_manual.h 2013-06-09 01:53:27.019761951 +0000 @@ -144,7 +144,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@@RUNDIR@/run/postgresql" ++#define DEFAULT_PGSOCKET_DIR "@GENTOO_PORTAGE_EPREFIX@/run/postgresql" /* * The random() function is expected to yield values between 0 and diff -Naur a/src/Makefile b/src/Makefile ---- a/src/Makefile 2012-05-10 18:35:09.000000000 -0400 -+++ b/src/Makefile 2012-05-20 09:40:13.532774840 -0400 -@@ -14,17 +14,11 @@ - +--- a/src/Makefile 2013-05-06 20:57:06.000000000 +0000 ++++ b/src/Makefile 2013-06-09 01:54:30.479704228 +0000 +@@ -15,17 +15,11 @@ SUBDIRS = \ + common \ port \ - timezone \ backend \