diff --git a/packages/postgresql/build.sh b/packages/postgresql/build.sh index c82bba93a..8717be47c 100644 --- a/packages/postgresql/build.sh +++ b/packages/postgresql/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.postgresql.org TERMUX_PKG_DESCRIPTION="Object-relational SQL database" TERMUX_PKG_MAINTAINER='Vishal Biswas @vishalbiswas' TERMUX_PKG_VERSION=10.3 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=6ea268780ee35e88c65cdb0af7955ad90b7d0ef34573867f223f14e43467931a TERMUX_PKG_SRCURL=https://ftp.postgresql.org/pub/source/v$TERMUX_PKG_VERSION/postgresql-$TERMUX_PKG_VERSION.tar.bz2 TERMUX_PKG_DEPENDS="openssl, libcrypt, readline, libandroid-shmem" @@ -23,6 +23,8 @@ ZIC=$TERMUX_PKG_HOSTBUILD_DIR/src/timezone/zic TERMUX_PKG_EXTRA_MAKE_ARGS=" -s" TERMUX_PKG_RM_AFTER_INSTALL="lib/libecpg* bin/ecpg share/man/man1/ecpg.1" TERMUX_PKG_HOSTBUILD=yes +TERMUX_PKG_BREAKS="postgresql-contrib (<= 10.3-1)" +TERMUX_PKG_REPLACES="postgresql-contrib (<= 10.3-1)" termux_step_host_build() { # Build a native zic binary which we have patched to @@ -35,7 +37,6 @@ termux_step_post_make_install() { # Man pages are not installed by default: make -C doc/src/sgml install-man - # Sync with postgresql-contrib.subpackage.sh: for contrib in \ hstore \ pageinspect \ diff --git a/packages/postgresql/postgresql-contrib.subpackage.sh b/packages/postgresql/postgresql-contrib.subpackage.sh deleted file mode 100644 index c1ff281ce..000000000 --- a/packages/postgresql/postgresql-contrib.subpackage.sh +++ /dev/null @@ -1,9 +0,0 @@ -TERMUX_SUBPKG_INCLUDE=" -lib/postgresql/fuzzystrmatch.so -lib/postgresql/hstore.so -lib/postgresql/pgcrypto.so -lib/postgresql/pg_stat_statements.so -share/postgresql/extension/ -" -TERMUX_SUBPKG_DESCRIPTION="Additional facilities for PostgreSQL" -TERMUX_SUBPKG_DEPENDS="postgresql"