Index: head/databases/elixir-geo/Makefile
===================================================================
--- head/databases/elixir-geo/Makefile	(revision 395600)
+++ head/databases/elixir-geo/Makefile	(revision 395601)
@@ -1,39 +1,26 @@
 # $FreeBSD$
 
 PORTNAME=	geo
-PORTVERSION=	0.15.2
+PORTVERSION=	0.16.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 PKGNAMEPREFIX=	elixir-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Collection of GIS functions for Elixir
 
 LICENSE=	MIT
 
 OPTIONS_SUB=	yes
 USES=		elixir
 USE_GITHUB=	yes
 GH_ACCOUNT=	bryanjos
 
-OPTIONS_DEFINE=	POSTGIS
-
-.include <bsd.port.options.mk>
-
 MIX_BUILD_DEPS=	databases/elixir-ecto \
+		databases/elixir-postgrex \
 		devel/elixir-poison
 
-.if ${PORT_OPTIONS:MPOSTGIS}
-MIX_BUILD_DEPS+=databases/elixir-postgrex
-.endif
-
 MIX_RUN_DEPS:=	${MIX_BUILD_DEPS}
 MIX_REWRITE=	yes
-
-post-patch:
-.if ! ${PORT_OPTIONS:MPOSTGIS}
-	# These files must be removed or the build will hang forever
-	${RM} -r ${WRKSRC}/lib/geo/postgis.ex ${WRKSRC}/lib/geo/postgis
-.endif
 
 .include <bsd.port.mk>
Index: head/databases/elixir-geo/distinfo
===================================================================
--- head/databases/elixir-geo/distinfo	(revision 395600)
+++ head/databases/elixir-geo/distinfo	(revision 395601)
@@ -1,2 +1,2 @@
-SHA256 (bryanjos-geo-v0.15.2_GH0.tar.gz) = 25b0d3725b2fd2f70fca6a64b49f7dcfc819c9d733c2fab9f6814200fcac98bc
-SIZE (bryanjos-geo-v0.15.2_GH0.tar.gz) = 15564
+SHA256 (bryanjos-geo-v0.16.1_GH0.tar.gz) = 60ea48b880ef726b6ca84eb5b2b77fc74a8d6feb604d8f8061e417f929815e06
+SIZE (bryanjos-geo-v0.16.1_GH0.tar.gz) = 15575
Index: head/databases/elixir-geo/pkg-plist
===================================================================
--- head/databases/elixir-geo/pkg-plist	(revision 395600)
+++ head/databases/elixir-geo/pkg-plist	(revision 395601)
@@ -1,41 +1,41 @@
 lib/elixir/lib/geo/ebin/Elixir.Geo.GeometryCollection.beam
 lib/elixir/lib/geo/ebin/Elixir.Geo.JSON.beam
 lib/elixir/lib/geo/ebin/Elixir.Geo.LineString.beam
 lib/elixir/lib/geo/ebin/Elixir.Geo.MultiLineString.beam
 lib/elixir/lib/geo/ebin/Elixir.Geo.MultiPoint.beam
 lib/elixir/lib/geo/ebin/Elixir.Geo.MultiPolygon.beam
 lib/elixir/lib/geo/ebin/Elixir.Geo.Point.beam
 lib/elixir/lib/geo/ebin/Elixir.Geo.Polygon.beam
-%%POSTGIS%%lib/elixir/lib/geo/ebin/Elixir.Geo.PostGIS.Extension.beam
-%%POSTGIS%%lib/elixir/lib/geo/ebin/Elixir.Geo.PostGIS.beam
+lib/elixir/lib/geo/ebin/Elixir.Geo.PostGIS.Extension.beam
+lib/elixir/lib/geo/ebin/Elixir.Geo.PostGIS.beam
 lib/elixir/lib/geo/ebin/Elixir.Geo.Utils.beam
 lib/elixir/lib/geo/ebin/Elixir.Geo.WKB.Reader.beam
 lib/elixir/lib/geo/ebin/Elixir.Geo.WKB.Writer.beam
 lib/elixir/lib/geo/ebin/Elixir.Geo.WKB.beam
 lib/elixir/lib/geo/ebin/Elixir.Geo.WKT.beam
 lib/elixir/lib/geo/ebin/Elixir.Geo.beam
 lib/elixir/lib/geo/ebin/Elixir.String.Chars.Geo.GeometryCollection.beam
 lib/elixir/lib/geo/ebin/Elixir.String.Chars.Geo.LineString.beam
 lib/elixir/lib/geo/ebin/Elixir.String.Chars.Geo.MultiLineString.beam
 lib/elixir/lib/geo/ebin/Elixir.String.Chars.Geo.MultiPoint.beam
 lib/elixir/lib/geo/ebin/Elixir.String.Chars.Geo.MultiPolygon.beam
 lib/elixir/lib/geo/ebin/Elixir.String.Chars.Geo.Point.beam
 lib/elixir/lib/geo/ebin/Elixir.String.Chars.Geo.Polygon.beam
 lib/elixir/lib/geo/ebin/geo.app
 lib/elixir/lib/geo/lib/geo.ex
 lib/elixir/lib/geo/lib/geo/geo_json.ex
 lib/elixir/lib/geo/lib/geo/geometry_collection.ex
 lib/elixir/lib/geo/lib/geo/line_string.ex
 lib/elixir/lib/geo/lib/geo/multi_line_string.ex
 lib/elixir/lib/geo/lib/geo/multi_point.ex
 lib/elixir/lib/geo/lib/geo/multi_polygon.ex
 lib/elixir/lib/geo/lib/geo/point.ex
 lib/elixir/lib/geo/lib/geo/polygon.ex
-%%POSTGIS%%lib/elixir/lib/geo/lib/geo/postgis.ex
-%%POSTGIS%%lib/elixir/lib/geo/lib/geo/postgis/extension.ex
+lib/elixir/lib/geo/lib/geo/postgis.ex
+lib/elixir/lib/geo/lib/geo/postgis/extension.ex
 lib/elixir/lib/geo/lib/geo/utils.ex
 lib/elixir/lib/geo/lib/geo/wkb.ex
 lib/elixir/lib/geo/lib/geo/wkb/reader.ex
 lib/elixir/lib/geo/lib/geo/wkb/writer.ex
 lib/elixir/lib/geo/lib/geo/wkt.ex
 %%PORTDOCS%%%%DOCSDIR%%/README.md