Attachment #146057 for bug #192840




# $FreeBSD: head/databases/postgis21/Makefile 362205 2014-07-18 13:07:23Z sunpoet $

PORTNAME=	postgis
PORTVERSION=	2.1.3
PORTREVISION=	6
CATEGORIES=	databases geography
MASTER_SITES=	http://download.osgeo.org/postgis/source/



LIB_DEPENDS=	libproj.so:${PORTSDIR}/graphics/proj \
		libgeos.so:${PORTSDIR}/graphics/geos \
		libjson-c.so:${PORTSDIR}/devel/json-c
RUN_DEPENDS=	postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER_NODOT}-server

CONFLICTS=	postgis-1.* postgis-2.0.*


OPTIONS_DEFINE=		LOADERGUI RASTER TOPOLOGY SFCGAL
OPTIONS_DEFAULT=	TOPOLOGY
OPTIONS_SUB=	yes

PLIST_SUB+=	PORTVERSION=${PORTVERSION}


RASTER_DESC=	Raster support
TOPOLOGY_DESC=	Topology support
SFCGAL_DESC=	Enable sfcgal
LOADERGUI_CONFIGURE_WITH=	gui
LOADERGUI_USE=	GNOME=gtk20
RASTER_CONFIGURE_WITH=	raster
RASTER_LIB_DEPENDS=		libgdal.so:${PORTSDIR}/graphics/gdal
RASTER_CONFIGURE_ON=	--with-gdalconfig=${LOCALBASE}/bin/gdal-config
TOPOLOGY_CONFIGURE_WITH=	topology
SFCGAL_LIB_DEPENDS=	libSFCGAL.so:${PORTSDIR}/databases/sfcgal
SFCGAL_CONFIGURE_ON=	--with-sfcgal=${LOCALBASE}/bin/sfcgal-config
SFCGAL_CONFIGURE_OFF=	--without-sfcgal

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MLOADERGUI}
USE_GNOME+=		gtk20
CONFIGURE_ARGS+=	--with-gui
PLIST_SUB+=		LOADERGUI=""
.else
CONFIGURE_ARGS+=	--without-gui
PLIST_SUB+=		LOADERGUI="@comment "
.endif

.if ${PORT_OPTIONS:MRASTER}
.if ${OSVERSION} < 900033
BROKEN=			Raster suppport is broken on FreeBSD < 9.x
.endif
LIB_DEPENDS+=		libgdal.so:${PORTSDIR}/graphics/gdal
CONFIGURE_ARGS+=	--with-raster --with-gdalconfig=${LOCALBASE}/bin/gdal-config
PLIST_SUB+=		RASTER=""
.else
CONFIGURE_ARGS+=	--without-raster
PLIST_SUB+=		RASTER="@comment "
.endif

.if ${PORT_OPTIONS:MTOPOLOGY}
CONFIGURE_ARGS+=	--with-topology
PLIST_SUB+=		TOPOLOGY=""
.else
CONFIGURE_ARGS+=	--without-topology
PLIST_SUB+=		TOPOLOGY="@comment "
.endif

.if ${PORT_OPTIONS:MSFCGAL}
LIB_DEPENDS+=	libSFCGAL.so:${PORTSDIR}/databases/sfcgal
CONFIGURE_ARGS+=	--with-sfcgal=${LOCALBASE}/bin/sfcgal-config
PLIST_SUB+=	SFCGAL=""
.else
CONFIGURE_ARGS+=	--without-sfcgal
PLIST_SUB+=	SFCGAL="@comment "
.endif

CFLAGS+=	-I${LOCALBASE}/include

	(cd ${WRKSRC}/extras/tiger_geocoder/tiger_2011/ && ${COPYTREE_SHARE} \* ${STAGEDIR}/${DATADIR}/tiger_2011/ "! ( -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}/bin/shp2pgsql
	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/pgsql2shp
	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/lib/liblwgeom-2.1.3.so
	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/lib/postgresql/postgis-2.1.so

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (postgis-2.1.0.tar.gz) = fc00481aec904661f3eb11da4305b1666f2040c28b0651de7eac6c22f217b26c	1	SHA256 (postgis-2.1.3.tar.gz) = c17812aa4bb86ed561dfc65cb42ab45176b94e0620de183a4bbd773d6d876ec1
2	SIZE (postgis-2.1.0.tar.gz) = 6518378	2	SIZE (postgis-2.1.3.tar.gz) = 6881881




--- 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);

Lines 50-55 Link Here

