Date: Thu, 12 Sep 2013 11:06:23 GMT From: Trevor Caira <trevor@bitba.se> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/182031: [patch] update postgis20 version and fix compatibility crash Message-ID: <201309121106.r8CB6N76077950@oldred.freebsd.org> Resent-Message-ID: <201309121110.r8CBA0QA049992@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 182031 >Category: ports >Synopsis: [patch] update postgis20 version and fix compatibility crash >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Sep 12 11:10:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Trevor Caira >Release: FreeBSD 9.2-RC3 >Organization: Bitbase LLC >Environment: System: FreeBSD tour 9.2-RC3 FreeBSD 9.2-RC3 #0 r254795: Sat Aug 24 20:25:04 UTC 2013 root@bake.isc.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Updated to latest version of the postgis 2.0.X series of releases. Backported the patch that fixes http://trac.osgeo.org/postgis/ticket/2010 so that this port works with the latest postgres (9.3). Added conflict with the new postgis 2.1 series. >How-To-Repeat: >Fix: Patch against r327016 of databases/postgis20 attached. Patch attached with submission follows: Index: Makefile =================================================================== --- Makefile (revision 327016) +++ Makefile (working copy) @@ -1,12 +1,12 @@ # $FreeBSD$ PORTNAME= postgis -PORTVERSION= 2.0.2 -PORTREVISION= 3 +PORTVERSION= 2.0.3 +PORTREVISION= 4 CATEGORIES= databases geography MASTER_SITES= http://download.osgeo.org/postgis/source/ -MAINTAINER= matt.trisoline@intermedix.com +MAINTAINER= trevor@bitba.se COMMENT= Adds support for geographic objects to PostgreSQL databases LIB_DEPENDS= proj:${PORTSDIR}/graphics/proj \ @@ -14,7 +14,7 @@ json:${PORTSDIR}/devel/json-c RUN_DEPENDS= postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server -CONFLICTS= postgis-1.* +CONFLICTS= postgis-1.* postgis-2.1.* LATEST_LINK= postgis20 USE_GNOME= libxml2 @@ -25,6 +25,8 @@ GNU_CONFIGURE= yes USE_PERL5_BUILD= yes +PLIST_SUB+= PORTVERSION=${PORTVERSION} + OPTIONS_DEFINE= LOADERGUI RASTER TOPOLOGY OPTIONS_DEFAULT= TOPOLOGY Index: distinfo =================================================================== --- distinfo (revision 327016) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (postgis-2.0.2.tar.gz) = 57746d040080e624f3e81633a180d8a5fc16b0c035d94fe2c16306023ab1c391 -SIZE (postgis-2.0.2.tar.gz) = 5573652 +SHA256 (postgis-2.0.3.tar.gz) = 7f865a6fdf19afed7d2f3e7178cd504f7254a9e96f2ce6a07d0ea19edc1668a0 +SIZE (postgis-2.0.3.tar.gz) = 5581619 Index: files/patch-postgis-geometry__estimate.c =================================================================== --- files/patch-postgis-geometry__estimate.c (revision 0) +++ files/patch-postgis-geometry__estimate.c (working copy) @@ -0,0 +1,14 @@ +--- postgis/geometry_estimate.c.orig 2012-11-20 14:07:43.000000000 -0500 ++++ postgis/geometry_estimate.c 2013-09-06 13:14:13.280967302 -0400 +@@ -24,6 +24,11 @@ + #include "utils/rel.h" + + #include "../postgis_config.h" ++ ++#if POSTGIS_PGSQL_VERSION >= 93 ++ #include "access/htup_details.h" ++#endif ++ + #include "liblwgeom.h" + #include "lwgeom_pg.h" /* For debugging macros. */ + #include "gserialized_gist.h" /* For index common functions */ Property changes on: files/patch-postgis-geometry__estimate.c ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: pkg-plist =================================================================== --- pkg-plist (revision 327016) +++ pkg-plist (working copy) @@ -5,7 +5,7 @@ include/liblwgeom.h lib/postgresql/postgis-2.0.so %%RASTER%%lib/postgresql/rtpostgis-2.0.so -lib/liblwgeom-2.0.2.so +lib/liblwgeom-%%PORTVERSION%%.so lib/liblwgeom.a lib/liblwgeom.la lib/liblwgeom.so @@ -89,39 +89,40 @@ %%TOPOLOGY%%share/postgresql/contrib/postgis-2.0/uninstall_topology.sql share/postgresql/contrib/postgis-2.0/postgis_restore.pl %%RASTER%%share/postgresql/extension/postgis.control -%%RASTER%%share/postgresql/extension/postgis--2.0.0alpha3--2.0.2.sql -%%RASTER%%share/postgresql/extension/postgis--2.0.0alpha4--2.0.2.sql -%%RASTER%%share/postgresql/extension/postgis--2.0.1--2.0.2.sql -%%RASTER%%share/postgresql/extension/postgis--2.0.0alpha5--2.0.2.sql -%%RASTER%%share/postgresql/extension/postgis--2.0.0beta3--2.0.2.sql -%%RASTER%%share/postgresql/extension/postgis--2.0.0beta4--2.0.2.sql -%%RASTER%%share/postgresql/extension/postgis--2.0.0rc2--2.0.2.sql -%%RASTER%%share/postgresql/extension/postgis--2.0.0alpha6--2.0.2.sql -%%RASTER%%share/postgresql/extension/postgis--2.0.2.sql -%%RASTER%%share/postgresql/extension/postgis--2.0.0alpha1--2.0.2.sql -%%RASTER%%share/postgresql/extension/postgis--unpackaged--2.0.2.sql -%%RASTER%%share/postgresql/extension/postgis--2.0.0beta1--2.0.2.sql -%%RASTER%%share/postgresql/extension/postgis--2.0.0--2.0.2.sql -%%RASTER%%share/postgresql/extension/postgis--2.0.0beta2--2.0.2.sql -%%RASTER%%share/postgresql/extension/postgis--2.0.0rc1--2.0.2.sql -%%RASTER%%share/postgresql/extension/postgis--2.0.0alpha2--2.0.2.sql -%%RASTER%%share/postgresql/extension/postgis_topology.control -%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0beta4--2.0.2.sql -%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0alpha6--2.0.2.sql -%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0alpha1--2.0.2.sql -%%RASTER%%share/postgresql/extension/postgis_topology--unpackaged--2.0.2.sql -%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0beta2--2.0.2.sql -%%RASTER%%share/postgresql/extension/postgis_topology--2.0.2.sql -%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0beta1--2.0.2.sql -%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0--2.0.2.sql -%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0rc1--2.0.2.sql -%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0alpha2--2.0.2.sql -%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0alpha3--2.0.2.sql -%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0alpha4--2.0.2.sql -%%RASTER%%share/postgresql/extension/postgis_topology--2.0.1--2.0.2.sql -%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0rc2--2.0.2.sql -%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0alpha5--2.0.2.sql -%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0beta3--2.0.2.sql +%%RASTER%%share/postgresql/extension/postgis--2.0.0alpha3--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis--2.0.0alpha4--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis--2.0.0--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis--2.0.0alpha1--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis--2.0.2--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis--2.0.0beta2--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis--2.0.0alpha6--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis--2.0.0rc2--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis--2.0.0beta3--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis--2.0.0beta4--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis--2.0.1--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis--2.0.0beta1--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis--2.0.0alpha5--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis--2.0.0rc1--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis--2.0.0alpha2--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis--unpackaged--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0alpha1--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0alpha2--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0alpha3--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0alpha4--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0alpha5--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0alpha6--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0beta1--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0beta2--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0beta3--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0beta4--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0rc1--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0rc2--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis_topology--2.0.1--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis_topology--2.0.2--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%.sql +%%RASTER%%share/postgresql/extension/postgis_topology--unpackaged--%%PORTVERSION%%.sql @dirrm share/postgresql/contrib/postgis-2.0 @dirrmtry share/postgresql/contrib @dirrm share/postgis/tiger_2010/legacy_import/tiger2008 >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309121106.r8CB6N76077950>