Index: head/databases/postgis21/files/patch-postgis-lwgeom_accum.c
===================================================================
--- head/databases/postgis21/files/patch-postgis-lwgeom_accum.c	(revision 429620)
+++ head/databases/postgis21/files/patch-postgis-lwgeom_accum.c	(nonexistent)
@@ -1,15 +0,0 @@
---- postgis/lwgeom_accum.c.orig	2014-12-01 08:47:21 UTC
-+++ postgis/lwgeom_accum.c
-@@ -106,7 +106,11 @@ pgis_geometry_accum_transfn(PG_FUNCTION_
- 		         errmsg("could not determine input data type")));
- 
- 	if (fcinfo->context && IsA(fcinfo->context, AggState))
--		aggcontext = ((AggState *) fcinfo->context)->aggcontext;
-+#if POSTGIS_PGSQL_VERSION >= 95
-+		aggcontext = ((AggState *) fcinfo->context)->aggcontexts;
-+#else
-+ 		aggcontext = ((AggState *) fcinfo->context)->aggcontext;
-+#endif
- 	else if (fcinfo->context && IsA(fcinfo->context, WindowAggState))
- 		aggcontext = ((WindowAggState *) fcinfo->context)->aggcontext;
- 

Property changes on: head/databases/postgis21/files/patch-postgis-lwgeom_accum.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/databases/postgis21/Makefile
===================================================================
--- head/databases/postgis21/Makefile	(revision 429620)
+++ head/databases/postgis21/Makefile	(revision 429621)
@@ -1,70 +1,69 @@
 # $FreeBSD$
 
 PORTNAME=	postgis
-PORTVERSION=	2.1.7
-PORTREVISION=	3
+PORTVERSION=	2.1.8
 CATEGORIES=	databases geography
 MASTER_SITES=	http://download.osgeo.org/postgis/source/
 
 MAINTAINER=	harrison.grundy@astrodoggroup.com
 COMMENT=	Geographic objects support for PostgreSQL databases
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libproj.so:graphics/proj \
 		libgeos.so:graphics/geos \
 		libjson-c.so:devel/json-c
 
 CONFLICTS=	postgis20-2.0.* postgis22-*
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_BASE}
 USES=		gmake iconv:wchar_t libtool:keepla perl5 pgsql pkgconfig shebangfix
 SHEBANG_FILES=	utils/postgis_restore.pl.in
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 WANT_PGSQL=	lib server
 
 OPTIONS_DEFINE=		LOADERGUI RASTER TOPOLOGY SFCGAL
 OPTIONS_DEFAULT=	TOPOLOGY
 OPTIONS_SUB=	yes
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
 LOADERGUI_DESC=	Enable shp2pgsql-gui
 RASTER_DESC=	Raster support
 TOPOLOGY_DESC=	Topology support
 SFCGAL_DESC=	Enable sfcgal
 LOADERGUI_CONFIGURE_WITH=	gui
 LOADERGUI_USE=	GNOME=gtk20
 RASTER_USES=	alias
 RASTER_CONFIGURE_WITH=	raster
 RASTER_LIB_DEPENDS=		libgdal.so:graphics/gdal
 RASTER_CONFIGURE_ON=	--with-gdalconfig=${LOCALBASE}/bin/gdal-config
 TOPOLOGY_CONFIGURE_WITH=	topology
 SFCGAL_LIB_DEPENDS=	libSFCGAL.so:databases/sfcgal
 SFCGAL_CONFIGURE_ON=	--with-sfcgal=${LOCALBASE}/bin/sfcgal-config
 SFCGAL_CONFIGURE_OFF=	--without-sfcgal
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${GREP} -lR 'bin/bash' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e "s|/bin/bash|/bin/sh|"
 
 pre-configure:
 	@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/tiger_2011
 	(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-${PORTVERSION}.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/postgis-2.1.so
 
 .include <bsd.port.mk>
Index: head/databases/postgis21/distinfo
===================================================================
--- head/databases/postgis21/distinfo	(revision 429620)
+++ head/databases/postgis21/distinfo	(revision 429621)
@@ -1,2 +1,3 @@
-SHA256 (postgis-2.1.7.tar.gz) = 00ab79a3f609d7ea458f6fc358032ad059cb720baf88285243d6436a597a7ec2
-SIZE (postgis-2.1.7.tar.gz) = 6804372
+TIMESTAMP = 1482845254
+SHA256 (postgis-2.1.8.tar.gz) = 7c2380b895fe7bda34c2e70deab3fcf4c12b13ab40d7501cdaa6fa36f1a6c662
+SIZE (postgis-2.1.8.tar.gz) = 6811272