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 1QxQvE-0005tF-P1 for garchives@archives.gentoo.org; Sat, 27 Aug 2011 22:00:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5386221C051; Sat, 27 Aug 2011 22:00:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E395921C051 for ; Sat, 27 Aug 2011 22:00:04 +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 4CDFE1B4073 for ; Sat, 27 Aug 2011 22:00:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id E1EAE80040 for ; Sat, 27 Aug 2011 22:00:02 +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: autoconf.patch base.patch bool.patch pg_ctl-exit-status.patch server.patch X-VCS-Directories: / X-VCS-Committer: titanofold X-VCS-Committer-Name: Aaron Swenson X-VCS-Revision: de3603fc159da1422f5dbfe208b50faa42ecd72f Date: Sat, 27 Aug 2011 22:00:02 +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: 7060567f050b3801742b24d13b033048 commit: de3603fc159da1422f5dbfe208b50faa42ecd72f Author: Aaron W. Swenson gentoo org> AuthorDate: Sat Aug 27 21:59:32 2011 +0000 Commit: Aaron Swenson gentoo org> CommitDate: Sat Aug 27 21:59:32 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/pgsql-patches= .git;a=3Dcommit;h=3Dde3603fc 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 @@ =20 - AC_INIT([PostgreSQL], [9.1beta2], [pgsql-bugs@postgresql.org]) + AC_INIT([PostgreSQL], [9.1rc1], [pgsql-bugs@postgresql.org]) =20 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf ve= rsion 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.000000= 000 -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 =20 @@ -58,31 +58,9 @@ diff -Naur postgresql-9.1beta3.orig/contrib/Makefile p= ostgresql-9.1beta3/contrib =20 ifeq ($(with_ossp_uuid),yes) SUBDIRS +=3D 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 @@ -=20 - SUBDIRS =3D \ - port \ -- timezone \ - backend \ -- backend/utils/mb/conversion_procs \ -- backend/snowball \ - include \ - interfaces \ -- backend/replication/libpqwalreceiver \ - bin \ -- pl \ -- makefiles \ -- test/regress -+ makefiles -=20 - # 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.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 +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 @@ =20 #######################################################################= ### @@ -126,9 +104,9 @@ diff -Naur postgresql-9.1beta3.orig/src/backend/Makef= ile postgresql-9.1beta3/src =20 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.000000= 000 -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 =3D ../.. include $(top_builddir)/src/Makefile.global @@ -139,9 +117,9 @@ diff -Naur postgresql-9.1beta3.orig/src/bin/Makefile = postgresql-9.1beta3/src/bin =20 ifeq ($(PORTNAME), win32) 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 +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-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_c= onfig_manual.h postgresql-9. =20 /* * 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 @@ +=20 + SUBDIRS =3D \ + port \ +- timezone \ + backend \ +- backend/utils/mb/conversion_procs \ +- backend/snowball \ + include \ + interfaces \ +- backend/replication/libpqwalreceiver \ + bin \ +- pl \ +- makefiles \ +- test/regress ++ makefiles +=20 + # 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 @@ */ =20 #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/G= NUmakefile.in ---- postgresql-9.1beta3.orig/GNUmakefile.in 2011-07-07 20:12:33.00000000= 0 -0400 -+++ postgresql-9.1beta3/GNUmakefile.in 2011-07-14 06:41:47.153039815 -04= 00 -@@ -8,7 +8,7 @@ - top_builddir =3D . - include $(top_builddir)/src/Makefile.global -=20 --$(call recurse,all install,src config) -+$(call recurse,all install,src) -=20 - all: - +@echo "All of PostgreSQL successfully made. Ready to install." -@@ -16,7 +16,7 @@ - docs: - $(MAKE) -C doc all -=20 --$(call recurse,world,doc src config contrib,all) -+$(call recurse,world,doc src contrib,all) - world: - +@echo "PostgreSQL, contrib, and documentation successfully made. Read= y to install." -=20 -@@ -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 @@ =20 --$(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 =3D adminpack + OBJS =3D adminpack.o +-PG_CPPFLAGS =3D -I$(libpq_srcdir) ++PG_CPPFLAGS =3D -I$(libpq_srcdir) -I../../src/include/ =20 --$(call recurse,installdirs uninstall coverage,doc src config) -+$(call recurse,installdirs uninstall coverage,doc src) + EXTENSION =3D adminpack + DATA =3D 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 @@ =20 - $(call recurse,distprep,doc src config contrib) + MODULE_big =3D dblink + OBJS =3D dblink.o +-PG_CPPFLAGS =3D -I$(libpq_srcdir) ++PG_CPPFLAGS =3D -I$(libpq_srcdir) -I../../src/include/ + SHLIB_LINK =3D $(libpq) + SHLIB_PREREQS =3D submake-libpq =20 -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-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 =20 ifeq ($(with_openssl),yes) SUBDIRS +=3D sslinfo -diff -Naur postgresql-9.1beta3.orig/contrib/adminpack/Makefile postgresq= l-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.2= 75315180 -0400 -@@ -2,7 +2,7 @@ -=20 - MODULE_big =3D adminpack - OBJS =3D adminpack.o --PG_CPPFLAGS =3D -I$(libpq_srcdir) -+PG_CPPFLAGS =3D -I$(libpq_srcdir) -I../../src/include/ -=20 - EXTENSION =3D adminpack - DATA =3D 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.9432= 45493 -0400 -@@ -2,7 +2,7 @@ -=20 - MODULE_big =3D dblink - OBJS =3D dblink.o --PG_CPPFLAGS =3D -I$(libpq_srcdir) -+PG_CPPFLAGS =3D -I$(libpq_srcdir) -I../../src/include/ - SHLIB_LINK =3D $(libpq) - SHLIB_PREREQS =3D submake-libpq -=20 -diff -Naur postgresql-9.1beta3.orig/contrib/uuid-ossp/Makefile postgresq= l-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.9= 09707816 -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 -- +=20 +PG_CPPFLAGS +=3D "-DHAVE_OSSP_UUID_H" MODULE_big =3D uuid-ossp OBJS =3D uuid-ossp.o @@ -104,23 +69,94 @@ diff -Naur postgresql-9.1beta3.orig/contrib/uuid-oss= p/Makefile postgresql-9.1bet =20 ifdef USE_PGXS PG_CONFIG =3D pg_config -diff -Naur postgresql-9.1beta3.orig/contrib/xml2/Makefile postgresql-9.1= beta3/contrib/xml2/Makefile ---- postgresql-9.1beta3.orig/contrib/xml2/Makefile 2011-07-07 20:12:33.0= 00000000 -0400 -+++ postgresql-9.1beta3/contrib/xml2/Makefile 2011-07-14 06:46:58.764958= 033 -0400 -@@ -7,8 +7,8 @@ - DATA =3D 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 @@ =20 REGRESS =3D xml2 -- +=20 -SHLIB_LINK +=3D $(filter -lxslt, $(LIBS)) $(filter -lxml2, $(LIBS)) +PG_CPPFLAGS =3D $(shell xml2-config --cflags) +SHLIB_LINK +=3D $(shell xml2-config --libs) $(shell xslt-config --libs) =20 ifdef USE_PGXS PG_CONFIG =3D 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 =3D . + include $(top_builddir)/src/Makefile.global +=20 +-$(call recurse,all install,src config) ++$(call recurse,all install,src) +=20 + all: + +@echo "All of PostgreSQL successfully made. Ready to install." +@@ -16,7 +16,7 @@ + docs: + $(MAKE) -C doc all +=20 +-$(call recurse,world,doc src config contrib,all) ++$(call recurse,world,doc src contrib,all) + world: + +@echo "PostgreSQL, contrib, and documentation successfully made. Read= y to install." +=20 +@@ -29,11 +29,11 @@ + install-docs: + $(MAKE) -C doc install +=20 +-$(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." +=20 +-$(call recurse,installdirs uninstall coverage,doc src config) ++$(call recurse,installdirs uninstall coverage,doc src) +=20 + $(call recurse,distprep,doc src config contrib) +=20 +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 =3D ../../.. + include $(top_builddir)/src/Makefile.global +=20 +-override CPPFLAGS :=3D -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS) ++override CPPFLAGS :=3D -DFRONTEND -I$(top_srcdir)/src/interfaces/libpq = $(CPPFLAGS) +=20 + OBJS=3D initdb.o encnames.o pqsignal.o $(WIN32RES) +=20 +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 =3D ../.. + include $(top_builddir)/src/Makefile.global +=20 +-SUBDIRS =3D initdb pg_ctl pg_dump \ +- psql scripts pg_config pg_controldata pg_resetxlog pg_basebackup ++SUBDIRS =3D initdb pg_ctl pg_controldata pg_resetxlog pg_basebackup +=20 + ifeq ($(PORTNAME), win32) + SUBDIRS +=3D pgevent +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-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/postgre= sql" +=20 + /* + * 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 post= gresql-9.1beta3/src/Makefil =20 install-local: installdirs-local $(INSTALL_DATA) Makefile.global '$(DESTDIR)$(pgxsdir)/$(subdir)/Makefi= le.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.00687= 8297 -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 +=3D $(PROFILE) endif @@ -154,46 +190,9 @@ diff -Naur postgresql-9.1beta3.orig/src/Makefile.glo= bal.in postgresql-9.1beta3/s =20 #######################################################################= ### # -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-14 06:50:50.241526233 -= 0400 -@@ -13,8 +13,7 @@ - top_builddir =3D ../.. - include $(top_builddir)/src/Makefile.global -=20 --SUBDIRS =3D initdb pg_ctl pg_dump \ -- psql scripts pg_config pg_controldata pg_resetxlog pg_basebackup -+SUBDIRS =3D initdb pg_ctl pg_controldata pg_resetxlog pg_basebackup -=20 - ifeq ($(PORTNAME), win32) - SUBDIRS +=3D 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.0354= 09539 -0400 -@@ -16,7 +16,7 @@ - top_builddir =3D ../../.. - include $(top_builddir)/src/Makefile.global -=20 --override CPPFLAGS :=3D -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS) -+override CPPFLAGS :=3D -DFRONTEND -I$(top_srcdir)/src/interfaces/libpq = $(CPPFLAGS) -=20 - OBJS=3D initdb.o encnames.o pqsignal.o $(WIN32RES) -=20 -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-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/postgre= sql" -=20 - /* - * The random() function is expected to yield values between 0 and -diff -Naur postgresql-9.1beta3.orig/src/port/Makefile postgresql-9.1beta= 3/src/port/Makefile ---- postgresql-9.1beta3.orig/src/port/Makefile 2011-07-07 20:12:33.00000= 0000 -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 -DF= RONTEND OBJS_SRV =3D $(OBJS:%.o=3D%_srv.o)