Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 19 Dec 2017 16:49:23 +0000 (UTC)
From:      Rodrigo Osorio <rodrigo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r456739 - head/databases/postgis24
Message-ID:  <201712191649.vBJGnN72006618@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rodrigo
Date: Tue Dec 19 16:49:23 2017
New Revision: 456739
URL: https://svnweb.freebsd.org/changeset/ports/456739

Log:
  Add port databases/postgis24 by repo copy from databases/postgis23
  
  See https://svn.osgeo.org/postgis/tags/2.4.2/NEWS for new features in 2.4
  branch, bugfixes and enhancements
  
  PR:		222703
  Submitted by:	lbartoletti@tuxfamily.org
  Reviewed by:	sunpoet

Added:
  head/databases/postgis24/
  head/databases/postgis24/Makefile
     - copied, changed from r456733, head/databases/postgis23/Makefile
  head/databases/postgis24/distinfo
     - copied, changed from r456733, head/databases/postgis23/distinfo
  head/databases/postgis24/pkg-descr
     - copied unchanged from r456733, head/databases/postgis23/pkg-descr
  head/databases/postgis24/pkg-install
     - copied unchanged from r456733, head/databases/postgis23/pkg-install
  head/databases/postgis24/pkg-plist
     - copied, changed from r456733, head/databases/postgis23/pkg-plist

Copied and modified: head/databases/postgis24/Makefile (from r456733, head/databases/postgis23/Makefile)
==============================================================================
--- head/databases/postgis23/Makefile	Tue Dec 19 16:07:01 2017	(r456733, copy source)
+++ head/databases/postgis24/Makefile	Tue Dec 19 16:49:23 2017	(r456739)
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	postgis
-PORTVERSION=	2.3.5
+PORTVERSION=	2.4.2
 CATEGORIES=	databases geography
 MASTER_SITES=	http://download.osgeo.org/postgis/source/
-PKGNAMESUFFIX=	23
+PKGNAMESUFFIX=	24
 
 MAINTAINER=	lbartoletti@tuxfamily.org
 COMMENT=	Geographic objects support for PostgreSQL databases
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libproj.so:graphics/proj \
 		libgeos.so:graphics/geos \
 		libjson-c.so:devel/json-c
 
-CONFLICTS=	postgis20  postgis21 postgis22 postgis24 postgis
+CONFLICTS_INSTALL=	postgis20  postgis21 postgis22 postgis23 postgis
 
 USES=		gettext gmake iconv:wchar_t libtool:keepla perl5 pgsql pkgconfig shebangfix
 GNU_CONFIGURE=	yes
@@ -64,17 +64,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
-post-patch:
-	@${GREP} -lR 'bin/bash' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e "s|/bin/bash|/bin/sh|"
-	@${GREP} -lR '/usr/bin/psql' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
-		-e "s|/usr/bin/psql|${LOCALBASE}/bin/pgsql|"
-	@${GREP} -lR '/usr/lib/postgresql/9.4/bin/psql' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
-		-e "s|/usr/lib/postgresql/9.4/bin/psql|${LOCALBASE}/bin/pgsql|"
-	@${GREP} -lR '/usr/share/postgresql/contrib' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
-		-e "s|/usr/share/postgresql/contrib|${LOCALBASE}/share/postgresql/contrib|"
-	@${GREP} -lR '/usr/share/postgresql/9.4/contrib' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
-		-e "s|/usr/share/postgresql/9.4/contrib|${LOCALBASE}/share/postgresql/contrib/postgis-2.3|"
-
 pre-configure:
 	@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 
@@ -90,17 +79,17 @@ post-install:
 .else
 	${RM} ${STAGEDIR}${PREFIX}/bin/shp2pgsql-gui
 .endif
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liblwgeom-2.3.so.0.0.0
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/postgis-2.3.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liblwgeom-2.4.so.0.0.0
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/postgis-2.4.so
 .if ${PORT_OPTIONS:MTOPOLOGY}
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/postgis_topology-2.3.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/postgis_topology-2.4.so
 .endif
 .if ${PORT_OPTIONS:MRASTER}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/raster2pgsql
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/rtpostgis-2.3.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/rtpostgis-2.4.so
 .endif
 .if ${PORT_OPTIONS:MADDRSTD}
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/address_standardizer-2.3.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/address_standardizer-2.4.so
 .endif
 
 .include <bsd.port.post.mk>

