dev-db/postgresql: Work on minimizing FILESDIR

Work towards addressing some minor QA complaints.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

7 files changed, 33 insertions, 57 deletions

diff --git a/dev-db/postgresql/files/postgresql-10.2-no-server.patch b/dev-db/postgresql/files/postgresql-10.2-no-server.patch
index 02ab4d712ffe..c0694451d99d 100644
--- a/dev-db/postgresql/files/postgresql-10.2-no-server.patch
+++ b/dev-db/postgresql/files/postgresql-10.2-no-server.patch
@@ -1,4 +1,3 @@
-diff -Naruw a/contrib/Makefile b/contrib/Makefile
 --- a/contrib/Makefile
 +++ b/contrib/Makefile
 @@ -5,57 +5,9 @@
@@ -59,7 +58,6 @@ diff -Naruw a/contrib/Makefile b/contrib/Makefile
  
  ifneq ($(with_uuid),no)
  SUBDIRS += uuid-ossp
-diff -Naruw a/src/backend/Makefile b/src/backend/Makefile
 --- a/src/backend/Makefile
 +++ b/src/backend/Makefile
 @@ -51,7 +51,7 @@
@@ -96,7 +94,6 @@ diff -Naruw a/src/backend/Makefile b/src/backend/Makefile
  
  install-bin: postgres $(POSTGRES_IMP) installdirs
  	$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
-diff -Naruw a/src/bin/Makefile b/src/bin/Makefile
 --- a/src/bin/Makefile
 +++ b/src/bin/Makefile
 @@ -14,19 +14,8 @@
@@ -119,7 +116,6 @@ diff -Naruw a/src/bin/Makefile b/src/bin/Makefile
  	pgbench \
  	psql \
  	scripts
-diff -Naruw a/src/Makefile b/src/Makefile
 --- a/src/Makefile
 +++ b/src/Makefile
 @@ -15,21 +15,12 @@
diff --git a/dev-db/postgresql/files/postgresql-11_beta1-no-server.patch b/dev-db/postgresql/files/postgresql-11_beta1-no-server.patch
index 005a550f3cd7..26e7832c121c 100644
--- a/dev-db/postgresql/files/postgresql-11_beta1-no-server.patch
+++ b/dev-db/postgresql/files/postgresql-11_beta1-no-server.patch
@@ -1,4 +1,3 @@
-diff -Naruw a/contrib/Makefile b/contrib/Makefile
 --- a/contrib/Makefile
 +++ b/contrib/Makefile
 @@ -5,56 +5,9 @@
@@ -58,7 +57,6 @@ diff -Naruw a/contrib/Makefile b/contrib/Makefile
  
  ifneq ($(with_uuid),no)
  SUBDIRS += uuid-ossp
-diff -Naruw a/src/backend/Makefile b/src/backend/Makefile
 --- a/src/backend/Makefile
 +++ b/src/backend/Makefile
 @@ -53,7 +53,7 @@
@@ -96,7 +94,6 @@ diff -Naruw a/src/backend/Makefile b/src/backend/Makefile
  
  ifeq ($(with_llvm), yes)
  install-bin: install-postgres-bitcode
-diff -Naruw a/src/bin/Makefile b/src/bin/Makefile
 --- a/src/bin/Makefile
 +++ b/src/bin/Makefile
 @@ -14,20 +14,8 @@
@@ -120,7 +117,6 @@ diff -Naruw a/src/bin/Makefile b/src/bin/Makefile
  	pgbench \
  	psql \
  	scripts
-diff -Naruw a/src/Makefile b/src/Makefile
 --- a/src/Makefile
 +++ b/src/Makefile
 @@ -15,21 +15,12 @@
diff --git a/dev-db/postgresql/files/postgresql-9.3-no-server.patch b/dev-db/postgresql/files/postgresql-9.3-no-server.patch
index 3ce90d60ae70..48e5377f2b1b 100644
--- a/dev-db/postgresql/files/postgresql-9.3-no-server.patch
+++ b/dev-db/postgresql/files/postgresql-9.3-no-server.patch
@@ -1,6 +1,5 @@
-diff -Naur a/contrib/Makefile b/contrib/Makefile
---- a/contrib/Makefile	2013-05-06 20:57:06.000000000 +0000
-+++ b/contrib/Makefile	2013-06-09 01:48:22.351874929 +0000
+--- a/contrib/Makefile
++++ b/contrib/Makefile
 @@ -5,61 +5,10 @@
  include $(top_builddir)/src/Makefile.global
  
@@ -64,9 +63,8 @@ diff -Naur a/contrib/Makefile b/contrib/Makefile
  
  ifeq ($(with_ossp_uuid),yes)
  SUBDIRS += uuid-ossp
-diff -Naur a/src/backend/Makefile b/src/backend/Makefile
---- a/src/backend/Makefile	2013-05-06 20:57:06.000000000 +0000
-+++ b/src/backend/Makefile	2013-06-09 01:50:19.655864258 +0000
+--- a/src/backend/Makefile
++++ b/src/backend/Makefile
 @@ -47,7 +47,7 @@
  
  ##########################################################################
