Attachment 150795 Details for Bug 196149 – Update to 2.1.5

[patch] Update to 2.1.5

databases__postgis21-2.1.5.diff (text/plain), 2.81 KB, created by Harrison Grundy on 2014-12-20 05:34:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Harrison Grundy

Created: 2014-12-20 05:34:51 UTC

Size: 2.81 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 374908)
>+++ Makefile	(working copy)
>@@ -1,8 +1,8 @@
> # $FreeBSD$
> 
> PORTNAME=	postgis
>-PORTVERSION=	2.1.3
>-PORTREVISION=	2
>+PORTVERSION=	2.1.5
>+PORTREVISION= 	0	
> CATEGORIES=	databases geography
> MASTER_SITES=	http://download.osgeo.org/postgis/source/
> 
>@@ -69,7 +69,7 @@
> 	(cd ${WRKSRC}/utils/ && ${COPYTREE_SHARE} \* ${STAGEDIR}/${DATADIR}/utils/ "! ( -name *\.orig -o -name *\.bak )" )
> 	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/shp2pgsql
> 	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/pgsql2shp
>-	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/lib/liblwgeom-2.1.3.so
>+	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/lib/liblwgeom-${PORTVERSION}.so
> 	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/lib/postgresql/postgis-2.1.so
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 374908)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (postgis-2.1.3.tar.gz) = c17812aa4bb86ed561dfc65cb42ab45176b94e0620de183a4bbd773d6d876ec1
>-SIZE (postgis-2.1.3.tar.gz) = 6881881
>+SHA256 (postgis-2.1.5.tar.gz) = 0d0e27f72f12b8dba456fbde25ed0f6913f42baf57332a7f1b9bbc6f29fddbf4
>+SIZE (postgis-2.1.5.tar.gz) = 6827999
>Index: files/patch-liblwgeom_lwin__geojson.c
>===================================================================
>--- files/patch-liblwgeom_lwin__geojson.c	(revision 374908)
>+++ files/patch-liblwgeom_lwin__geojson.c	(working copy)
>@@ -1,22 +0,0 @@
>---- liblwgeom/lwin_geojson.c.orig	2014-08-20 10:32:15.721407424 +0600
>-+++ liblwgeom/lwin_geojson.c	2014-08-20 10:32:44.823412267 +0600
>-@@ -17,8 +17,8 @@
>- 
>- #ifdef HAVE_LIBJSON
>- 
>--#include <json/json.h>
>--#include <json/json_object_private.h>
>-+#include <json-c/json.h>
>-+#include <json-c/json_object_private.h>
>- #include <string.h>
>- 
>- static void geojson_lwerror(char *msg, int error_code)
>-@@ -510,7 +510,7 @@
>- 	if( jstok->err != json_tokener_success)
>- 	{
>- 		char err[256];
>--		snprintf(err, 256, "%s (at offset %d)", json_tokener_errors[jstok->err], jstok->char_offset);
>-+		snprintf(err, 256, "%s (at offset %d)", json_tokener_error_desc(jstok->err), jstok->char_offset);
>- 		json_tokener_free(jstok);
>-     json_object_put(poObj);
>- 		geojson_lwerror(err, 1);
>Index: files/patch-raster_rt__core_rt__api.h
>===================================================================
>--- files/patch-raster_rt__core_rt__api.h	(revision 374908)
>+++ files/patch-raster_rt__core_rt__api.h	(working copy)
>@@ -1,11 +0,0 @@
>---- raster/rt_core/rt_api.h.orig	2014-05-04 17:15:13 UTC
>-+++ raster/rt_core/rt_api.h
>-@@ -42,7 +42,7 @@
>- #endif
>- 
>- 
>--#if defined(__FreeBSD_kernel__) || defined(__OpenBSD__)    /* seems to work like Linux... */
>-+#if defined(__FreeBSD__) || defined(__DragonFly__)    /* seems to work like Linux... */
>- #if !defined(LINUX)
>- #define LINUX
>- #endif

Actions: View | Diff

Attachments on bug 196149: 150795