Attachment 136742 Details for Bug 182031 – file.diff

[patch] file.diff

file.diff (text/plain), 8.15 KB, created by Trevor Caira on 2013-09-12 12:10:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Trevor Caira

Created: 2013-09-12 12:10:00 UTC

Size: 8.15 KB

patch

obsolete

>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

Actions: View | Diff

Attachments on bug 182031: 136742