Upgrading to version 9.6.20

5 files changed, 200 insertions, 191 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0a95ec8a7211..dd9ae59651e0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,37 +1,37 @@
 pkgbase = postgresql-9.6
 	pkgdesc = Sophisticated object-relational DBMS
-	pkgver = 9.6.18
-	pkgrel = 3
+	pkgver = 9.6.20
+	pkgrel = 1
 	url = https://www.postgresql.org/
 	arch = i686
 	arch = x86_64
 	license = custom:PostgreSQL
+	makedepends = clang
+	makedepends = icu
 	makedepends = krb5
+	makedepends = libldap
 	makedepends = libxml2
+	makedepends = llvm
+	makedepends = openssl>=1.0.0
+	makedepends = pam
+	makedepends = perl
 	makedepends = python
 	makedepends = python2
-	makedepends = perl
+	makedepends = systemd
 	makedepends = tcl>=8.6.0
-	makedepends = openssl>=1.0.0
-	makedepends = pam
 	makedepends = zlib
-	makedepends = icu
-	makedepends = systemd
-	makedepends = libldap
-	makedepends = llvm
-	makedepends = clang
-	source = https://ftp.postgresql.org/pub/source/v9.6.18/postgresql-9.6.18.tar.bz2
-	source = postgresql-run-socket.patch
+	source = https://ftp.postgresql.org/pub/source/v9.6.20/postgresql-9.6.20.tar.bz2
 	source = postgresql-perl-rpath.patch
+	source = postgresql-run-socket.patch
 	source = postgresql.pam
 	source = postgresql.logrotate
 	source = postgresql.service
 	source = postgresql-check-db-dir
 	source = postgresql.sysusers
 	source = postgresql.tmpfiles
-	sha256sums = 517ec282b785e6d22f360c30ba0c5e2a506fca5ca07dcc545427511d94c89999
-	sha256sums = 8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9
-	sha256sums = 5f73b54ca6206bd2c469c507830261ebd167baca074698d8889d769c33f98a31
+	sha256sums = 3d08cba409d45ab62d42b24431a0d55e7537bcd1db2d979f5f2eefe34d487bb6
+	sha256sums = 77624f5efda79bd12d5ab59831883aad8e94395bc3ab933268b215d0b7b0df5f
+	sha256sums = 23ada3488c0d219f5957130b8231ab495b02467c30773082a9851ddc855cd705
 	sha256sums = 57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5
 	sha256sums = 6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e
 	sha256sums = bd7ff909fd40f54058d3a7df426af6e02146b5cda97736687bee0862d7d93eaf
@@ -39,45 +39,36 @@ pkgbase = postgresql-9.6
 	sha256sums = 7fa8f0ef3f9d40abd4749cc327c2f52478cb6dfb6e2405bd0279c95e9ff99f12
 	sha256sums = 4a4c0bb9ceb156cc47e9446d8393d1f72b4fe9ea1d39ba17213359df9211da57
 
+pkgname = postgresql-9.6
+	pkgdesc = Sophisticated object-relational DBMS
+	install = postgresql.install
+	depends = postgresql-libs>=9.6.20
+	depends = llvm-libs
+	depends = systemd-libs
+	optdepends = postgresql-old-upgrade: upgrade from previous major version using pg_upgrade
+	optdepends = perl: for PL/Perl support
+	optdepends = python2: for PL/Python 2 support
+	optdepends = python: for PL/Python 3 support
+	optdepends = tcl: for PL/Tcl support
+	provides = postgresql=9.6.20
+	conflicts = postgresql
+	options = staticlibs
+	backup = etc/pam.d/postgresql
+	backup = etc/logrotate.d/postgresql
+
 pkgname = postgresql-libs-9.6
 	pkgdesc = Libraries for use with PostgreSQL
 	depends = krb5
-	depends = openssl>=1.0.0
-	depends = readline>=6.0
 	depends = zlib
-	depends = libldap
 	provides = postgresql-client
-	provides = postgresql-libs=9.6.18
+	provides = postgresql-libs=9.6.20
 	conflicts = postgresql-client
 	conflicts = postgresql-libs
 
 pkgname = postgresql-docs-9.6
 	pkgdesc = HTML documentation for PostgreSQL
-	provides = postgresql-docs=9.6.18
+	arch = any
+	provides = postgresql-docs=9.6.20
 	conflicts = postgresql-docs
 	options = docs
 
