path: root/server.patch

diff -Naur a/contrib/adminpack/Makefile b/contrib/adminpack/Makefile
--- a/contrib/adminpack/Makefile	2011-02-02 07:37:16.724174266 -0500
+++ b/contrib/adminpack/Makefile	2011-02-06 18:46:37.086945001 -0500
@@ -1,7 +1,7 @@
 # $PostgreSQL: pgsql/contrib/adminpack/Makefile,v 1.6 2007/11/10 23:59:50 momjian Exp $
 
 MODULE_big = adminpack
-PG_CPPFLAGS = -I$(libpq_srcdir)
+PG_CPPFLAGS = -I$(libpq_srcdir) -I../../src/include/
 DATA_built = adminpack.sql
 DATA = uninstall_adminpack.sql
 OBJS = adminpack.o
diff -Naur a/contrib/dblink/Makefile b/contrib/dblink/Makefile
--- a/contrib/dblink/Makefile	2011-02-02 07:37:19.904150270 -0500
+++ b/contrib/dblink/Makefile	2011-02-06 18:47:10.086945001 -0500
@@ -1,7 +1,7 @@
 # $PostgreSQL: pgsql/contrib/dblink/Makefile,v 1.15 2007/11/10 23:59:50 momjian Exp $
 
 MODULE_big = dblink
-PG_CPPFLAGS = -I$(libpq_srcdir)
+PG_CPPFLAGS = -I$(libpq_srcdir) -I../../src/include/
 OBJS	= dblink.o
 SHLIB_LINK = $(libpq)
 
diff -Naur a/contrib/Makefile b/contrib/Makefile
--- a/contrib/Makefile	2011-02-02 07:37:16.654175660 -0500
+++ b/contrib/Makefile	2011-02-06 19:04:09.240560001 -0500
@@ -23,7 +23,6 @@
 		isn		\
 		lo		\
 		ltree		\
-		oid2name	\
 		pageinspect	\
 		passwordcheck	\
 		pg_archivecleanup \
@@ -34,7 +33,6 @@
 		pg_trgm		\
 		pg_upgrade	\
 		pg_upgrade_support \
-		pgbench		\
 		pgcrypto	\
 		pgrowlocks	\
 		pgstattuple	\
@@ -43,8 +41,7 @@
 		tablefunc	\
 		test_parser	\
 		tsearch2	\
-		unaccent	\
-		vacuumlo
+		unaccent
 
 ifeq ($(with_openssl),yes)
 SUBDIRS += sslinfo
diff -Naur a/contrib/uuid-ossp/Makefile b/contrib/uuid-ossp/Makefile
--- a/contrib/uuid-ossp/Makefile	2011-02-02 07:37:26.354099087 -0500
+++ b/contrib/uuid-ossp/Makefile	2011-02-06 18:50:15.566945002 -0500
@@ -1,11 +1,12 @@
 # $PostgreSQL: pgsql/contrib/uuid-ossp/Makefile,v 1.4 2007/11/13 00:13:19 tgl Exp $
+PG_CPPFLAGS += "-DHAVE_OSSP_UUID_H"
 
 MODULE_big = uuid-ossp
 OBJS = uuid-ossp.o
 DATA_built = uuid-ossp.sql
 DATA = uninstall_uuid-ossp.sql
 
-SHLIB_LINK += $(OSSP_UUID_LIBS)
+SHLIB_LINK += -lossp-uuid
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff -Naur a/contrib/xml2/Makefile b/contrib/xml2/Makefile
--- a/contrib/xml2/Makefile	2011-02-02 07:37:26.444099780 -0500
+++ b/contrib/xml2/Makefile	2011-02-06 18:53:04.816945002 -0500
@@ -4,7 +4,8 @@
 
 OBJS = xpath.o xslt_proc.o
 
-SHLIB_LINK += $(filter -lxslt, $(LIBS)) $(filter -lxml2, $(LIBS))
+PG_CPPFLAGS = $(shell xml2-config --cflags)
+SHLIB_LINK += $(shell xml2-config --libs) $(shell xslt-config --libs)
 
 DATA_built = pgxml.sql
 DATA = uninstall_pgxml.sql
diff -Naur a/GNUmakefile.in b/GNUmakefile.in
--- a/GNUmakefile.in	2011-02-02 07:37:14.644191250 -0500
+++ b/GNUmakefile.in	2011-02-06 18:55:44.316945002 -0500
@@ -10,7 +10,6 @@
 
 all:
 	$(MAKE) -C src all
-	$(MAKE) -C config all
 	@echo "All of PostgreSQL successfully made. Ready to install."
 
 docs:
@@ -28,7 +27,6 @@
 
 install:
 	$(MAKE) -C src $@
-	$(MAKE) -C config $@
 	@echo "PostgreSQL installation complete."
 
 install-docs:
@@ -44,7 +42,6 @@
 installdirs uninstall coverage:
 	$(MAKE) -C doc $@
 	$(MAKE) -C src $@
-	$(MAKE) -C config $@
 
 distprep:
 	$(MAKE) -C doc $@
diff -Naur a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
--- a/src/bin/initdb/Makefile	2011-02-02 07:38:35.193570971 -0500
+++ b/src/bin/initdb/Makefile	2011-02-06 18:57:13.786945002 -0500
@@ -16,7 +16,7 @@
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-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-02-02 07:38:35.133570047 -0500
+++ b/src/bin/Makefile	2011-02-06 18:58:37.556945000 -0500
@@ -13,8 +13,7 @@
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 
-SUBDIRS = initdb pg_ctl pg_dump \
-	psql scripts pg_config pg_controldata pg_resetxlog
+SUBDIRS = initdb pg_ctl pg_controldata pg_resetxlog
 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-02-02 07:38:45.143493902 -0500
+++ b/src/include/pg_config_manual.h	2011-02-06 18:59:24.906945001 -0500
@@ -141,7 +141,7 @@
  * here's where to twiddle it.  You can also override this at runtime
  * with the postmaster's -k switch.
  */
-#define DEFAULT_PGSOCKET_DIR  "/tmp"
+#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	2011-02-02 07:37:56.283870942 -0500
+++ b/src/Makefile	2011-02-06 19:00:45.076945001 -0500
@@ -19,15 +19,12 @@
 	$(MAKE) -C backend $@
 	$(MAKE) -C backend/utils/mb/conversion_procs $@
 	$(MAKE) -C backend/snowball $@
-	$(MAKE) -C include $@
-	$(MAKE) -C interfaces $@
 	$(MAKE) -C backend/replication/libpqwalreceiver $@
 	$(MAKE) -C bin $@
 	$(MAKE) -C pl $@
-	$(MAKE) -C makefiles $@
 	$(MAKE) -C test/regress $@
 
-install: install-local
+install:
 
 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-02-02 07:37:56.313868792 -0500
+++ b/src/Makefile.global.in	2011-02-06 19:02:14.716945002 -0500
@@ -458,6 +458,7 @@
    LDFLAGS += $(PROFILE)
 endif
 
+CFLAGS += -I$(top_srcdir)/src/include
 
 ##########################################################################
 #
diff -Naur a/src/port/Makefile b/src/port/Makefile
--- a/src/port/Makefile	2011-02-02 07:38:59.183388185 -0500
+++ b/src/port/Makefile	2011-02-06 19:04:00.876945002 -0500
@@ -39,11 +39,10 @@
 # foo_srv.o and foo.o are both built from foo.c, but only foo.o has -DFRONTEND
 OBJS_SRV = $(OBJS:%.o=%_srv.o)
 
-all: libpgport.a libpgport_srv.a
+all: libpgport_srv.a
 
 # libpgport is needed by some contrib
-install: all installdirs
-	$(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(libdir)/libpgport.a'
+install:
 
 installdirs:
 	$(MKDIR_P) '$(DESTDIR)$(libdir)'