From nobody@FreeBSD.org  Thu Sep 12 11:06:24 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 2BF7B976
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 12 Sep 2013 11:06:24 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 0A58E28FD
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 12 Sep 2013 11:06:24 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r8CB6NM1077954
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 12 Sep 2013 11:06:23 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r8CB6N76077950;
	Thu, 12 Sep 2013 11:06:23 GMT
	(envelope-from nobody)
Message-Id: <201309121106.r8CB6N76077950@oldred.freebsd.org>
Date: Thu, 12 Sep 2013 11:06:23 GMT
From: Trevor Caira <trevor@bitba.se>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] update postgis20 version and fix compatibility crash
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         182031
>Category:       ports
>Synopsis:       [patch] update databases/postgis20 version and fix compatibility crash
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    rm
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 12 11:10:00 UTC 2013
>Closed-Date:    Mon Dec 23 21:02:06 UTC 2013
>Last-Modified:  Mon Dec 23 21:02:06 UTC 2013
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->rm 
Responsible-Changed-By: rm 
Responsible-Changed-When: Thu Sep 12 11:30:37 UTC 2013 
Responsible-Changed-Why:  
I will take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182031 
State-Changed-From-To: open->feedback 
State-Changed-By: rm 
State-Changed-When: Sat Sep 14 07:56:39 UTC 2013 
State-Changed-Why:  
Maintainer, do you approve the changes? 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182031 

From: Romain =?iso-8859-1?Q?Tarti=E8re?= <romain@FreeBSD.org>
To: bug-followup@FreeBSD.org, trevor@bitba.se,
	matt.trisoline@intermedix.com
Cc:  
Subject: Re: ports/182031: [patch] update databases/postgis20 version and fix
 compatibility crash