Copied and modified: head/databases/postgis24/distinfo (from r456733, head/databases/postgis23/distinfo)
==============================================================================
--- head/databases/postgis23/distinfo	Tue Dec 19 16:07:01 2017	(r456733, copy source)
+++ head/databases/postgis24/distinfo	Tue Dec 19 16:49:23 2017	(r456739)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1510810454
-SHA256 (postgis-2.3.5.tar.gz) = a7a13dae1a3642f1f9f9c1a9a146c45565418fd582b72b6ac93ab8a6a9763ac9
-SIZE (postgis-2.3.5.tar.gz) = 11233875
+TIMESTAMP = 1512453028
+SHA256 (postgis-2.4.2.tar.gz) = 23625bc99ed440d53a20225721095a3f5c653b62421c4d597c8038f0d7a321d9
+SIZE (postgis-2.4.2.tar.gz) = 12470881

Copied: head/databases/postgis24/pkg-descr (from r456733, head/databases/postgis23/pkg-descr)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/postgis24/pkg-descr	Tue Dec 19 16:49:23 2017	(r456739, copy of r456733, head/databases/postgis23/pkg-descr)
@@ -0,0 +1,15 @@
+PostGIS adds support for geographic objects to the PostgreSQL
+object-relational database. In effect, PostGIS "spatially enables"
+the PostgreSQL server, allowing it to be used as a backend spatial
+database for geographic information systems (GIS), much like ESRI's
+SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS
+"Simple Features Specification for SQL" and has been certified as
+compliant with the "Types and Functions" profile.
+
+PostGIS development was started by Refractions Research as a project
+in open source spatial database technology. PostGIS is released
+under the GNU General Public License. PostGIS continues to be
+developed by a group of contributors led by a Project Steering
+Committee and new features continue to be added.
+
+WWW: http://postgis.net/

Copied: head/databases/postgis24/pkg-install (from r456733, head/databases/postgis23/pkg-install)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/postgis24/pkg-install	Tue Dec 19 16:49:23 2017	(r456739, copy of r456733, head/databases/postgis23/pkg-install)
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+msg(){
+ echo "
+  ======================= GEOS Support Notice ========================
+  In order to use the GEOS support, you may need to specially compile
+  your version of PostgreSQL to link the C++ runtime library.
+  To do this, invoke the PostgreSQL Makefile script this way:
+
+  on csh shell:
+
+  setenv LDFLAGS -lstdc++
+  make
+
+  on sh or bash shell:
+
+  export LDFLAGS=-lstdc++
+  make
+
+  The initial LDFLAGS variable is passed through to the Makefile and
+  adds the C++ library to the linking stage.
+
+  ====================================================================
+"
+if [ -n "${PACKAGE_BUILDING}" ]; then
+    sleep 10
+fi
+
+
+}
+
+case "$2" in
+    PRE-INSTALL)
+        msg ;;
+    MESSAGE)
+        msg ;;
+esac

Copied and modified: head/databases/postgis24/pkg-plist (from r456733, head/databases/postgis23/pkg-plist)
==============================================================================
--- head/databases/postgis23/pkg-plist	Tue Dec 19 16:07:01 2017	(r456733, copy source)
+++ head/databases/postgis24/pkg-plist	Tue Dec 19 16:49:23 2017	(r456739)
@@ -4,15 +4,15 @@ bin/shp2pgsql
 %%LOADERGUI%%bin/shp2pgsql-gui
 include/liblwgeom.h
 include/liblwgeom_topo.h
-lib/liblwgeom-2.3.so.0
-lib/liblwgeom-2.3.so.0.0.0
+lib/liblwgeom-2.4.so.0
+lib/liblwgeom-2.4.so.0.0.0
 lib/liblwgeom.a
 lib/liblwgeom.la
 lib/liblwgeom.so
-%%ADDRSTD%%lib/postgresql/address_standardizer-2.3.so
-lib/postgresql/postgis-2.3.so
-%%TOPOLOGY%%lib/postgresql/postgis_topology-2.3.so
-%%RASTER%%lib/postgresql/rtpostgis-2.3.so
+%%ADDRSTD%%lib/postgresql/address_standardizer-2.4.so
+lib/postgresql/postgis-2.4.so
+%%TOPOLOGY%%lib/postgresql/postgis_topology-2.4.so
+%%RASTER%%lib/postgresql/rtpostgis-2.4.so
 %%ADDRSTD%%share/doc/postgresql/extension/README.address_standardizer
 %%DATADIR%%/tiger_geocoder/README
 %%DATADIR%%/tiger_geocoder/create_geocode.bat
