From owner-svn-ports-head@FreeBSD.ORG Sat Feb 16 22:43:37 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 3F3C57B5; Sat, 16 Feb 2013 22:43:37 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 2C8B3EA8; Sat, 16 Feb 2013 22:43:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1GMhaDc067538; Sat, 16 Feb 2013 22:43:36 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1GMhZTP067535; Sat, 16 Feb 2013 22:43:35 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201302162243.r1GMhZTP067535@svn.freebsd.org> From: Pawel Pekala Date: Sat, 16 Feb 2013 22:43:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r312389 - head/graphics/geos X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Feb 2013 22:43:37 -0000 Author: pawel Date: Sat Feb 16 22:43:35 2013 New Revision: 312389 URL: http://svnweb.freebsd.org/changeset/ports/312389 Log: - Update to version 3.3.7 [1] - Convert to OptionsNG PR: ports/175623 [1] Submitted by: Rainer Hurling Approved by: maintainer timeout Modified: head/graphics/geos/Makefile head/graphics/geos/distinfo head/graphics/geos/pkg-plist Modified: head/graphics/geos/Makefile ============================================================================== --- head/graphics/geos/Makefile Sat Feb 16 22:27:20 2013 (r312388) +++ head/graphics/geos/Makefile Sat Feb 16 22:43:35 2013 (r312389) @@ -1,12 +1,8 @@ -# New ports collection makefile for: geos -# Date created: 19 December 2003 -# Whom: Leonardo Martins -# +# Created by: Leonardo Martins # $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 -.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 Modified: head/graphics/geos/distinfo ============================================================================== --- head/graphics/geos/distinfo Sat Feb 16 22:27:20 2013 (r312388) +++ head/graphics/geos/distinfo Sat Feb 16 22:43:35 2013 (r312389) @@ -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 Modified: head/graphics/geos/pkg-plist ============================================================================== --- head/graphics/geos/pkg-plist Sat Feb 16 22:27:20 2013 (r312388) +++ head/graphics/geos/pkg-plist Sat Feb 16 22:43:35 2013 (r312389) @@ -356,7 +356,7 @@ include/geos/util/UnsupportedOperationEx 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