Date: Tue, 19 Nov 2013 18:17:11 +0100

 --98e8jtXdkpgskNou
 Content-Type: multipart/mixed; boundary="HcAYCG3uE/tztfnV"
 Content-Disposition: inline
 
 
 --HcAYCG3uE/tztfnV
 Content-Type: text/plain; charset=iso-8859-1
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 Hi
 
 With the recent devel/json-c update, it looks like postgis needs to link
 against libjson-c.so instead of libjson.so
 <http://trac.osgeo.org/postgis/ticket/2213#comment:5>.
 
 The attached patch:
   - Update databases/postgis20 to the latest 2.0.4;
   - Rely on the new LIB_DEPENDS format;
   - Rely on STAGING;
   - Register conflicts (as the original patch);
   - Patches the configure script so that the correct json library is
     linked..
 
 I kept the MAINTAINER untouched.  In case of maintainer timeout or
 maintainer approval, Trevor could become the new maintainer.
 
 Trevor: I assumed the patch for PostgreSQL 9.3 was not required anymore,
 but I have not checked so (I run 9.1).  I supposed you where using 9.3
 so can you please follow-up and tell if your patch should also be
 included ?
 
 Matt: as the current maintainer, can you please review and comment on
 this issue, approving or rejecting the update.
 
 Regards,
 Romain
 
 --=20
 Romain Tarti=E8re <romain@FreeBSD.org>  http://people.FreeBSD.org/~romain/
 pgp: 8234 9A78 E7C0 B807 0B59  80FF BA4D 1D95 5112 336F (ID: 0x5112336F)
 (plain text =3Dnon-HTML=3D PGP/GPG encrypted/signed e-mail much appreciated)
 
 --HcAYCG3uE/tztfnV
 Content-Type: text/x-diff; charset=us-ascii
 Content-Disposition: attachment; filename="postgis20.patch"
 Content-Transfer-Encoding: quoted-printable
 
 diff -Nru /var/cache/portshaker/ports/databases/postgis20/Makefile ./Makefi=
 le
 --- /var/cache/portshaker/ports/databases/postgis20/Makefile	2013-11-09 16:=
 57:18.000000000 +0100
 +++ ./Makefile	2013-11-18 14:26:43.437922068 +0100
 @@ -1,20 +1,19 @@
  # $FreeBSD: databases/postgis20/Makefile 333306 2013-11-09 15:57:18Z wg $
 =20
  PORTNAME=3D	postgis
 -PORTVERSION=3D	2.0.2
 -PORTREVISION=3D	4
 +PORTVERSION=3D	2.0.4
  CATEGORIES=3D	databases geography
  MASTER_SITES=3D	http://download.osgeo.org/postgis/source/
 =20
  MAINTAINER=3D	matt.trisoline@intermedix.com
  COMMENT=3D	Adds support for geographic objects to PostgreSQL databases
 =20
 -LIB_DEPENDS=3D	proj:${PORTSDIR}/graphics/proj \
 -		geos:${PORTSDIR}/graphics/geos \
 -		json:${PORTSDIR}/devel/json-c
 +LIB_DEPENDS=3D	libproj.so:${PORTSDIR}/graphics/proj \
 +		libgeos.so:${PORTSDIR}/graphics/geos \
 +		libjson.so:${PORTSDIR}/devel/json-c
  RUN_DEPENDS=3D	postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER}-ser=
 ver
 =20
 -CONFLICTS=3D	postgis-1.*
 +CONFLICTS=3D	postgis-1.* postgis-2.1.*
  LATEST_LINK=3D	postgis20
 =20
  USE_GNOME=3D	libxml2
 @@ -24,6 +23,8 @@
  GNU_CONFIGURE=3D	yes
  USE_PERL5=3D	build
 =20
 +PLIST_SUB+=3D	PORTVERSION=3D${PORTVERSION}
 +
  OPTIONS_DEFINE=3D		LOADERGUI RASTER TOPOLOGY
  OPTIONS_DEFAULT=3D	TOPOLOGY
 =20
 @@ -31,7 +32,6 @@
  RASTER_DESC=3D	Build with raster support
  TOPOLOGY_DESC=3D	Build with topology support
 =20
 -NO_STAGE=3D	yes
  .include <bsd.port.options.mk>
 =20
  .if ${PORT_OPTIONS:MLOADERGUI}
 @@ -39,7 +39,8 @@
  CONFIGURE_ARGS+=3D	--with-gui
  PLIST_SUB+=3D		LOADERGUI=3D""
  .else
 -CONFIGURE_ARGS+=3D	--without-gui
 +# Definning without-gui / with-gui=3Dno explicitely enables gui
 +# CONFIGURE_ARGS+=3D	--without-gui
  PLIST_SUB+=3D		LOADERGUI=3D"@comment "
  .endif
 =20
 @@ -47,7 +48,7 @@
  .if ${OSVERSION} < 900033
  BROKEN=3D			Raster suppport is broken on FreeBSD < 9.x
  .endif
 -LIB_DEPENDS+=3D		gdal:${PORTSDIR}/graphics/gdal
 +LIB_DEPENDS+=3D		libgdal.so:${PORTSDIR}/graphics/gdal
  CONFIGURE_ARGS+=3D	--with-raster --with-gdalconfig=3D${LOCALBASE}/bin/gdal=
 -config
  PLIST_SUB+=3D		RASTER=3D""
  .else
 @@ -73,9 +74,12 @@
  	@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 =20
  post-install: .SILENT
 -	${MKDIR} ${DATADIR}/tiger_2010
 -	(cd ${WRKSRC}/extras/tiger_geocoder/tiger_2010/ && ${COPYTREE_SHARE} \* $=
 {DATADIR}/tiger_2010/ "! ( -name *\.orig -o -name *\.bak )" )
 -	${MKDIR} ${DATADIR}/utils
 -	(cd ${WRKSRC}/utils/ && ${COPYTREE_SHARE} \* ${DATADIR}/utils/ "! ( -name=
  *\.orig -o -name *\.bak )" )
 +	${MKDIR} ${STAGEDIR}/${DATADIR}/tiger_2010
 +	(cd ${WRKSRC}/extras/tiger_geocoder/tiger_2010/ && ${COPYTREE_SHARE} \* $=
 {STAGEDIR}/${DATADIR}/tiger_2010/ "! ( -name *\.orig -o -name *\.bak )" )
 +	${MKDIR} ${STAGEDIR}/${DATADIR}/utils
 +	(cd ${WRKSRC}/utils/ && ${COPYTREE_SHARE} \* ${STAGEDIR}/${DATADIR}/utils=
 / "! ( -name *\.orig -o -name *\.bak )" )
 +	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/lib/postgresql/*.so \
 +		${STAGEDIR}/${PREFIX}/lib/*.so \
 +		${STAGEDIR}/${PREFIX}/bin/*
 =20
  .include <bsd.port.mk>
 diff -Nru /var/cache/portshaker/ports/databases/postgis20/distinfo ./distin=
 fo
 --- /var/cache/portshaker/ports/databases/postgis20/distinfo	2013-02-19 21:=
 35:39.000000000 +0100
 +++ ./distinfo	2013-11-18 13:56:58.075913275 +0100
 @@ -1,2 +1,2 @@
 -SHA256 (postgis-2.0.2.tar.gz) =3D 57746d040080e624f3e81633a180d8a5fc16b0c0=
 35d94fe2c16306023ab1c391
 -SIZE (postgis-2.0.2.tar.gz) =3D 5573652
 +SHA256 (postgis-2.0.4.tar.gz) =3D ad5016dce0a41dd81a64315ac9b46ebf77641e74=
 d281017438eb8caeb6254be3
 +SIZE (postgis-2.0.4.tar.gz) =3D 5534746
 diff -Nru /var/cache/portshaker/ports/databases/postgis20/files/patch-confi=
 gure ./files/patch-configure
 --- /var/cache/portshaker/ports/databases/postgis20/files/patch-configure	1=
 970-01-01 01:00:00.000000000 +0100
 +++ ./files/patch-configure	2013-11-18 14:56:33.796912518 +0100
 @@ -0,0 +1,23 @@
 +
 +$FreeBSD$
 +
 +--- configure.orig
 ++++ configure
 +@@ -19041,7 +19041,7 @@
 + $as_echo "Using user-specified json-c directory: $JSONDIR" >&6; }
 +=20
 + 				JSON_CPPFLAGS=3D"-I$JSONDIR/include"
 +-		JSON_LDFLAGS=3D"-L$JSONDIR/lib -ljson"
 ++		JSON_LDFLAGS=3D"-L$JSONDIR/lib -ljson-c"
 + 	fi
 + fi
 +=20
 +@@ -19104,7 +19104,7 @@
 + $as_echo "#define HAVE_LIBJSON 1" >>confdefs.h
 +=20
 +     if test "x$JSON_LDFLAGS" =3D "x"; then
 +-        JSON_LDFLAGS=3D"-ljson"
 ++        JSON_LDFLAGS=3D"-ljson-c"
 +     fi
 + fi
 +=20
 diff -Nru /var/cache/portshaker/ports/databases/postgis20/pkg-plist ./pkg-p=
 list
 --- /var/cache/portshaker/ports/databases/postgis20/pkg-plist	2013-03-27 10=
 :35:01.000000000 +0100
 +++ ./pkg-plist	2013-11-18 14:30:41.458926127 +0100
 @@ -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,25 @@
  %%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--2.0.0--%%PORTVERSION%%.sql
 +%%RASTER%%share/postgresql/extension/postgis--2.0.0beta4--%%PORTVERSION%%.=
 sql
 +%%RASTER%%share/postgresql/extension/postgis--2.0.0rc1--%%PORTVERSION%%.sql
 +%%RASTER%%share/postgresql/extension/postgis--2.0.0rc2--%%PORTVERSION%%.sql
 +%%RASTER%%share/postgresql/extension/postgis--2.0.1--%%PORTVERSION%%.sql
 +%%RASTER%%share/postgresql/extension/postgis--2.0.2--%%PORTVERSION%%.sql
 +%%RASTER%%share/postgresql/extension/postgis--2.0.3--%%PORTVERSION%%.sql
 +%%RASTER%%share/postgresql/extension/postgis--%%PORTVERSION%%.sql
 +%%RASTER%%share/postgresql/extension/postgis--unpackaged--%%PORTVERSION%%.=
 sql
  %%RASTER%%share/postgresql/extension/postgis_topology.control
 -%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0beta4--2.0.2.s=
 ql
 -%%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.s=
 ql
 -%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0beta2--2.0.2.s=
 ql
 -%%RASTER%%share/postgresql/extension/postgis_topology--2.0.2.sql
 -%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0beta1--2.0.2.s=
 ql
 -%%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.s=
 ql
 +%%RASTER%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%.sql
 +%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0--%%PORTVERSIO=
 N%%.sql
 +%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0beta4--%%PORTV=
 ERSION%%.sql
 +%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0rc1--%%PORTVER=
 SION%%.sql
 +%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0rc2--%%PORTVER=
 SION%%.sql
 +%%RASTER%%share/postgresql/extension/postgis_topology--2.0.1--%%PORTVERSIO=
 N%%.sql
 +%%RASTER%%share/postgresql/extension/postgis_topology--2.0.2--%%PORTVERSIO=
 N%%.sql
 +%%RASTER%%share/postgresql/extension/postgis_topology--2.0.3--%%PORTVERSIO=
 N%%.sql
 +%%RASTER%%share/postgresql/extension/postgis_topology--unpackaged--%%PORTV=
 ERSION%%.sql
  @dirrm share/postgresql/contrib/postgis-2.0
  @dirrmtry share/postgresql/contrib
  @dirrm share/postgis/tiger_2010/legacy_import/tiger2008
 
 --HcAYCG3uE/tztfnV--
 
 --98e8jtXdkpgskNou
 Content-Type: application/pgp-signature
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (FreeBSD)
 
 iQGcBAEBAgAGBQJSi50XAAoJELpNHZVREjNvPGYL/RG/ZHip18o9D34X98JH7uYV
 63D/s+9o6URWWbZ8rO2smBvWEgkhYmY903gT1lQgLjr+RtWP4/2gYk7hxEJ0TNEw
 OWSLBs2ODK7iUvhCVqs1bz/0aZQX1DgT5hNgkOxAP/YuXY5C2BbyeMiY9pIONeCT
 5+lsDQX1geMVvBuur2dWh2n1CX0stu/YidhTsy2KzVz1ngnyfoEvz2nyYKFgpiD7
 7T76CYHkMqeskA8wByZBpGIcunKslViKjyuSpAgZOYzr2T0sg052FxXz+9usor/Z
 RuQCPyrGxA6gpxRhwG7EpnRqxIvhi82WosdIgEAHdYY3ZHJOiYPM9dsnmUYAqE/v
 sDzjuu/IMvRvyjTzsjoIt5lg5AnsDQZtaWjLUg2QCSf8uXvny+t5rCkcD8340DI/
 yup6i1yGQrkGa/LLgq5IpFOLhz3o6n3yteYEGh44e2s7JHnTfOuYMKe7RbIsLEi2
 U113hd6WaW15FO+SunVecBQ3HJZRMZabfrElLZCSaA==
 =7qL1
 -----END PGP SIGNATURE-----
 
 --98e8jtXdkpgskNou--

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/182031: commit references a PR
Date: Mon, 23 Dec 2013 20:59:53 +0000 (UTC)

 Author: rm
 Date: Mon Dec 23 20:59:44 2013
 New Revision: 337295
 URL: http://svnweb.freebsd.org/changeset/ports/337295
 
 Log:
   - update to 2.0.4
   - replace LATEST_LINK with PKGNAMESUFFIX
   - add conflicts with other postgis branches
   - add staging support
   - add patch to link with json-c (upstream ticket #2213)
   - define LICENSE (GPLv2)
   - update COMMENT
   
   PR:		182031
   Submitted by:	Trevor Caira <trevor@bitba.se>, romain
   Approved by:	maintainer timeout (3 months)
 
 Added:
   head/databases/postgis20/files/
   head/databases/postgis20/files/patch-configure   (contents, props changed)
 Modified:
   head/databases/postgis20/Makefile
   head/databases/postgis20/distinfo
   head/databases/postgis20/pkg-descr
   head/databases/postgis20/pkg-plist
 
 Modified: head/databases/postgis20/Makefile
 ==============================================================================
 --- head/databases/postgis20/Makefile	Mon Dec 23 20:57:30 2013	(r337294)
 +++ head/databases/postgis20/Makefile	Mon Dec 23 20:59:44 2013	(r337295)
 @@ -1,21 +1,22 @@
  # $FreeBSD$
  
  PORTNAME=	postgis
 -PORTVERSION=	2.0.2
 -PORTREVISION=	4
 +PORTVERSION=	2.0.4
  CATEGORIES=	databases geography
  MASTER_SITES=	http://download.osgeo.org/postgis/source/
 +PKGNAMESUFFIX=	20
  
  MAINTAINER=	matt.trisoline@intermedix.com
 -COMMENT=	Adds support for geographic objects to PostgreSQL databases
 +COMMENT=	Geographic objects support for PostgreSQL databases
 +
 +LICENSE=	GPLv2
  
  LIB_DEPENDS=	libproj.so:${PORTSDIR}/graphics/proj \
  		libgeos.so:${PORTSDIR}/graphics/geos \
  		libjson.so:${PORTSDIR}/devel/json-c
  RUN_DEPENDS=	postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
  
 -CONFLICTS=	postgis-1.*
 -LATEST_LINK=	postgis20
 +CONFLICTS=	postgis-1.* postgis-2.1.*
  
  USE_GNOME=	libxml2
  USE_PGSQL=	yes
 @@ -24,6 +25,8 @@ USE_LDCONFIG=	yes
  GNU_CONFIGURE=	yes
  USE_PERL5=	build
  
 +PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 +
  OPTIONS_DEFINE=		LOADERGUI RASTER TOPOLOGY
  OPTIONS_DEFAULT=	TOPOLOGY
  
 @@ -31,7 +34,6 @@ LOADERGUI_DESC=	Enable shp2pgsql-gui
  RASTER_DESC=	Build with raster support
  TOPOLOGY_DESC=	Build with topology support
  
 -NO_STAGE=	yes
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MLOADERGUI}
 @@ -39,7 +41,8 @@ USE_GNOME+=		gtk20
  CONFIGURE_ARGS+=	--with-gui
  PLIST_SUB+=		LOADERGUI=""
  .else
 -CONFIGURE_ARGS+=	--without-gui
 +# Definning without-gui / with-gui=no explicitely enables gui
 +# CONFIGURE_ARGS+=	--without-gui
  PLIST_SUB+=		LOADERGUI="@comment "
  .endif
  
 @@ -73,9 +76,12 @@ pre-configure:
  	@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
  
  post-install: .SILENT
 -	${MKDIR} ${DATADIR}/tiger_2010
 -	(cd ${WRKSRC}/extras/tiger_geocoder/tiger_2010/ && ${COPYTREE_SHARE} \* ${DATADIR}/tiger_2010/ "! ( -name *\.orig -o -name *\.bak )" )
 -	${MKDIR} ${DATADIR}/utils
 -	(cd ${WRKSRC}/utils/ && ${COPYTREE_SHARE} \* ${DATADIR}/utils/ "! ( -name *\.orig -o -name *\.bak )" )
 +	${MKDIR} ${STAGEDIR}/${DATADIR}/tiger_2010
 +	(cd ${WRKSRC}/extras/tiger_geocoder/tiger_2010/ && ${COPYTREE_SHARE} . ${STAGEDIR}/${DATADIR}/tiger_2010/ "! ( -name *\.orig -o -name *\.bak )" )
 +	${MKDIR} ${STAGEDIR}/${DATADIR}/utils
 +	(cd ${WRKSRC}/utils/ && ${COPYTREE_SHARE} . ${STAGEDIR}/${DATADIR}/utils/ "! ( -name *\.orig -o -name *\.bak )" )
 +	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/lib/postgresql/*.so \
 +		${STAGEDIR}/${PREFIX}/lib/*.so \
 +		${STAGEDIR}/${PREFIX}/bin/*
  
  .include <bsd.port.mk>
 
 Modified: head/databases/postgis20/distinfo
 ==============================================================================
 --- head/databases/postgis20/distinfo	Mon Dec 23 20:57:30 2013	(r337294)
 +++ head/databases/postgis20/distinfo	Mon Dec 23 20:59:44 2013	(r337295)
 @@ -1,2 +1,2 @@
 -SHA256 (postgis-2.0.2.tar.gz) = 57746d040080e624f3e81633a180d8a5fc16b0c035d94fe2c16306023ab1c391
 -SIZE (postgis-2.0.2.tar.gz) = 5573652
 +SHA256 (postgis-2.0.4.tar.gz) = ad5016dce0a41dd81a64315ac9b46ebf77641e74d281017438eb8caeb6254be3
 +SIZE (postgis-2.0.4.tar.gz) = 5534746
 
 Added: head/databases/postgis20/files/patch-configure
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/databases/postgis20/files/patch-configure	Mon Dec 23 20:59:44 2013	(r337295)
 @@ -0,0 +1,19 @@
 +--- configure.orig
 ++++ configure
 +@@ -19041,7 +19041,7 @@
 + $as_echo "Using user-specified json-c directory: $JSONDIR" >&6; }
 + 
 + 				JSON_CPPFLAGS="-I$JSONDIR/include"
 +-		JSON_LDFLAGS="-L$JSONDIR/lib -ljson"
 ++		JSON_LDFLAGS="-L$JSONDIR/lib -ljson-c"
 + 	fi
 + fi
 + 
 +@@ -19104,7 +19104,7 @@
 + $as_echo "#define HAVE_LIBJSON 1" >>confdefs.h
 + 
 +     if test "x$JSON_LDFLAGS" = "x"; then
 +-        JSON_LDFLAGS="-ljson"
 ++        JSON_LDFLAGS="-ljson-c"
 +     fi
 + fi
 
 Modified: head/databases/postgis20/pkg-descr
 ==============================================================================
 --- head/databases/postgis20/pkg-descr	Mon Dec 23 20:57:30 2013	(r337294)
 +++ head/databases/postgis20/pkg-descr	Mon Dec 23 20:59:44 2013	(r337295)
 @@ -8,6 +8,6 @@ compliant with the "Types and Functions"
  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. 
 +by a Project Steering Committee and new features continue to be added.
  
  WWW: http://www.postgis.org/
 
 Modified: head/databases/postgis20/pkg-plist
 ==============================================================================
 --- head/databases/postgis20/pkg-plist	Mon Dec 23 20:57:30 2013	(r337294)
 +++ head/databases/postgis20/pkg-plist	Mon Dec 23 20:59:44 2013	(r337295)
 @@ -5,7 +5,7 @@ bin/shp2pgsql
  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,25 @@ share/postgresql/contrib/postgis-2.0/leg
  %%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--2.0.0--%%PORTVERSION%%.sql
 +%%RASTER%%share/postgresql/extension/postgis--2.0.0beta4--%%PORTVERSION%%.sql
 +%%RASTER%%share/postgresql/extension/postgis--2.0.0rc1--%%PORTVERSION%%.sql
 +%%RASTER%%share/postgresql/extension/postgis--2.0.0rc2--%%PORTVERSION%%.sql
 +%%RASTER%%share/postgresql/extension/postgis--2.0.1--%%PORTVERSION%%.sql
 +%%RASTER%%share/postgresql/extension/postgis--2.0.2--%%PORTVERSION%%.sql
 +%%RASTER%%share/postgresql/extension/postgis--2.0.3--%%PORTVERSION%%.sql
 +%%RASTER%%share/postgresql/extension/postgis--%%PORTVERSION%%.sql
 +%%RASTER%%share/postgresql/extension/postgis--unpackaged--%%PORTVERSION%%.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_topology--%%PORTVERSION%%.sql
 +%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0--%%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--2.0.3--%%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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: feedback->closed 
State-Changed-By: rm 
State-Changed-When: Mon Dec 23 21:02:05 UTC 2013 
State-Changed-Why:  
Committed, thank you! I preserve current maintainer this time, because 
it needs three timeouts in a row to reset it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182031 
>Unformatted:
