Attachment #136742 for bug #182031

View | Details | Raw Unified | Return to bug 182031
Collapse All | Expand All

Lines 1-12 Link Here

(-)Makefile (-4 / +6 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= postgis	3	PORTNAME= postgis
4	PORTVERSION= 2.0.2	4	PORTVERSION= 2.0.3
5	PORTREVISION= 3	5	PORTREVISION= 4
6	CATEGORIES= databases geography	6	CATEGORIES= databases geography
7	MASTER_SITES= http://download.osgeo.org/postgis/source/	7	MASTER_SITES= http://download.osgeo.org/postgis/source/
8		8
9	MAINTAINER= matt.trisoline@intermedix.com	9	MAINTAINER= trevor@bitba.se
10	COMMENT= Adds support for geographic objects to PostgreSQL databases	10	COMMENT= Adds support for geographic objects to PostgreSQL databases
11		11
12	LIB_DEPENDS= proj:${PORTSDIR}/graphics/proj \	12	LIB_DEPENDS= proj:${PORTSDIR}/graphics/proj \
Lines 14-20 Link Here
14	json:${PORTSDIR}/devel/json-c	14	json:${PORTSDIR}/devel/json-c
15	RUN_DEPENDS= postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server	15	RUN_DEPENDS= postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
16		16
17	CONFLICTS= postgis-1.*	17	CONFLICTS= postgis-1.* postgis-2.1.*
18	LATEST_LINK= postgis20	18	LATEST_LINK= postgis20
19		19
20	USE_GNOME= libxml2	20	USE_GNOME= libxml2
Lines 25-30 Link Here
25	GNU_CONFIGURE= yes	25	GNU_CONFIGURE= yes
26	USE_PERL5_BUILD= yes	26	USE_PERL5_BUILD= yes
27		27
		28	PLIST_SUB+= PORTVERSION=${PORTVERSION}
		29
28	OPTIONS_DEFINE= LOADERGUI RASTER TOPOLOGY	30	OPTIONS_DEFINE= LOADERGUI RASTER TOPOLOGY
29	OPTIONS_DEFAULT= TOPOLOGY	31	OPTIONS_DEFAULT= TOPOLOGY
30		32

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (postgis-2.0.2.tar.gz) = 57746d040080e624f3e81633a180d8a5fc16b0c035d94fe2c16306023ab1c391	1	SHA256 (postgis-2.0.3.tar.gz) = 7f865a6fdf19afed7d2f3e7178cd504f7254a9e96f2ce6a07d0ea19edc1668a0
2	SIZE (postgis-2.0.2.tar.gz) = 5573652	2	SIZE (postgis-2.0.3.tar.gz) = 5581619




--- 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 */




include/liblwgeom.h
lib/postgresql/postgis-2.0.so
%%RASTER%%lib/postgresql/rtpostgis-2.0.so
lib/liblwgeom-%%PORTVERSION%%.so
lib/liblwgeom.a
lib/liblwgeom.la
lib/liblwgeom.so

%%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--%%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

Return to bug 182031

Line 0 Link Here

(-)files/patch-postgis-geometry__estimate.c (+14 lines)
	1	--- postgis/geometry_estimate.c.orig 2012-11-20 14:07:43.000000000 -0500
	2	+++ postgis/geometry_estimate.c 2013-09-06 13:14:13.280967302 -0400
	3	@@ -24,6 +24,11 @@
	4	#include "utils/rel.h"
	5
	6	#include "../postgis_config.h"
	7	+
	8	+#if POSTGIS_PGSQL_VERSION >= 93
	9	+ #include "access/htup_details.h"
	10	+#endif
	11	+
	12	#include "liblwgeom.h"
	13	#include "lwgeom_pg.h" /* For debugging macros. */
	14	#include "gserialized_gist.h" /* For index common functions */

Lines 5-11 Link Here

(-)pkg-plist (-34 / +35 lines)
5	include/liblwgeom.h	5	include/liblwgeom.h
6	lib/postgresql/postgis-2.0.so	6	lib/postgresql/postgis-2.0.so
7	%%RASTER%%lib/postgresql/rtpostgis-2.0.so	7	%%RASTER%%lib/postgresql/rtpostgis-2.0.so
8	lib/liblwgeom-2.0.2.so	8	lib/liblwgeom-%%PORTVERSION%%.so
9	lib/liblwgeom.a	9	lib/liblwgeom.a
10	lib/liblwgeom.la	10	lib/liblwgeom.la
11	lib/liblwgeom.so	11	lib/liblwgeom.so
Lines 89-127 Link Here
89	%%TOPOLOGY%%share/postgresql/contrib/postgis-2.0/uninstall_topology.sql	89	%%TOPOLOGY%%share/postgresql/contrib/postgis-2.0/uninstall_topology.sql
90	share/postgresql/contrib/postgis-2.0/postgis_restore.pl	90	share/postgresql/contrib/postgis-2.0/postgis_restore.pl
91	%%RASTER%%share/postgresql/extension/postgis.control	91	%%RASTER%%share/postgresql/extension/postgis.control
92	%%RASTER%%share/postgresql/extension/postgis--2.0.0alpha3--2.0.2.sql	92	%%RASTER%%share/postgresql/extension/postgis--2.0.0alpha3--%%PORTVERSION%%.sql
93	%%RASTER%%share/postgresql/extension/postgis--2.0.0alpha4--2.0.2.sql	93	%%RASTER%%share/postgresql/extension/postgis--2.0.0alpha4--%%PORTVERSION%%.sql
94	%%RASTER%%share/postgresql/extension/postgis--2.0.1--2.0.2.sql	94	%%RASTER%%share/postgresql/extension/postgis--2.0.0--%%PORTVERSION%%.sql
95	%%RASTER%%share/postgresql/extension/postgis--2.0.0alpha5--2.0.2.sql	95	%%RASTER%%share/postgresql/extension/postgis--2.0.0alpha1--%%PORTVERSION%%.sql
96	%%RASTER%%share/postgresql/extension/postgis--2.0.0beta3--2.0.2.sql	96	%%RASTER%%share/postgresql/extension/postgis--2.0.2--%%PORTVERSION%%.sql
97	%%RASTER%%share/postgresql/extension/postgis--2.0.0beta4--2.0.2.sql	97	%%RASTER%%share/postgresql/extension/postgis--2.0.0beta2--%%PORTVERSION%%.sql
98	%%RASTER%%share/postgresql/extension/postgis--2.0.0rc2--2.0.2.sql	98	%%RASTER%%share/postgresql/extension/postgis--2.0.0alpha6--%%PORTVERSION%%.sql
99	%%RASTER%%share/postgresql/extension/postgis--2.0.0alpha6--2.0.2.sql	99	%%RASTER%%share/postgresql/extension/postgis--2.0.0rc2--%%PORTVERSION%%.sql
100	%%RASTER%%share/postgresql/extension/postgis--2.0.2.sql	100	%%RASTER%%share/postgresql/extension/postgis--%%PORTVERSION%%.sql
101	%%RASTER%%share/postgresql/extension/postgis--2.0.0alpha1--2.0.2.sql	101	%%RASTER%%share/postgresql/extension/postgis--2.0.0beta3--%%PORTVERSION%%.sql
102	%%RASTER%%share/postgresql/extension/postgis--unpackaged--2.0.2.sql	102	%%RASTER%%share/postgresql/extension/postgis--2.0.0beta4--%%PORTVERSION%%.sql
103	%%RASTER%%share/postgresql/extension/postgis--2.0.0beta1--2.0.2.sql	103	%%RASTER%%share/postgresql/extension/postgis--2.0.1--%%PORTVERSION%%.sql
104	%%RASTER%%share/postgresql/extension/postgis--2.0.0--2.0.2.sql	104	%%RASTER%%share/postgresql/extension/postgis--2.0.0beta1--%%PORTVERSION%%.sql
105	%%RASTER%%share/postgresql/extension/postgis--2.0.0beta2--2.0.2.sql	105	%%RASTER%%share/postgresql/extension/postgis--2.0.0alpha5--%%PORTVERSION%%.sql
106	%%RASTER%%share/postgresql/extension/postgis--2.0.0rc1--2.0.2.sql	106	%%RASTER%%share/postgresql/extension/postgis--2.0.0rc1--%%PORTVERSION%%.sql
107	%%RASTER%%share/postgresql/extension/postgis--2.0.0alpha2--2.0.2.sql	107	%%RASTER%%share/postgresql/extension/postgis--2.0.0alpha2--%%PORTVERSION%%.sql
108	%%RASTER%%share/postgresql/extension/postgis_topology.control	108	%%RASTER%%share/postgresql/extension/postgis--unpackaged--%%PORTVERSION%%.sql
109	%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0beta4--2.0.2.sql	109	%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0--%%PORTVERSION%%.sql
110	%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0alpha6--2.0.2.sql	110	%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0alpha1--%%PORTVERSION%%.sql
111	%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0alpha1--2.0.2.sql	111	%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0alpha2--%%PORTVERSION%%.sql
112	%%RASTER%%share/postgresql/extension/postgis_topology--unpackaged--2.0.2.sql	112	%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0alpha3--%%PORTVERSION%%.sql
113	%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0beta2--2.0.2.sql	113	%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0alpha4--%%PORTVERSION%%.sql
114	%%RASTER%%share/postgresql/extension/postgis_topology--2.0.2.sql	114	%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0alpha5--%%PORTVERSION%%.sql
115	%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0beta1--2.0.2.sql	115	%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0alpha6--%%PORTVERSION%%.sql
116	%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0--2.0.2.sql	116	%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0beta1--%%PORTVERSION%%.sql
117	%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0rc1--2.0.2.sql	117	%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0beta2--%%PORTVERSION%%.sql
118	%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0alpha2--2.0.2.sql	118	%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0beta3--%%PORTVERSION%%.sql
119	%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0alpha3--2.0.2.sql	119	%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0beta4--%%PORTVERSION%%.sql
120	%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0alpha4--2.0.2.sql	120	%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0rc1--%%PORTVERSION%%.sql
121	%%RASTER%%share/postgresql/extension/postgis_topology--2.0.1--2.0.2.sql	121	%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0rc2--%%PORTVERSION%%.sql
122	%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0rc2--2.0.2.sql	122	%%RASTER%%share/postgresql/extension/postgis_topology--2.0.1--%%PORTVERSION%%.sql
123	%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0alpha5--2.0.2.sql	123	%%RASTER%%share/postgresql/extension/postgis_topology--2.0.2--%%PORTVERSION%%.sql
124	%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0beta3--2.0.2.sql	124	%%RASTER%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%.sql
		125	%%RASTER%%share/postgresql/extension/postgis_topology--unpackaged--%%PORTVERSION%%.sql
125	@dirrm share/postgresql/contrib/postgis-2.0	126	@dirrm share/postgresql/contrib/postgis-2.0
126	@dirrmtry share/postgresql/contrib	127	@dirrmtry share/postgresql/contrib
127	@dirrm share/postgis/tiger_2010/legacy_import/tiger2008	128	@dirrm share/postgis/tiger_2010/legacy_import/tiger2008