diff options
| author | Johannes Jost Meixner <xmj@FreeBSD.org> | 2015-01-13 11:17:21 +0000 |
|---|---|---|
| committer | Johannes Jost Meixner <xmj@FreeBSD.org> | 2015-01-13 11:17:21 +0000 |
| commit | 923cbfd392cafb991643da41b9a9e8d2844368fc (patch) | |
| tree | 24906c104d8e755bf0d83808fa87da36504b4a14 /databases | |
| parent | e7a418beab80ea6352ee9e8bd09084021e90aa2c (diff) | |
| download | ports-923cbfd392cafb991643da41b9a9e8d2844368fc.tar.gz ports-923cbfd392cafb991643da41b9a9e8d2844368fc.zip | |
Notes
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/postgis21/Makefile | 5 | ||||
| -rw-r--r-- | databases/postgis21/distinfo | 4 | ||||
| -rw-r--r-- | databases/postgis21/files/patch-liblwgeom_lwin__geojson.c | 22 | ||||
| -rw-r--r-- | databases/postgis21/files/patch-raster_rt__core_rt__api.h | 11 |
4 files changed, 4 insertions, 38 deletions
diff --git a/databases/postgis21/Makefile b/databases/postgis21/Makefile index ea13e4414da0..77fbf0759f1b 100644 --- a/databases/postgis21/Makefile +++ b/databases/postgis21/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= postgis -PORTVERSION= 2.1.3 -PORTREVISION= 2 +PORTVERSION= 2.1.5 CATEGORIES= databases geography MASTER_SITES= http://download.osgeo.org/postgis/source/ @@ -69,7 +68,7 @@ post-install: .SILENT (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> diff --git a/databases/postgis21/distinfo b/databases/postgis21/distinfo index ac22c562d699..48478b682e97 100644 --- a/databases/postgis21/distinfo +++ b/databases/postgis21/distinfo @@ -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 diff --git a/databases/postgis21/files/patch-liblwgeom_lwin__geojson.c b/databases/postgis21/files/patch-liblwgeom_lwin__geojson.c deleted file mode 100644 index c789416310b4..000000000000 --- a/databases/postgis21/files/patch-liblwgeom_lwin__geojson.c +++ /dev/null @@ -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); diff --git a/databases/postgis21/files/patch-raster_rt__core_rt__api.h b/databases/postgis21/files/patch-raster_rt__core_rt__api.h deleted file mode 100644 index c5d02361e475..000000000000 --- a/databases/postgis21/files/patch-raster_rt__core_rt__api.h +++ /dev/null @@ -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 |