-pkgname = postgresql-9.6
-	pkgdesc = Sophisticated object-relational DBMS
-	install = postgresql.install
-	depends = postgresql-libs>=9.6.18
-	depends = krb5
-	depends = libxml2
-	depends = readline>=6.0
-	depends = openssl>=1.0.0
-	depends = pam
-	depends = icu
-	depends = systemd-libs
-	depends = libldap
-	depends = llvm-libs
-	optdepends = python2: for PL/Python 2 support
-	optdepends = python: for PL/Python 3 support
-	optdepends = perl: for PL/Perl support
-	optdepends = tcl: for PL/Tcl support
-	optdepends = postgresql-old-upgrade: upgrade from previous major version using pg_upgrade
-	provides = postgresql=9.6.18
-	conflicts = postgresql
-	options = staticlibs
-	backup = etc/pam.d/postgresql
-	backup = etc/logrotate.d/postgresql
-
diff --git a/.gitignore b/.gitignore
index b63977a0ed66..ac1992d001a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,14 @@
-src/
+postgresql-9.6-*.pkg.tar.zst
+postgresql-docs-9.6-*.pkg.tar.zst
+postgresql-libs-9.6-*.pkg.tar.zst
+postgresql-9.6-*.pkg.tar.xz
+postgresql-docs-9.6-*.pkg.tar.xz
+postgresql-libs-9.6-*.pkg.tar.xz
+postgresql-9.6-*.log
+postgresql-docs-9.6-*.log
+postgresql-libs-9.6-*.log
+postgresql-9.6.*.tar.bz2
+postgresql-9.6.*/
+PKGBUILD-namcap.log
 pkg/
-*.tar.*
+src/
diff --git a/PKGBUILD b/PKGBUILD
index 5afa25db73fc..f669cce20ab0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,6 @@
-# Maintainer: Felix Golatofski <contact@xdfr.de>
-# Co-Maintainer: Thomas Arnhold <thomas@arnhold.org
+# Maintainer: Fredy García <frealgagu at gmail dot com>
+# Contributor: Felix Golatofski <contact@xdfr.de>
+# Contributor: Thomas Arnhold <thomas@arnhold.org
 # Contributor: Levente Polyak <anthraxx[at]archlinux[dot]org>
 # Contributor: Dan McGee <dan@archlinux.org>
 # Contributor: Kuba Kuźma <kuba@jah.pl>
@@ -7,46 +8,51 @@
 # Contributor: Ariel Popper <a@arielp.com>
 
 pkgbase=postgresql-9.6
