From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Qh7Ma-0005MG-7Z for garchives@archives.gentoo.org; Wed, 13 Jul 2011 21:53:00 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 41E2E21C247; Wed, 13 Jul 2011 21:52:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 05B8521C247 for ; Wed, 13 Jul 2011 21:52:52 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 309932AC28D for ; Wed, 13 Jul 2011 21:52:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 8C21A8003D for ; Wed, 13 Jul 2011 21:52:51 +0000 (UTC) From: "Aaron Swenson" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Swenson" Message-ID: Subject: [gentoo-commits] proj/pgsql-patches:9.1 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: ddb050b7b96da2db7f120ccebcc47d109298f6b2 Date: Wed, 13 Jul 2011 21:52:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 4856437eb4cda4b9d84b4936dc7fde2d commit: ddb050b7b96da2db7f120ccebcc47d109298f6b2 Author: Aaron W. Swenson gentoo org> AuthorDate: Wed Jul 13 21:52:33 2011 +0000 Commit: Aaron Swenson gentoo org> CommitDate: Wed Jul 13 21:52:33 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/pgsql-patches= .git;a=3Dcommit;h=3Dddb050b7 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.000000= 000 -0400 ++++ postgresql-9.1beta3/contrib/Makefile 2011-07-13 17:33:27.267411316 -= 0400 +@@ -5,56 +5,10 @@ include $(top_builddir)/src/Makefile.global =20 SUBDIRS =3D \ @@ -52,13 +52,15 @@ diff -Naur a/contrib/Makefile b/contrib/Makefile =20 -ifeq ($(with_openssl),yes) -SUBDIRS +=3D sslinfo +-else +-ALWAYS_SUBDIRS +=3D sslinfo -endif =20 ifeq ($(with_ossp_uuid),yes) SUBDIRS +=3D 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 @@ =20 SUBDIRS =3D \ @@ -78,9 +80,9 @@ diff -Naur a/src/Makefile b/src/Makefile =20 # 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.1b= eta3/src/backend/Makefile +--- postgresql-9.1beta3.orig/src/backend/Makefile 2011-07-07 20:12:33.00= 0000000 -0400 ++++ postgresql-9.1beta3/src/backend/Makefile 2011-07-13 17:47:18.6416511= 41 -0400 @@ -45,7 +45,7 @@ =20 #######################################################################= ### @@ -99,7 +101,7 @@ diff -Naur a/src/backend/Makefile b/src/backend/Makefi= le =20 # run this unconditionally to avoid needing to know its dependencies he= re: submake-schemapg: -@@ -205,23 +205,7 @@ +@@ -206,23 +206,7 @@ =20 #######################################################################= ### =20 @@ -124,9 +126,9 @@ diff -Naur a/src/backend/Makefile b/src/backend/Makef= ile =20 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.000000= 000 -0400 ++++ postgresql-9.1beta3/src/bin/Makefile 2011-07-13 17:49:20.174599808 -= 0400 @@ -13,8 +13,7 @@ top_builddir =3D ../.. include $(top_builddir)/src/Makefile.global @@ -134,12 +136,12 @@ diff -Naur a/src/bin/Makefile b/src/bin/Makefile -SUBDIRS =3D initdb pg_ctl pg_dump \ - psql scripts pg_config pg_controldata pg_resetxlog pg_basebackup +SUBDIRS =3D pg_dump psql scripts pg_config +=20 ifeq ($(PORTNAME), win32) - SUBDIRS+=3Dpgevent - endif -diff -Naur a/src/include/pg_config_manual.h b/src/include/pg_config_manu= al.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 +=3D pgevent +diff -Naur postgresql-9.1beta3.orig/src/include/pg_config_manual.h postg= resql-9.1beta3/src/include/pg_config_manual.h +--- postgresql-9.1beta3.orig/src/include/pg_config_manual.h 2011-07-07 2= 0: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.