Updated for beta 3

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.