From f06a5b8dbf688c9fbcff24ba58bce921623b6d12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Thu, 7 Jul 2022 21:15:18 +0200 Subject: [PATCH] postgis: turn into meta package --- srcpkgs/postgis | 1 + srcpkgs/postgis-postgresql14/template | 8 ++++++- srcpkgs/postgis/template | 32 --------------------------- srcpkgs/postgis/update | 1 - 4 files changed, 8 insertions(+), 34 deletions(-) create mode 120000 srcpkgs/postgis delete mode 100644 srcpkgs/postgis/template delete mode 100644 srcpkgs/postgis/update diff --git a/srcpkgs/postgis b/srcpkgs/postgis new file mode 120000 index 00000000000..07d2a298867 --- /dev/null +++ b/srcpkgs/postgis @@ -0,0 +1 @@ +postgis-postgresql14 \ No newline at end of file diff --git a/srcpkgs/postgis-postgresql14/template b/srcpkgs/postgis-postgresql14/template index d65c09c09bc..a7540659ab5 100644 --- a/srcpkgs/postgis-postgresql14/template +++ b/srcpkgs/postgis-postgresql14/template @@ -1,7 +1,7 @@ # Template file for 'postgis-postgresql14' pkgname=postgis-postgresql14 version=3.2.1 -revision=1 +revision=2 wrksrc="postgis-${version}" build_style=gnu-configure configure_args=" @@ -31,3 +31,9 @@ pre_check() { # regression tests require running postgresql vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;' } + +postgis_package() { + build_style=meta + short_desc+=" (meta package)" + depends="postgis-postgresql14" +} diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template deleted file mode 100644 index 4f24c3b06fb..00000000000 --- a/srcpkgs/postgis/template +++ /dev/null @@ -1,32 +0,0 @@ -# Template file for 'postgis' -pkgname=postgis -version=3.2.1 -revision=1 -build_style=gnu-configure -configure_args="--with-projdir=${XBPS_CROSS_BASE}/usr - --with-projdir=${XBPS_CROSS_BASE}/usr - --with-jsondir=${XBPS_CROSS_BASE}/usr - --with-protobufdir=${XBPS_CROSS_BASE}/usr - --with-geosconfig=${XBPS_CROSS_BASE}/usr/bin/geos-config" -hostmakedepends="automake libtool perl which pkg-config geos libgdal-tools - postgresql9.6-libs-devel" -makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql9.6-libs-devel - proj-devel protobuf-c-devel pcre-devel json-c-devel" -checkdepends="libxslt CUnit-devel" -short_desc="Spatial database extender for PostgreSQL" -maintainer="Piotr Wójcik " -license="GPL-2.0-or-later" -homepage="https://postgis.net/" -changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS" -distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz" -checksum=fbab68dde6ca3934b24ba08c8ab0cff2594f57f93deab41a15c82ae1bb69893e -nocross="FIXME: Cannot run test program to determine PROJ version" - -pre_configure() { - ./autogen.sh -} - -pre_check() { - # regression tests require running postgresql - vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;' -} diff --git a/srcpkgs/postgis/update b/srcpkgs/postgis/update deleted file mode 100644 index 94cbff9125a..00000000000 --- a/srcpkgs/postgis/update +++ /dev/null @@ -1 +0,0 @@ -ignore="*alpha* *beta* *rc*"