@@ -111,9 +109,8 @@ 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	2013-05-06 20:57:06.000000000 +0000
-+++ b/src/bin/Makefile	2013-06-09 01:51:56.143824442 +0000
+--- a/src/bin/Makefile
++++ b/src/bin/Makefile
 @@ -13,8 +13,7 @@
  top_builddir = ../..
  include $(top_builddir)/src/Makefile.global
@@ -124,9 +121,8 @@ diff -Naur a/src/bin/Makefile b/src/bin/Makefile
  
  ifeq ($(PORTNAME), win32)
  SUBDIRS += pgevent
-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
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -15,17 +15,11 @@
  SUBDIRS = \
  	common \
diff --git a/dev-db/postgresql/files/postgresql-9.4.10-no-server.patch b/dev-db/postgresql/files/postgresql-9.4.10-no-server.patch
index 81fc3837bede..0eb750847cfa 100644
--- a/dev-db/postgresql/files/postgresql-9.4.10-no-server.patch
+++ b/dev-db/postgresql/files/postgresql-9.4.10-no-server.patch
@@ -1,6 +1,5 @@
-diff -Naruw a/contrib/Makefile b/contrib/Makefile
---- a/contrib/Makefile	2016-10-24 16:12:53.000000000 -0400
-+++ b/contrib/Makefile	2016-10-27 13:38:23.361545396 -0400
+--- a/contrib/Makefile
++++ b/contrib/Makefile
 @@ -5,64 +5,10 @@
  include $(top_builddir)/src/Makefile.global
  
@@ -67,9 +66,8 @@ diff -Naruw a/contrib/Makefile b/contrib/Makefile
  
  ifneq ($(with_uuid),no)
  SUBDIRS += uuid-ossp
-diff -Naruw a/src/backend/Makefile b/src/backend/Makefile
---- a/src/backend/Makefile	2016-10-24 16:12:53.000000000 -0400
-+++ b/src/backend/Makefile	2016-10-27 14:04:47.617000374 -0400
+--- a/src/backend/Makefile
++++ b/src/backend/Makefile
 @@ -47,7 +47,7 @@
  
  ##########################################################################
@@ -113,9 +111,8 @@ diff -Naruw a/src/backend/Makefile b/src/backend/Makefile
  
  install-bin: postgres $(POSTGRES_IMP) installdirs
  	$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
-diff -Naruw a/src/bin/Makefile b/src/bin/Makefile
---- a/src/bin/Makefile	2016-10-24 16:12:53.000000000 -0400
-+++ b/src/bin/Makefile	2016-10-27 13:41:34.443930143 -0400
+--- a/src/bin/Makefile
++++ b/src/bin/Makefile
 @@ -13,8 +13,7 @@
  top_builddir = ../..
  include $(top_builddir)/src/Makefile.global
@@ -126,9 +123,8 @@ diff -Naruw a/src/bin/Makefile b/src/bin/Makefile
  
  ifeq ($(PORTNAME), win32)
  SUBDIRS += pgevent
-diff -Naruw a/src/Makefile b/src/Makefile
---- a/src/Makefile	2016-10-24 16:12:53.000000000 -0400
-+++ b/src/Makefile	2016-10-27 13:43:09.296792018 -0400
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -15,18 +15,11 @@
  SUBDIRS = \
  	common \
diff --git a/dev-db/postgresql/files/postgresql-9.5.5-no-server.patch b/dev-db/postgresql/files/postgresql-9.5.5-no-server.patch
index 285667801a63..a31bbe9af0c4 100644
--- a/dev-db/postgresql/files/postgresql-9.5.5-no-server.patch
+++ b/dev-db/postgresql/files/postgresql-9.5.5-no-server.patch
@@ -1,6 +1,5 @@
-diff -Naruw postgresql-9.5.5.orig/contrib/Makefile postgresql-9.5.5/contrib/Makefile
---- postgresql-9.5.5.orig/contrib/Makefile	2016-10-24 16:10:50.000000000 -0400
-+++ postgresql-9.5.5/contrib/Makefile	2016-10-27 13:49:19.418285694 -0400
+--- postgresql-9.5.5.orig/contrib/Makefile
++++ postgresql-9.5.5/contrib/Makefile
 @@ -5,55 +5,9 @@
  include $(top_builddir)/src/Makefile.global
  
@@ -57,9 +56,8 @@ diff -Naruw postgresql-9.5.5.orig/contrib/Makefile postgresql-9.5.5/contrib/Make
  
  ifneq ($(with_uuid),no)
  SUBDIRS += uuid-ossp
