From 4ad594f67d2e46715fff1b67c4aa392eeeb342a7 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Fri, 9 Dec 2016 12:57:26 +0000 Subject: - Use WANT_PGSQL instead of hard-coded RUN_DEPENDS - Fix PLIST - Bump PORTREVISION for package change Note that postgresql-client was already brought in via USES=pgsql. Therefore the equivalent WANT_PGSQL is "lib server". Approved by: portmgr (blanket) --- databases/postgis21/Makefile | 4 ++-- databases/postgis21/pkg-plist | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'databases') diff --git a/databases/postgis21/Makefile b/databases/postgis21/Makefile index 0ad400326381..d640d4b23f1e 100644 --- a/databases/postgis21/Makefile +++ b/databases/postgis21/Makefile @@ -2,7 +2,7 @@ PORTNAME= postgis PORTVERSION= 2.1.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases geography MASTER_SITES= http://download.osgeo.org/postgis/source/ @@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libproj.so:graphics/proj \ libgeos.so:graphics/geos \ libjson-c.so:devel/json-c -RUN_DEPENDS= postmaster:databases/postgresql${PGSQL_VER_NODOT}-server CONFLICTS= postgis20-2.0.* postgis22-* @@ -26,6 +25,7 @@ SHEBANG_FILES= utils/postgis_restore.pl.in USE_GNOME= libxml2 USE_LDCONFIG= yes USE_PERL5= build +WANT_PGSQL= lib server OPTIONS_DEFINE= LOADERGUI RASTER TOPOLOGY SFCGAL OPTIONS_DEFAULT= TOPOLOGY diff --git a/databases/postgis21/pkg-plist b/databases/postgis21/pkg-plist index 78a1b2323843..cf0fc1c5fb47 100644 --- a/databases/postgis21/pkg-plist +++ b/databases/postgis21/pkg-plist @@ -105,6 +105,7 @@ share/postgresql/contrib/postgis-2.1/uninstall_sfcgal.sql %%RASTER%%share/postgresql/extension/postgis--2.0.3--%%PORTVERSION%%.sql %%RASTER%%share/postgresql/extension/postgis--2.0.4--%%PORTVERSION%%.sql %%RASTER%%share/postgresql/extension/postgis--2.0.5--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis--2.0.6--%%PORTVERSION%%.sql %%RASTER%%share/postgresql/extension/postgis--2.1.0--%%PORTVERSION%%.sql %%RASTER%%share/postgresql/extension/postgis--2.1.1--%%PORTVERSION%%.sql %%RASTER%%share/postgresql/extension/postgis--2.1.2--%%PORTVERSION%%.sql @@ -126,6 +127,7 @@ share/postgresql/contrib/postgis-2.1/uninstall_sfcgal.sql %%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.0.3--%%PORTVERSION%%.sql %%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.0.4--%%PORTVERSION%%.sql %%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.0.5--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.0.6--%%PORTVERSION%%.sql %%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.1.0--%%PORTVERSION%%.sql %%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.1.1--%%PORTVERSION%%.sql %%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.1.2--%%PORTVERSION%%.sql @@ -147,6 +149,7 @@ share/postgresql/contrib/postgis-2.1/uninstall_sfcgal.sql %%RASTER%%share/postgresql/extension/postgis_topology--2.0.3--%%PORTVERSION%%.sql %%RASTER%%share/postgresql/extension/postgis_topology--2.0.4--%%PORTVERSION%%.sql %%RASTER%%share/postgresql/extension/postgis_topology--2.0.5--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis_topology--2.0.6--%%PORTVERSION%%.sql %%RASTER%%share/postgresql/extension/postgis_topology--2.1.0--%%PORTVERSION%%.sql %%RASTER%%share/postgresql/extension/postgis_topology--2.1.1--%%PORTVERSION%%.sql %%RASTER%%share/postgresql/extension/postgis_topology--2.1.2--%%PORTVERSION%%.sql -- cgit