main/postgresql-bdr: upgrade to 9.4.14_p1

Use libpq from mainline

1 files changed, 7 insertions, 5 deletions

diff --git a/main/postgresql-bdr/APKBUILD b/main/postgresql-bdr/APKBUILD
index c0faeecd6b..5ee1873fc8 100644
--- a/main/postgresql-bdr/APKBUILD
+++ b/main/postgresql-bdr/APKBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=postgresql-bdr
-pkgver=9.4.10_p1
+pkgver=9.4.14_p1
 _pkgver=${pkgver/_p/_bdr}
-pkgrel=6
+pkgrel=0
 pkgdesc="A sophisticated object-relational DBMS with bidirectional replication support (BDR)"
 url="https://wiki.postgresql.org/wiki/BDR_Administration"
 arch="all"
 license="PostgreSQL"
-depends="bash"
+depends="bash libpq"
 install="$pkgname.pre-upgrade"
 depends_dev="readline-dev libressl-dev zlib-dev libxml2-dev"
 makedepends="$depends_dev perl bison flex-dev"
@@ -77,6 +77,8 @@ package() {
                 "$pkgdir"/etc/init.d/pgbdr-restore
         install -D -m644 "$srcdir"/pgbdr-restore.confd \
                 "$pkgdir"/etc/conf.d/pgbdr-restore
+        # conflicts with libpq mainline
+        rm "$pkgdir"/usr/lib/libpq.so*
 }
 
 client() {
@@ -84,7 +86,7 @@ client() {
         provides="postgresql-client=$pkgname-$pkgver"
 
         mkdir -p "$subpkgdir"/usr/lib "$subpkgdir"/usr/bin
-        mv "$pkgdir"/usr/lib/libpq.so* "$subpkgdir"/usr/lib
+        # mv "$pkgdir"/usr/lib/libpq.so* "$subpkgdir"/usr/lib
         mv "$pkgdir"/usr/bin/clusterdb \
                 "$pkgdir"/usr/bin/createdb \
                 "$pkgdir"/usr/bin/createuser \
@@ -110,7 +112,7 @@ contrib() {
         make DESTDIR="$subpkgdir" FLEX="/usr/bin/flex" -C contrib install
 }
 
-sha512sums="85bba9c7bec128d597b95fa7bfaabe42b3fea691a86f08307c6f9b254863a30448465191516baffe4851f7ea9b03b28fa7e2544e357de674ba54f0d84716b05b  postgresql-bdr-9.4.10_bdr1.tar.bz2
+sha512sums="cd8fec782c201270270d4abfa59296083889bf22f63b4e18f758e8262ee52deeae247d813a3e8633861819d803cb369157854de446affdde65c1e12477bbc0b8  postgresql-bdr-9.4.14_bdr1.tar.bz2
 6f7fdceb1a5aba3f00894ae88afdf25e5f9c7a0ffc00b11211011a6415ea73639d6a67f516cab66c6487484bab26ded3c93471d6d41ac0d3822926c22274f2ba  initdb.patch
 1973863bfc208ce20ca2dd82557ebbd4fcddd1219d6a80f2e83550d0110d39f034cb829cca3ee9208f513a24b032267b94559c740ddddb10a4f24c630194eb5e  postgresql-bdr-osxflags.patch
 85b863cfcae1db37ee914721fc9eb7e85ab90a77a65879bccb0bbf34eb044329425fae0411baff1d769a700ca63b4ab4040d145ca90e2d3728c3a74e61d9b4ff  postgresql-bdr.initd