-pkgname=('postgresql-libs-9.6' 'postgresql-docs-9.6' 'postgresql-9.6')
-pkgver=9.6.18
-pkgrel=3
-pkgdesc='Sophisticated object-relational DBMS'
-url="https://www.postgresql.org/"
-arch=('i686' 'x86_64')
-license=('custom:PostgreSQL')
-makedepends=('krb5' 'libxml2' 'python' 'python2' 'perl' 'tcl>=8.6.0' 'openssl>=1.0.0'
-             'pam' 'zlib' 'icu' 'systemd' 'libldap' 'llvm' 'clang')
-source=(https://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2
-        postgresql-run-socket.patch
-	postgresql-perl-rpath.patch
-        postgresql.pam
-        postgresql.logrotate
-        postgresql.service
-        postgresql-check-db-dir
-	postgresql.sysusers
-	postgresql.tmpfiles)
-sha256sums=('517ec282b785e6d22f360c30ba0c5e2a506fca5ca07dcc545427511d94c89999'
-            '8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9'
-            '5f73b54ca6206bd2c469c507830261ebd167baca074698d8889d769c33f98a31'
-            '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
-            '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e'
-            'bd7ff909fd40f54058d3a7df426af6e02146b5cda97736687bee0862d7d93eaf'
-            '40da687da4fb1f6b35f406dd0f48922065d8c905d678e2a27da05806f874b780'
-            '7fa8f0ef3f9d40abd4749cc327c2f52478cb6dfb6e2405bd0279c95e9ff99f12'
-            '4a4c0bb9ceb156cc47e9446d8393d1f72b4fe9ea1d39ba17213359df9211da57')
+pkgname=(${pkgbase} ${pkgbase/-/-libs-} ${pkgbase/-/-docs-})
+pkgver=9.6.20
+pkgrel=1
+pkgdesc="Sophisticated object-relational DBMS"
+arch=("i686" "x86_64")
+url="https://www.${pkgbase%-*}.org/"
+license=("custom:PostgreSQL")
+makedepends=("clang" "icu" "krb5" "libldap" "libxml2" "llvm" "openssl>=1.0.0" "pam" "perl" "python" "python2" "systemd" "tcl>=8.6.0" "zlib")
+source=(
+  "https://ftp.${pkgbase%-*}.org/pub/source/v${pkgver}/${pkgbase%-*}-${pkgver}.tar.bz2"
+  "${pkgbase%-*}-perl-rpath.patch"
+  "${pkgbase%-*}-run-socket.patch"
+  "${pkgbase%-*}.pam"
+  "${pkgbase%-*}.logrotate"
+  "${pkgbase%-*}.service"
+  "${pkgbase%-*}-check-db-dir"
+  "${pkgbase%-*}.sysusers"
+  "${pkgbase%-*}.tmpfiles"
+)
+sha256sums=(
+  "3d08cba409d45ab62d42b24431a0d55e7537bcd1db2d979f5f2eefe34d487bb6"
+  "77624f5efda79bd12d5ab59831883aad8e94395bc3ab933268b215d0b7b0df5f"
+  "23ada3488c0d219f5957130b8231ab495b02467c30773082a9851ddc855cd705"
+  "57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5"
+  "6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e"
+  "bd7ff909fd40f54058d3a7df426af6e02146b5cda97736687bee0862d7d93eaf"
+  "40da687da4fb1f6b35f406dd0f48922065d8c905d678e2a27da05806f874b780"
+  "7fa8f0ef3f9d40abd4749cc327c2f52478cb6dfb6e2405bd0279c95e9ff99f12"
+  "4a4c0bb9ceb156cc47e9446d8393d1f72b4fe9ea1d39ba17213359df9211da57"
+)
+
 prepare() {
-  cd postgresql-${pkgver}
-  patch -p1 < ../postgresql-run-socket.patch
-  patch -p1 < ../postgresql-perl-rpath.patch
+  cd "${srcdir}/${pkgbase%-*}-${pkgver}"
+
+  patch -Np1 -i "${srcdir}/${pkgbase%-*}-run-socket.patch"
+  patch -Np1 -i "${srcdir}/${pkgbase%-*}-perl-rpath.patch"
 }
 
 build() {
-  cd "${srcdir}/postgresql-${pkgver}"
+  cd "${srcdir}/${pkgbase%-*}-${pkgver}"
 
-  local options=(
+  local _options=(
     --prefix=/usr
     --mandir=/usr/share/man
-    --datadir=/usr/share/postgresql
+    --datadir=/usr/share/${pkgbase%-*}
     --sysconfdir=/etc
     --with-gssapi
     --with-libxml
@@ -65,117 +71,116 @@ build() {
     --enable-thread-safety
     --disable-rpath
   )
-  # regular build with everything
-  ./configure ${options[@]} \
-    PYTHON=/usr/bin/python2
+
+  # Regular build with everything
+  ./configure ${_options[@]} PYTHON=/usr/bin/python2
   make world
 }
 
+package_postgresql-9.6() {
+  pkgdesc="Sophisticated object-relational DBMS"
+  depends=("${pkgbase%-*}-libs>=${pkgver}" "llvm-libs" "systemd-libs")
+  optdepends=(
+    "${pkgbase%-*}-old-upgrade: upgrade from previous major version using pg_upgrade"
+    "perl: for PL/Perl support"
+    "python2: for PL/Python 2 support"
+    "python: for PL/Python 3 support"
+    "tcl: for PL/Tcl support"
+  )
+  provides=("${pkgbase%-*}=${pkgver}")
+  conflicts=("${pkgbase%-*}")
+  backup=("etc/pam.d/${pkgbase%-*}" "etc/logrotate.d/${pkgbase%-*}")
+  options=(staticlibs)
+  install="${pkgbase%-*}.install"
+
+  # Install
+  make -C "${srcdir}/${pkgbase%-*}-${pkgver}" DESTDIR="${pkgdir}" install
+  make -C "${srcdir}/${pkgbase%-*}-${pkgver}/contrib" DESTDIR="${pkgdir}" install
+  make -C "${srcdir}/${pkgbase%-*}-${pkgver}/doc/src/sgml" DESTDIR="${pkgdir}" install-man
+
+  # We don't want these, they are in the -libs package
+  make -C "${srcdir}/${pkgbase%-*}-${pkgver}/src/interfaces" DESTDIR="${pkgdir}" uninstall
+  make -C "${srcdir}/${pkgbase%-*}-${pkgver}/src/bin/pg_config" DESTDIR="${pkgdir}" uninstall
+  make -C "${srcdir}/${pkgbase%-*}-${pkgver}/src/bin/pg_dump" DESTDIR="${pkgdir}" uninstall
+  make -C "${srcdir}/${pkgbase%-*}-${pkgver}/src/bin/psql" DESTDIR="${pkgdir}" uninstall
+  make -C "${srcdir}/${pkgbase%-*}-${pkgver}/src/bin/scripts" DESTDIR="${pkgdir}" uninstall
+  rm "${pkgdir}"/usr/share/man/man1/{pg_config,pg_dump,pg_dumpall,pg_restore,psql,clusterdb,createdb,createuser,dropdb,dropuser,pg_isready,reindexdb,vacuumdb}.1
+
+  install -Dm644 "${srcdir}/${pkgbase%-*}-${pkgver}/COPYRIGHT" "${pkgdir}/usr/share/licenses/${pkgname}/COPYRIGHT"
+  install -Dm755 "${srcdir}/${pkgbase%-*}-check-db-dir" "${pkgdir}/usr/bin"
+  install -Dm644 "${srcdir}/${pkgbase%-*}.pam" "${pkgdir}/etc/pam.d/${pkgbase%-*}"
+  install -Dm644 "${srcdir}/${pkgbase%-*}.logrotate" "${pkgdir}/etc/logrotate.d/${pkgbase%-*}"
+  install -Dm644 "${srcdir}/${pkgbase%-*}.service" "${pkgdir}/usr/lib/systemd/system/${pkgbase%-*}.service"
+  install -Dm644 "${srcdir}/${pkgbase%-*}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgbase%-*}.conf"
+  install -Dm644 "${srcdir}/${pkgbase%-*}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgbase%-*}.conf"
+
+  # Clean up unneeded installed items
+  rm -rf "${pkgdir}/usr/include/${pkgbase%-*}/internal"
+  rm -rf "${pkgdir}/usr/include/libpq"
+  find "${pkgdir}/usr/include" -maxdepth 1 -type f -execdir rm {} +
+  rmdir "${pkgdir}/usr/share/doc/${pkgbase%-*}/html"
+}
+
 package_postgresql-libs-9.6() {
   pkgdesc="Libraries for use with PostgreSQL"
-  depends=('krb5' 'openssl>=1.0.0' 'readline>=6.0' 'zlib' 'libldap')
-  provides=('postgresql-client' "postgresql-libs=$pkgver")
-  conflicts=('postgresql-client' 'postgresql-libs')
-
-  cd "${srcdir}/postgresql-${pkgver}"
-
-  # install license
-  install -Dm 644 COPYRIGHT -t "${pkgdir}/usr/share/licenses/${pkgname}"
-
-  # install libs and non-server binaries
-  for dir in src/interfaces src/bin/pg_config src/bin/pg_dump src/bin/psql src/bin/scripts; do
-    make -C ${dir} DESTDIR="${pkgdir}" install
-  done
-
-  for util in pg_config pg_dump pg_dumpall pg_restore psql \
-      clusterdb createdb createuser dropdb dropuser pg_isready reindexdb vacuumdb; do
-    install -Dm 644 doc/src/sgml/man1/${util}.1 "${pkgdir}"/usr/share/man/man1/${util}.1
-  done
-
-  cd src/include
-
-  install -d "${pkgdir}"/usr/include/{libpq,postgresql/internal/libpq}
-
-  # these headers are needed by the public headers of the interfaces
-  install -m 644 pg_config.h "${pkgdir}/usr/include"
-  install -m 644 pg_config_os.h "${pkgdir}/usr/include"
-  install -m 644 pg_config_ext.h "${pkgdir}/usr/include"
-  install -m 644 postgres_ext.h "${pkgdir}/usr/include"
-  install -m 644 libpq/libpq-fs.h "${pkgdir}/usr/include/libpq"
-  install -m 644 pg_config_manual.h "${pkgdir}/usr/include"
-
-  # these he aders are needed by the not-so-public headers of the interfaces
-  install -m 644 c.h "${pkgdir}/usr/include/postgresql/internal"
-  install -m 644 port.h "${pkgdir}/usr/include/postgresql/internal"
-  install -m 644 postgres_fe.h "${pkgdir}/usr/include/postgresql/internal"
-  install -m 644 libpq/pqcomm.h "${pkgdir}/usr/include/postgresql/internal/libpq"
+  depends=("krb5" "zlib")
+  provides=("${pkgbase%-*}-client" "${pkgname%-*}=$pkgver")
+  conflicts=("${pkgbase%-*}-client" "${pkgname%-*}")
+
+  # Install license
+  install -Dm644 "${srcdir}/${pkgbase%-*}-${pkgver}/COPYRIGHT" "${pkgdir}/usr/share/licenses/${pkgname}/COPYRIGHT"
+
+  # Install libs and non-server binaries
+  make -C "${srcdir}/${pkgbase%-*}-${pkgver}/src/interfaces" DESTDIR="${pkgdir}" install
+  make -C "${srcdir}/${pkgbase%-*}-${pkgver}/src/bin/pg_config" DESTDIR="${pkgdir}" install
+  make -C "${srcdir}/${pkgbase%-*}-${pkgver}/src/bin/pg_dump" DESTDIR="${pkgdir}" install
+  make -C "${srcdir}/${pkgbase%-*}-${pkgver}/src/bin/psql" DESTDIR="${pkgdir}" install
+  make -C "${srcdir}/${pkgbase%-*}-${pkgver}/src/bin/scripts" DESTDIR="${pkgdir}" install
+
+  install -Dm644 "${srcdir}/${pkgbase%-*}-${pkgver}/doc/src/sgml/man1/clusterdb.1" "${pkgdir}/usr/share/man/man1/clusterdb.1"
+  install -Dm644 "${srcdir}/${pkgbase%-*}-${pkgver}/doc/src/sgml/man1/createdb.1" "${pkgdir}/usr/share/man/man1/createdb.1"
+  install -Dm644 "${srcdir}/${pkgbase%-*}-${pkgver}/doc/src/sgml/man1/createuser.1" "${pkgdir}/usr/share/man/man1/createuser.1"
+  install -Dm644 "${srcdir}/${pkgbase%-*}-${pkgver}/doc/src/sgml/man1/dropdb.1" "${pkgdir}/usr/share/man/man1/dropdb.1"
+  install -Dm644 "${srcdir}/${pkgbase%-*}-${pkgver}/doc/src/sgml/man1/dropuser.1" "${pkgdir}/usr/share/man/man1/dropuser.1"
+  install -Dm644 "${srcdir}/${pkgbase%-*}-${pkgver}/doc/src/sgml/man1/pg_config.1" "${pkgdir}/usr/share/man/man1/pg_config.1"
+  install -Dm644 "${srcdir}/${pkgbase%-*}-${pkgver}/doc/src/sgml/man1/pg_dump.1" "${pkgdir}/usr/share/man/man1/pg_dump.1"
+  install -Dm644 "${srcdir}/${pkgbase%-*}-${pkgver}/doc/src/sgml/man1/pg_dumpall.1" "${pkgdir}/usr/share/man/man1/pg_dumpall.1"
+  install -Dm644 "${srcdir}/${pkgbase%-*}-${pkgver}/doc/src/sgml/man1/pg_isready.1" "${pkgdir}/usr/share/man/man1/pg_isready.1"
+  install -Dm644 "${srcdir}/${pkgbase%-*}-${pkgver}/doc/src/sgml/man1/pg_restore.1" "${pkgdir}/usr/share/man/man1/pg_restore.1"
+  install -Dm644 "${srcdir}/${pkgbase%-*}-${pkgver}/doc/src/sgml/man1/psql.1" "${pkgdir}/usr/share/man/man1/psql.1"
+  install -Dm644 "${srcdir}/${pkgbase%-*}-${pkgver}/doc/src/sgml/man1/reindexdb.1" "${pkgdir}/usr/share/man/man1/reindexdb.1"
+  install -Dm644 "${srcdir}/${pkgbase%-*}-${pkgver}/doc/src/sgml/man1/vacuumdb.1" "${pkgdir}/usr/share/man/man1/vacuumdb.1"
+
+  install -dm755 "${pkgdir}/usr/include/"{libpq,${pkgbase%-*}/internal/libpq}
+
+  # These headers are needed by the public headers of the interfaces
+  install -Dm644 "${srcdir}/${pkgbase%-*}-${pkgver}/src/include/pg_config.h" "${pkgdir}/usr/include"
+  install -Dm644 "${srcdir}/${pkgbase%-*}-${pkgver}/src/include/pg_config_os.h" "${pkgdir}/usr/include"
+  install -Dm644 "${srcdir}/${pkgbase%-*}-${pkgver}/src/include/pg_config_ext.h" "${pkgdir}/usr/include"
+  install -Dm644 "${srcdir}/${pkgbase%-*}-${pkgver}/src/include/postgres_ext.h" "${pkgdir}/usr/include"
+  install -Dm644 "${srcdir}/${pkgbase%-*}-${pkgver}/src/include/libpq/libpq-fs.h" "${pkgdir}/usr/include/libpq"
+  install -Dm644 "${srcdir}/${pkgbase%-*}-${pkgver}/src/include/pg_config_manual.h" "${pkgdir}/usr/include"
+
+  # These headers are needed by the not-so-public headers of the interfaces
+  install -Dm644 "${srcdir}/${pkgbase%-*}-${pkgver}/src/include/c.h" "${pkgdir}/usr/include/${pkgbase%-*}/internal"
+  install -Dm644 "${srcdir}/${pkgbase%-*}-${pkgver}/src/include/port.h" "${pkgdir}/usr/include/${pkgbase%-*}/internal"
+  install -Dm644 "${srcdir}/${pkgbase%-*}-${pkgver}/src/include/postgres_fe.h" "${pkgdir}/usr/include/${pkgbase%-*}/internal"
+  install -Dm644 "${srcdir}/${pkgbase%-*}-${pkgver}/src/include/libpq/pqcomm.h" "${pkgdir}/usr/include/${pkgbase%-*}/internal/libpq"
 }
 
 package_postgresql-docs-9.6() {
   pkgdesc="HTML documentation for PostgreSQL"
-  options=('docs')
-  provides=("postgresql-docs=$pkgver")
-  conflicts=('postgresql-docs')
-
-  cd postgresql-${pkgver}
+  arch=("any")
+  provides=("${pkgname%-*}=${pkgver}")
+  conflicts=("${pkgname%-*}")
+  options=(docs)
 
-  install -Dm 644 COPYRIGHT -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -Dm644 "${srcdir}/${pkgbase%-*}-${pkgver}/COPYRIGHT" "${pkgdir}/usr/share/licenses/${pkgname}/COPYRIGHT"
 
-  make -C doc/src/sgml DESTDIR="${pkgdir}" install-html
-  chown -R root:root "${pkgdir}/usr/share/doc/postgresql/html"
-
-  # clean up
-  rmdir "${pkgdir}"/usr/share/man/man{1,3,7}
-  rmdir "${pkgdir}"/usr/share/man
-}
+  make -C "${srcdir}/${pkgbase%-*}-${pkgver}/doc/src/sgml" DESTDIR="${pkgdir}" install-html
+  chown -R root:root "${pkgdir}/usr/share/doc/${pkgbase%-*}/html"
 
-package_postgresql-9.6() {
-  pkgdesc='Sophisticated object-relational DBMS'
-  backup=('etc/pam.d/postgresql' 'etc/logrotate.d/postgresql')
-  depends=("postgresql-libs>=${pkgver}" 'krb5' 'libxml2' 'readline>=6.0' 'openssl>=1.0.0' 'pam' 'icu' 'systemd-libs' 'libldap' 'llvm-libs')
-  optdepends=('python2: for PL/Python 2 support'
-              'python: for PL/Python 3 support'
-              'perl: for PL/Perl support'
-              'tcl: for PL/Tcl support'
-              'postgresql-old-upgrade: upgrade from previous major version using pg_upgrade')
-  provides=("postgresql=$pkgver")
-  conflicts=('postgresql')
-  options=('staticlibs')
-  install=postgresql.install
-
-  cd postgresql-${pkgver}
-
-  # install
-  make DESTDIR="${pkgdir}" install
-  make -C contrib DESTDIR="${pkgdir}" install
-  make -C doc/src/sgml DESTDIR="${pkgdir}" install-man
-
-  # we don't want these, they are in the -libs package
-  for dir in src/interfaces src/bin/pg_config src/bin/pg_dump src/bin/psql src/bin/scripts; do
-    make -C ${dir} DESTDIR="${pkgdir}" uninstall
-  done
-  for util in pg_config pg_dump pg_dumpall pg_restore psql \
-      clusterdb createdb createuser dropdb dropuser pg_isready reindexdb vacuumdb; do
-    rm "${pkgdir}"/usr/share/man/man1/${util}.1
-  done
-
-  install -Dm 644 COPYRIGHT -t "${pkgdir}/usr/share/licenses/${pkgname}"
-
-  cd "${srcdir}"
-  install -Dm 755 postgresql-check-db-dir -t "${pkgdir}/usr/bin"
-
-  install -Dm 644 postgresql.pam "${pkgdir}/etc/pam.d/postgresql"
-  install -Dm 644 postgresql.logrotate "${pkgdir}/etc/logrotate.d/postgresql"
-
-  install -Dm 644 postgresql.service -t "${pkgdir}/usr/lib/systemd/system"
-  install -Dm 644 postgresql.sysusers "${pkgdir}/usr/lib/sysusers.d/postgresql.conf"
-  install -Dm 644 postgresql.tmpfiles "${pkgdir}/usr/lib/tmpfiles.d/postgresql.conf"
-
-  # clean up unneeded installed items
-  rm -rf "${pkgdir}/usr/include/postgresql/internal"
-  rm -rf "${pkgdir}/usr/include/libpq"
-  find "${pkgdir}/usr/include" -maxdepth 1 -type f -execdir rm {} +
-  rmdir "${pkgdir}/usr/share/doc/postgresql/html"
+  # Clean up
+  rmdir "${pkgdir}/usr/share/man/man"{1,3,7}
+  rmdir "${pkgdir}/usr/share/man"
 }
-
-# vim: ts=2 sw=2 et:
diff --git a/postgresql-perl-rpath.patch b/postgresql-perl-rpath.patch
index c4c4fdad2898..42299cca1e36 100644
--- a/postgresql-perl-rpath.patch
+++ b/postgresql-perl-rpath.patch
@@ -1,7 +1,8 @@
-diff -Naur postgresql-9.1.5.orig/src/pl/plperl/GNUmakefile postgresql-9.1.5/src/pl/plperl/GNUmakefile
---- postgresql-9.1.5.orig/src/pl/plperl/GNUmakefile	2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/src/pl/plperl/GNUmakefile	2012-08-17 11:15:09.457116708 -0400
-@@ -43,6 +43,9 @@
+diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile
+index 0846e60..230a882 100644
+--- a/src/pl/plperl/GNUmakefile
++++ b/src/pl/plperl/GNUmakefile
+@@ -55,6 +55,9 @@ endif # win32
  
  SHLIB_LINK = $(perl_embed_ldflags)
  
diff --git a/postgresql-run-socket.patch b/postgresql-run-socket.patch
index b558c7b74961..4be1e31e0031 100644
--- a/postgresql-run-socket.patch
+++ b/postgresql-run-socket.patch
@@ -1,7 +1,8 @@
-diff -Naur postgresql-9.2.0.sockets/src/include/pg_config_manual.h postgresql-9.2.0/src/include/pg_config_manual.h
---- postgresql-9.2.0.sockets/src/include/pg_config_manual.h	2012-09-06 17:26:17.000000000 -0400
-+++ postgresql-9.2.0/src/include/pg_config_manual.h	2012-09-06 18:13:18.183092471 -0400
-@@ -144,7 +144,7 @@
+diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
+index 96885bb..8cee64e 100644
+--- a/src/include/pg_config_manual.h
++++ b/src/include/pg_config_manual.h
+@@ -182,7 +182,7 @@
   * here's where to twiddle it.  You can also override this at runtime
   * with the postmaster's -k switch.
   */
@@ -9,4 +10,4 @@ diff -Naur postgresql-9.2.0.sockets/src/include/pg_config_manual.h postgresql-9.
 +#define DEFAULT_PGSOCKET_DIR  "/run/postgresql"
  
  /*
-  * The random() function is expected to yield values between 0 and
+  * This is the default event source for Windows event log.