(-)./pkg-plist (+1 lines)
50	%%DATADIR%%/tiger_2011/tables/lookup_tables_2011.sql	50	%%DATADIR%%/tiger_2011/tables/lookup_tables_2011.sql
51	%%DATADIR%%/tiger_2011/tiger_loader_2011.sql	51	%%DATADIR%%/tiger_2011/tiger_loader_2011.sql
52	%%DATADIR%%/tiger_2011/tiger_loader_2012.sql	52	%%DATADIR%%/tiger_2011/tiger_loader_2012.sql
		53	%%DATADIR%%/tiger_2011/tiger_loader_2013.sql
53	%%DATADIR%%/tiger_2011/topology/README	54	%%DATADIR%%/tiger_2011/topology/README
54	%%DATADIR%%/tiger_2011/topology/tiger_topology_loader.sql	55	%%DATADIR%%/tiger_2011/topology/tiger_topology_loader.sql
55	%%DATADIR%%/tiger_2011/upgrade_geocode.sql	56	%%DATADIR%%/tiger_2011/upgrade_geocode.sql

Return to bug 192840

Lines 1-8 Link Here

(-)./Makefile (-35 / +16 lines)
1	# $FreeBSD: head/databases/postgis21/Makefile 362205 2014-07-18 13:07:23Z sunpoet $	1	# $FreeBSD: head/databases/postgis21/Makefile 362205 2014-07-18 13:07:23Z sunpoet $
2		2
3	PORTNAME= postgis	3	PORTNAME= postgis
4	PORTVERSION= 2.1.0	4	PORTVERSION= 2.1.3
5	PORTREVISION= 6
6	CATEGORIES= databases geography	5	CATEGORIES= databases geography
7	MASTER_SITES= http://download.osgeo.org/postgis/source/	6	MASTER_SITES= http://download.osgeo.org/postgis/source/
8		7
Lines 13-19 Link Here
13		12
14	LIB_DEPENDS= libproj.so:${PORTSDIR}/graphics/proj \	13	LIB_DEPENDS= libproj.so:${PORTSDIR}/graphics/proj \
15	libgeos.so:${PORTSDIR}/graphics/geos \	14	libgeos.so:${PORTSDIR}/graphics/geos \
16	libjson.so:${PORTSDIR}/devel/json-c	15	libjson-c.so:${PORTSDIR}/devel/json-c
17	RUN_DEPENDS= postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER_NODOT}-server	16	RUN_DEPENDS= postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER_NODOT}-server
18		17
19	CONFLICTS= postgis-1.* postgis-2.0.*	18	CONFLICTS= postgis-1.* postgis-2.0.*
Lines 27-32 Link Here
27		26
28	OPTIONS_DEFINE= LOADERGUI RASTER TOPOLOGY SFCGAL	27	OPTIONS_DEFINE= LOADERGUI RASTER TOPOLOGY SFCGAL
29	OPTIONS_DEFAULT= TOPOLOGY	28	OPTIONS_DEFAULT= TOPOLOGY
		29	OPTIONS_SUB= yes
30		30
31	PLIST_SUB+= PORTVERSION=${PORTVERSION}	31	PLIST_SUB+= PORTVERSION=${PORTVERSION}
32		32
Lines 34-78 Link Here
34	RASTER_DESC= Raster support	34	RASTER_DESC= Raster support
35	TOPOLOGY_DESC= Topology support	35	TOPOLOGY_DESC= Topology support
36	SFCGAL_DESC= Enable sfcgal	36	SFCGAL_DESC= Enable sfcgal
		37	LOADERGUI_CONFIGURE_WITH= gui
		38	LOADERGUI_USE= GNOME=gtk20
		39	RASTER_CONFIGURE_WITH= raster
		40	RASTER_LIB_DEPENDS= libgdal.so:${PORTSDIR}/graphics/gdal
		41	RASTER_CONFIGURE_ON= --with-gdalconfig=${LOCALBASE}/bin/gdal-config
		42	TOPOLOGY_CONFIGURE_WITH= topology
		43	SFCGAL_LIB_DEPENDS= libSFCGAL.so:${PORTSDIR}/databases/sfcgal
		44	SFCGAL_CONFIGURE_ON= --with-sfcgal=${LOCALBASE}/bin/sfcgal-config
		45	SFCGAL_CONFIGURE_OFF= --without-sfcgal