-diff -Naruw postgresql-9.5.5.orig/src/backend/Makefile postgresql-9.5.5/src/backend/Makefile
---- postgresql-9.5.5.orig/src/backend/Makefile	2016-10-24 16:10:50.000000000 -0400
-+++ postgresql-9.5.5/src/backend/Makefile	2016-10-27 13:51:16.027706097 -0400
+--- postgresql-9.5.5.orig/src/backend/Makefile
++++ postgresql-9.5.5/src/backend/Makefile
 @@ -47,7 +47,7 @@
  
  ##########################################################################
@@ -103,9 +101,8 @@ diff -Naruw postgresql-9.5.5.orig/src/backend/Makefile postgresql-9.5.5/src/back
  
  install-bin: postgres $(POSTGRES_IMP) installdirs
  	$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
-diff -Naruw postgresql-9.5.5.orig/src/bin/Makefile postgresql-9.5.5/src/bin/Makefile
---- postgresql-9.5.5.orig/src/bin/Makefile	2016-10-24 16:10:50.000000000 -0400
-+++ postgresql-9.5.5/src/bin/Makefile	2016-10-27 14:26:26.397161219 -0400
+--- postgresql-9.5.5.orig/src/bin/Makefile
++++ postgresql-9.5.5/src/bin/Makefile
 @@ -14,19 +14,8 @@
  include $(top_builddir)/src/Makefile.global
  
@@ -126,9 +123,8 @@ diff -Naruw postgresql-9.5.5.orig/src/bin/Makefile postgresql-9.5.5/src/bin/Make
  	pgbench \
  	psql \
  	scripts
-diff -Naruw postgresql-9.5.5.orig/src/Makefile postgresql-9.5.5/src/Makefile
---- postgresql-9.5.5.orig/src/Makefile	2016-10-24 16:10:50.000000000 -0400
-+++ postgresql-9.5.5/src/Makefile	2016-10-27 14:03:49.513956432 -0400
+--- postgresql-9.5.5.orig/src/Makefile
++++ postgresql-9.5.5/src/Makefile
 @@ -15,18 +15,11 @@
  SUBDIRS = \
  	common \
diff --git a/dev-db/postgresql/files/postgresql-9.6.3-no-server.patch b/dev-db/postgresql/files/postgresql-9.6.3-no-server.patch
index db662d4630e3..aa7cf773a39a 100644
--- a/dev-db/postgresql/files/postgresql-9.6.3-no-server.patch
+++ b/dev-db/postgresql/files/postgresql-9.6.3-no-server.patch
@@ -1,6 +1,5 @@
-diff -Naruw a/contrib/Makefile b/contrib/Makefile
---- a/contrib/Makefile	2017-05-08 17:15:12.000000000 -0400
-+++ b/contrib/Makefile	2017-07-13 20:20:26.926646151 -0400
+--- a/contrib/Makefile
++++ b/contrib/Makefile
 @@ -5,57 +5,9 @@
  include $(top_builddir)/src/Makefile.global
  
@@ -59,9 +58,8 @@ diff -Naruw a/contrib/Makefile b/contrib/Makefile
  
  ifneq ($(with_uuid),no)
  SUBDIRS += uuid-ossp
-diff -Naruw a/src/backend/Makefile b/src/backend/Makefile
---- a/src/backend/Makefile	2017-05-08 17:15:12.000000000 -0400
-+++ b/src/backend/Makefile	2017-07-13 20:18:08.590323095 -0400
+--- a/src/backend/Makefile
++++ b/src/backend/Makefile
 @@ -51,7 +51,7 @@
  
  ##########################################################################
@@ -96,9 +94,8 @@ diff -Naruw a/src/backend/Makefile b/src/backend/Makefile
  
  install-bin: postgres $(POSTGRES_IMP) installdirs
  	$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
-diff -Naruw a/src/bin/Makefile b/src/bin/Makefile
---- a/src/bin/Makefile	2017-05-08 17:15:12.000000000 -0400
-+++ b/src/bin/Makefile	2017-07-13 20:23:51.419471550 -0400
+--- a/src/bin/Makefile
++++ b/src/bin/Makefile
 @@ -14,19 +14,8 @@
  include $(top_builddir)/src/Makefile.global
  
@@ -119,9 +116,8 @@ diff -Naruw a/src/bin/Makefile b/src/bin/Makefile
  	pgbench \
  	psql \
  	scripts
-diff -Naruw a/src/Makefile b/src/Makefile
---- a/src/Makefile	2017-05-08 17:15:12.000000000 -0400
-+++ b/src/Makefile	2017-07-13 20:25:57.539158282 -0400
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -15,19 +15,12 @@
  SUBDIRS = \
  	common \
diff --git a/dev-db/postgresql/files/postgresql.init-9.3-r1 b/dev-db/postgresql/files/postgresql.init-9.3-r1
index 256ee7e6fd35..d3d3ea13be64 100755..100644
--- a/dev-db/postgresql/files/postgresql.init-9.3-r1
+++ b/dev-db/postgresql/files/postgresql.init-9.3-r1
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 extra_started_commands="reload promote"