@@ -61,6 +61,7 @@ lib/postgresql/postgis-2.3.so
 %%DATADIR%%/tiger_geocoder/tiger_loader_2014.sql
 %%DATADIR%%/tiger_geocoder/tiger_loader_2015.sql
 %%DATADIR%%/tiger_geocoder/tiger_loader_2016.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2017.sql
 %%DATADIR%%/tiger_geocoder/topology/README
 %%DATADIR%%/tiger_geocoder/topology/tiger_topology_loader.sql
 %%DATADIR%%/tiger_geocoder/upgrade_geocode.sql
@@ -88,35 +89,35 @@ lib/postgresql/postgis-2.3.so
 %%DATADIR%%/utils/test_geography_joinestimation.pl
 %%DATADIR%%/utils/test_joinestimation.pl
 %%LOADERGUI%%share/postgresql/applications/shp2pgsql-gui.desktop
-share/postgresql/contrib/postgis-2.3/legacy.sql
-share/postgresql/contrib/postgis-2.3/legacy_gist.sql
-share/postgresql/contrib/postgis-2.3/legacy_minimal.sql
-share/postgresql/contrib/postgis-2.3/postgis.sql
-share/postgresql/contrib/postgis-2.3/postgis_comments.sql
-share/postgresql/contrib/postgis-2.3/postgis_for_extension.sql
-share/postgresql/contrib/postgis-2.3/postgis_proc_set_search_path.sql
-share/postgresql/contrib/postgis-2.3/postgis_restore.pl
-share/postgresql/contrib/postgis-2.3/postgis_upgrade.sql
-share/postgresql/contrib/postgis-2.3/postgis_upgrade_for_extension.sql
-%%RASTER%%share/postgresql/contrib/postgis-2.3/raster_comments.sql
-%%RASTER%%share/postgresql/contrib/postgis-2.3/rtpostgis.sql
-%%RASTER%%share/postgresql/contrib/postgis-2.3/rtpostgis_for_extension.sql
-%%RASTER%%share/postgresql/contrib/postgis-2.3/rtpostgis_legacy.sql
-%%RASTER%%share/postgresql/contrib/postgis-2.3/rtpostgis_proc_set_search_path.sql
-%%RASTER%%share/postgresql/contrib/postgis-2.3/rtpostgis_upgrade.sql
-%%RASTER%%share/postgresql/contrib/postgis-2.3/rtpostgis_upgrade_for_extension.sql
-%%SFCGAL%%share/postgresql/contrib/postgis-2.3/sfcgal.sql
-%%SFCGAL%%share/postgresql/contrib/postgis-2.3/sfcgal_comments.sql
-%%SFCGAL%%share/postgresql/contrib/postgis-2.3/sfcgal_upgrade.sql
-share/postgresql/contrib/postgis-2.3/spatial_ref_sys.sql
-%%TOPOLOGY%%share/postgresql/contrib/postgis-2.3/topology.sql
-%%TOPOLOGY%%share/postgresql/contrib/postgis-2.3/topology_comments.sql
-%%TOPOLOGY%%share/postgresql/contrib/postgis-2.3/topology_upgrade.sql
-share/postgresql/contrib/postgis-2.3/uninstall_legacy.sql
-share/postgresql/contrib/postgis-2.3/uninstall_postgis.sql
-%%RASTER%%share/postgresql/contrib/postgis-2.3/uninstall_rtpostgis.sql
-%%SFCGAL%%share/postgresql/contrib/postgis-2.3/uninstall_sfcgal.sql
-%%TOPOLOGY%%share/postgresql/contrib/postgis-2.3/uninstall_topology.sql
+share/postgresql/contrib/postgis-2.4/legacy.sql
+share/postgresql/contrib/postgis-2.4/legacy_gist.sql
+share/postgresql/contrib/postgis-2.4/legacy_minimal.sql
+share/postgresql/contrib/postgis-2.4/postgis.sql
+share/postgresql/contrib/postgis-2.4/postgis_comments.sql
+share/postgresql/contrib/postgis-2.4/postgis_for_extension.sql
+share/postgresql/contrib/postgis-2.4/postgis_proc_set_search_path.sql
+share/postgresql/contrib/postgis-2.4/postgis_restore.pl
+share/postgresql/contrib/postgis-2.4/postgis_upgrade.sql
+share/postgresql/contrib/postgis-2.4/postgis_upgrade_for_extension.sql
+%%RASTER%%share/postgresql/contrib/postgis-2.4/raster_comments.sql
+%%RASTER%%share/postgresql/contrib/postgis-2.4/rtpostgis.sql
+%%RASTER%%share/postgresql/contrib/postgis-2.4/rtpostgis_for_extension.sql
+%%RASTER%%share/postgresql/contrib/postgis-2.4/rtpostgis_legacy.sql
+%%RASTER%%share/postgresql/contrib/postgis-2.4/rtpostgis_proc_set_search_path.sql
+%%RASTER%%share/postgresql/contrib/postgis-2.4/rtpostgis_upgrade.sql
+%%RASTER%%share/postgresql/contrib/postgis-2.4/rtpostgis_upgrade_for_extension.sql
+%%SFCGAL%%share/postgresql/contrib/postgis-2.4/sfcgal.sql
+%%SFCGAL%%share/postgresql/contrib/postgis-2.4/sfcgal_comments.sql
+%%SFCGAL%%share/postgresql/contrib/postgis-2.4/sfcgal_upgrade.sql
+share/postgresql/contrib/postgis-2.4/spatial_ref_sys.sql
+%%TOPOLOGY%%share/postgresql/contrib/postgis-2.4/topology.sql
+%%TOPOLOGY%%share/postgresql/contrib/postgis-2.4/topology_comments.sql
+%%TOPOLOGY%%share/postgresql/contrib/postgis-2.4/topology_upgrade.sql
+share/postgresql/contrib/postgis-2.4/uninstall_legacy.sql
+share/postgresql/contrib/postgis-2.4/uninstall_postgis.sql
+%%RASTER%%share/postgresql/contrib/postgis-2.4/uninstall_rtpostgis.sql
+%%SFCGAL%%share/postgresql/contrib/postgis-2.4/uninstall_sfcgal.sql
+%%TOPOLOGY%%share/postgresql/contrib/postgis-2.4/uninstall_topology.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--1.0--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%--%%PORTVERSION%%next.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%.sql
@@ -158,8 +159,12 @@ share/postgresql/contrib/postgis-2.3/uninstall_postgis
 %%RASTER%%share/postgresql/extension/postgis--2.3.2--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis--2.3.3--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis--2.3.4--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis--2.3.5--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis--2.4.0--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis--2.4.1--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis--%%PORTVERSION%%--%%PORTVERSION%%next.sql
 %%RASTER%%share/postgresql/extension/postgis--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis--%%PORTVERSION%%dev--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis--%%PORTVERSION%%next--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis--unpackaged--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis.control
