- Update to version 3.3.7 [1]

- Convert to OptionsNG

PR:		ports/175623 [1]
Submitted by:	Rainer Hurling <rhurlin@gwdg.de>
Approved by:	maintainer timeout

3 files changed, 16 insertions, 22 deletions

diff --git a/graphics/geos/Makefile b/graphics/geos/Makefile
index 40b052ae9e17..033bb0a1d7b2 100644
--- a/graphics/geos/Makefile
+++ b/graphics/geos/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	geos
-# Date created:		19 December 2003
-# Whom:		 	Leonardo Martins <lmartins@nepe.eee.ufg.br>
-#
+# Created by: Leonardo Martins <lmartins@nepe.eee.ufg.br>
 # $FreeBSD$
-#
 
 PORTNAME=	geos
-PORTVERSION=	3.3.3
+PORTVERSION=	3.3.7
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://download.osgeo.org/geos/
 
@@ -21,17 +17,15 @@ USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
-OPTIONS=	PYTHON "Enable python bindings" off \
-		PHP    "Enable php bindings" off \
-		RUBY   "Enable ruby bindings" off
+OPTIONS_DEFINE=	PHP PYTHON RUBY
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_PHP) || defined(WITH_PYTHON) || defined(WITH_RUBY)
+.if ${PORT_OPTIONS:MPHP} || ${PORT_OPTIONS:MPYTHON} || ${PORT_OPTIONS:MRUBY}
 BUILD_DEPENDS+=	swig1.3:${PORTSDIR}/devel/swig13
 .endif
 
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 USE_PYTHON=		yes
 CONFIGURE_ARGS+=	--enable-python
 PLIST_SUB+=		WITH_PYTHON=""
@@ -39,7 +33,7 @@ PLIST_SUB+=		WITH_PYTHON=""
 PLIST_SUB+=		WITH_PYTHON="@comment "
 .endif
 
-.if defined(WITH_PHP)
+.if ${PORT_OPTIONS:MPHP}
 BUILD_DEPENDS+=		${LOCALBASE}/bin/php-config:${PORTSDIR}/lang/php5
 CONFIGURE_ARGS+=	--enable-php
 PLIST_SUB+=		WITH_PHP=""
@@ -47,7 +41,7 @@ PLIST_SUB+=		WITH_PHP=""
 PLIST_SUB+=		WITH_PHP="@comment "
 .endif
 
-.if defined(WITH_RUBY)
+.if ${PORT_OPTIONS:MRUBY}
 USE_RUBY=		yes
 CONFIGURE_ARGS+=	--enable-ruby
 CONFIGURE_ENV+=		RUBY="${RUBY}"
@@ -57,6 +51,6 @@ PLIST_SUB+=		WITH_RUBY="@comment "
 .endif
 
 post-install:
-		@${LN} -s ${PREFIX}/lib/libgeos-${PORTVERSION}.so ${PREFIX}/lib/libgeos.so.0
+	@${LN} -s ${PREFIX}/lib/libgeos-${PORTVERSION}.so ${PREFIX}/lib/libgeos.so.0
 
 .include <bsd.port.mk>
diff --git a/graphics/geos/distinfo b/graphics/geos/distinfo
index b5b0d1c40eb3..8704f5cf6d30 100644
--- a/graphics/geos/distinfo
+++ b/graphics/geos/distinfo
@@ -1,2 +1,2 @@
-SHA256 (geos-3.3.3.tar.bz2) = dfcf4bd70ab212a5b7bad21d01b84748f101a545092b56dafdc3882ef3bddec9
-SIZE (geos-3.3.3.tar.bz2) = 1852272
+SHA256 (geos-3.3.7.tar.bz2) = fd01c21b54a3c48cac3e7885f26d4ca10ea9944238776b8ce03489e5e45c592b
+SIZE (geos-3.3.7.tar.bz2) = 1820984
diff --git a/graphics/geos/pkg-plist b/graphics/geos/pkg-plist
index 6be7e78d6a30..0739d9b54753 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.3.so
+lib/libgeos-3.3.7.so
 lib/libgeos.a
 lib/libgeos.la
 lib/libgeos.so
@@ -365,7 +365,7 @@ lib/libgeos_c.a
 lib/libgeos_c.la
 lib/libgeos_c.so
 lib/libgeos_c.so.8
-@dirrm lib/geos
+@dirrmtry lib/geos
 @dirrm include/geos/util
 @dirrm include/geos/simplify
 @dirrm include/geos/precision
@@ -410,10 +410,10 @@ lib/libgeos_c.so.8
 %%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_PYTHON%%@dirrmtry %%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
+%%WITH_RUBY%%@dirrmtry %%RUBY_SITEARCHLIBDIR%%/
+%%WITH_PHP%%lib/php/20100525/geos.so
+%%WITH_PHP%%@dirrmtry lib/php/20100525