37		46
38	.include <bsd.port.options.mk>	47	.include <bsd.port.options.mk>
39		48
40	.if ${PORT_OPTIONS:MLOADERGUI}
41	USE_GNOME+= gtk20
42	CONFIGURE_ARGS+= --with-gui
43	PLIST_SUB+= LOADERGUI=""
44	.else
45	CONFIGURE_ARGS+= --without-gui
46	PLIST_SUB+= LOADERGUI="@comment "
47	.endif
48
49	.if ${PORT_OPTIONS:MRASTER}	49	.if ${PORT_OPTIONS:MRASTER}
50	.if ${OSVERSION} < 900033	50	.if ${OSVERSION} < 900033
51	BROKEN= Raster suppport is broken on FreeBSD < 9.x	51	BROKEN= Raster suppport is broken on FreeBSD < 9.x
52	.endif	52	.endif
53	LIB_DEPENDS+= libgdal.so:${PORTSDIR}/graphics/gdal
54	CONFIGURE_ARGS+= --with-raster --with-gdalconfig=${LOCALBASE}/bin/gdal-config
55	PLIST_SUB+= RASTER=""
56	.else
57	CONFIGURE_ARGS+= --without-raster
58	PLIST_SUB+= RASTER="@comment "
59	.endif
60
61	.if ${PORT_OPTIONS:MTOPOLOGY}
62	CONFIGURE_ARGS+= --with-topology
63	PLIST_SUB+= TOPOLOGY=""
64	.else
65	CONFIGURE_ARGS+= --without-topology
66	PLIST_SUB+= TOPOLOGY="@comment "
67	.endif
68
69	.if ${PORT_OPTIONS:MSFCGAL}
70	LIB_DEPENDS+= libSFCGAL.so:${PORTSDIR}/databases/sfcgal
71	CONFIGURE_ARGS+= --with-sfcgal=${LOCALBASE}/bin/sfcgal-config
72	PLIST_SUB+= SFCGAL=""
73	.else
74	CONFIGURE_ARGS+= --without-sfcgal
75	PLIST_SUB+= SFCGAL="@comment "
76	.endif	53	.endif
77		54
78	CFLAGS+= -I${LOCALBASE}/include	55	CFLAGS+= -I${LOCALBASE}/include
Lines 89-93 Link Here
89	(cd ${WRKSRC}/extras/tiger_geocoder/tiger_2011/ && ${COPYTREE_SHARE} \* ${STAGEDIR}/${DATADIR}/tiger_2011/ "! ( -name \.orig -o -name \.bak )" )	66	(cd ${WRKSRC}/extras/tiger_geocoder/tiger_2011/ && ${COPYTREE_SHARE} \* ${STAGEDIR}/${DATADIR}/tiger_2011/ "! ( -name \.orig -o -name \.bak )" )
90	${MKDIR} ${STAGEDIR}/${DATADIR}/utils	67	${MKDIR} ${STAGEDIR}/${DATADIR}/utils
91	(cd ${WRKSRC}/utils/ && ${COPYTREE_SHARE} \* ${STAGEDIR}/${DATADIR}/utils/ "! ( -name \.orig -o -name \.bak )" )	68	(cd ${WRKSRC}/utils/ && ${COPYTREE_SHARE} \* ${STAGEDIR}/${DATADIR}/utils/ "! ( -name \.orig -o -name \.bak )" )
		69	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/shp2pgsql
		70	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/pgsql2shp
		71	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/lib/liblwgeom-2.1.3.so
		72	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/lib/postgresql/postgis-2.1.so
92		73
93	.include <bsd.port.mk>	74	.include <bsd.port.mk>

Line 0 Link Here

(-)./files/patch-liblwgeom_lwin__geojson.c (+22 lines)
	1	--- liblwgeom/lwin_geojson.c.orig 2014-08-20 10:32:15.721407424 +0600
	2	+++ liblwgeom/lwin_geojson.c 2014-08-20 10:32:44.823412267 +0600
	3	@@ -17,8 +17,8 @@
	4
	5	#ifdef HAVE_LIBJSON
	6
	7	-#include <json/json.h>
	8	-#include <json/json_object_private.h>
	9	+#include <json-c/json.h>
	10	+#include <json-c/json_object_private.h>
	11	#include <string.h>
	12
	13	static void geojson_lwerror(char *msg, int error_code)
	14	@@ -510,7 +510,7 @@
	15	if( jstok->err != json_tokener_success)
	16	{
	17	char err[256];
	18	- snprintf(err, 256, "%s (at offset %d)", json_tokener_errors[jstok->err], jstok->char_offset);
	19	+ snprintf(err, 256, "%s (at offset %d)", json_tokener_error_desc(jstok->err), jstok->char_offset);
	20	json_tokener_free(jstok);
	21	json_object_put(poObj);
	22	geojson_lwerror(err, 1);