@@ -193,8 +198,12 @@ share/postgresql/contrib/postgis-2.3/uninstall_postgis
 %%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.2--%%PORTVERSION%%.sql
 %%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.3--%%PORTVERSION%%.sql
 %%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.4--%%PORTVERSION%%.sql
+%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.5--%%PORTVERSION%%.sql
+%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.0--%%PORTVERSION%%.sql
+%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.1--%%PORTVERSION%%.sql
 %%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%--%%PORTVERSION%%next.sql
 %%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%.sql
+%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%dev--%%PORTVERSION%%.sql
 %%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%next--%%PORTVERSION%%.sql
 %%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--unpackaged--%%PORTVERSION%%.sql
 %%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal.control
@@ -228,8 +237,12 @@ share/postgresql/contrib/postgis-2.3/uninstall_postgis
 %%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.3.2--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.3.3--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.3.4--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.3.5--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.4.0--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.4.1--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%--%%PORTVERSION%%next.sql
 %%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%dev--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%next--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--unpackaged--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_tiger_geocoder.control
@@ -264,8 +277,12 @@ share/postgresql/contrib/postgis-2.3/uninstall_postgis
 %%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.2--%%PORTVERSION%%.sql
 %%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.3--%%PORTVERSION%%.sql
 %%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.4--%%PORTVERSION%%.sql
+%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.5--%%PORTVERSION%%.sql
+%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.0--%%PORTVERSION%%.sql
+%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.1--%%PORTVERSION%%.sql
 %%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%--%%PORTVERSION%%next.sql
 %%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%.sql
+%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%dev--%%PORTVERSION%%.sql
 %%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%next--%%PORTVERSION%%.sql
 %%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--unpackaged--%%PORTVERSION%%.sql
 %%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology.control



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712191649.vBJGnN72006618>