- Update to 3.3.1

- Add option for ruby and php

PR:		161844
Submitted by:	Bartoletti <coder@tuxfamily.org>
Approved by:	maintainer(timeout, >2 months)

3 files changed, 47 insertions, 21 deletions

diff --git a/graphics/geos/Makefile b/graphics/geos/Makefile
index 9156b719a3f8..018fe73e9238 100644
--- a/graphics/geos/Makefile
+++ b/graphics/geos/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	geos
-PORTVERSION=	3.3.0
-PORTREVISION=	2
+PORTVERSION=	3.3.1
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://download.osgeo.org/geos/
 
@@ -22,18 +21,39 @@ USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
-OPTIONS=	PYTHON "Enable python bindings" off
+OPTIONS=	PYTHON "Enable python bindings" off \
+		PHP    "Enable php bindings" off \
+		RUBY   "Enable ruby bindings" off
 
 .include <bsd.port.options.mk>
 
+.if defined(WITH_PHP) || defined(WITH_PYTHON) || defined(WITH_RUBY)
+BUILD_DEPENDS+=	swig1.3:${PORTSDIR}/devel/swig13
+.endif
+
 .if defined(WITH_PYTHON)
-USE_PYTHON=	yes
-CONFIGURE_ARGS+=--enable-python
-PLIST_SUB+=	PYTHON=""
-BUILD_DEPENDS+=	swig:${PORTSDIR}/devel/swig13
-PKGNAMESUFFIX=	-python
+USE_PYTHON=		yes
+CONFIGURE_ARGS+=	--enable-python
+PLIST_SUB+=		WITH_PYTHON=""
+.else
+PLIST_SUB+=		WITH_PYTHON="@comment "
+.endif
+
+.if defined(WITH_PHP)
+BUILD_DEPENDS+=		${LOCALBASE}/bin/php-config:${PORTSDIR}/lang/php5
+CONFIGURE_ARGS+=	--enable-php
+PLIST_SUB+=		WITH_PHP=""
+.else
+PLIST_SUB+=		WITH_PHP="@comment "
+.endif
+
+.if defined(WITH_RUBY)
+USE_RUBY=		yes
+CONFIGURE_ARGS+=	--enable-ruby
+CONFIGURE_ENV+=		RUBY="${RUBY}"
+PLIST_SUB+=		WITH_RUBY=""
 .else
-PLIST_SUB+=	PYTHON="@comment "
+PLIST_SUB+=		WITH_RUBY="@comment "
 .endif
 
 post-install:
diff --git a/graphics/geos/distinfo b/graphics/geos/distinfo
index 534d90bb05f2..ad5fe2ad482a 100644
--- a/graphics/geos/distinfo
+++ b/graphics/geos/distinfo
@@ -1,2 +1,2 @@
-SHA256 (geos-3.3.0.tar.bz2) = 791355457910f1b16924d1b966e7d6e376273617c6c3694145f638432c38aba6
-SIZE (geos-3.3.0.tar.bz2) = 1765056
+SHA256 (geos-3.3.1.tar.bz2) = 3e0a158df06e8f3c6a23978feb62e5c91f2f8239b6ad9d9abc2bd2958abb94c2
+SIZE (geos-3.3.1.tar.bz2) = 1791111
diff --git a/graphics/geos/pkg-plist b/graphics/geos/pkg-plist
index 087b23553478..98dd558b0228 100644
--- a/graphics/geos/pkg-plist
+++ b/graphics/geos/pkg-plist
@@ -356,7 +356,7 @@ include/geos/util/UnsupportedOperationException.h
 include/geos/util/math.h
 include/geos/version.h
 include/geos_c.h
-lib/libgeos-3.3.0.so
+lib/libgeos-3.3.1.so
 lib/libgeos.a
 lib/libgeos.la
 lib/libgeos.so
@@ -365,15 +365,6 @@ lib/libgeos_c.a
 lib/libgeos_c.la
 lib/libgeos_c.so
 lib/libgeos_c.so.8
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/geos.pth
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/geos/_geos.a
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/geos/_geos.la
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/geos/_geos.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/geos/geos.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/geos/geos.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/geos/geos.pyo
-%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/geos
-%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%
 @dirrm lib/geos
 @dirrm include/geos/util
 @dirrm include/geos/simplify
@@ -411,3 +402,18 @@ lib/libgeos_c.so.8
 @dirrm include/geos/algorithm/distance
 @dirrm include/geos/algorithm
 @dirrm include/geos
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/geos.pth
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/geos/_geos.a
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/geos/_geos.la
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/geos/_geos.so
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/geos/geos.py
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/geos/geos.pyc
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/geos/geos.pyo
+%%WITH_PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/geos
+%%WITH_PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/geos.a
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/geos.la
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/geos.so
+%%WITH_RUBY%%@dirrm %%RUBY_SITEARCHLIBDIR%%/
+%%WITH_PHP%%lib/php/20090626/geos.so
+%%WITH_PHP%%@dirrmtry lib/php/20090626