[gentoo-commits] proj/pgsql-patches:patches-9.3 commit in: /

[Aaron Swenson]

commit:     fd195d06aa313696e420de4ab669a77d13f9d1d4
Author:     Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  2 11:47:07 2013 +0000
Commit:     Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Tue Jul  2 11:47:07 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pgsql-patches.git;a=commit;h=fd195d06

Split out run directory patch.

---
 base.patch    | 12 ------------
 run-dir.patch | 12 ++++++++++++
 server.patch  | 12 ------------
 3 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/base.patch b/base.patch
index 0a43d26..3ce90d6 100644
--- a/base.patch
+++ b/base.patch
@@ -124,18 +124,6 @@ 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	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@/run/postgresql"
- 
- /*
-  * The random() function is expected to yield values between 0 and
 diff -Naur a/src/Makefile b/src/Makefile
 --- a/src/Makefile	2013-05-06 20:57:06.000000000 +0000
 +++ b/src/Makefile	2013-06-09 01:54:30.479704228 +0000

diff --git a/run-dir.patch b/run-dir.patch
new file mode 100644
index 0000000..46acedb
--- /dev/null
+++ b/run-dir.patch
@@ -0,0 +1,12 @@
+diff -Naur a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
+--- 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@/run/postgresql"
+ 
+ /*
+  * The random() function is expected to yield values between 0 and

diff --git a/server.patch b/server.patch
index c295c53..26daf20 100644
--- a/server.patch
+++ b/server.patch
@@ -137,18 +137,6 @@ 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	2013-05-06 20:57:06.000000000 +0000
-+++ b/src/include/pg_config_manual.h	2013-06-09 02:24:08.790040861 +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@/run/postgresql"
- 
- /*
-  * The random() function is expected to yield values between 0 and
 diff -Naur a/src/Makefile b/src/Makefile
 --- a/src/Makefile	2013-05-06 20:57:06.000000000 +0000
 +++ b/src/Makefile	2013-06-09 02:25:13.697707579 +0000