From nobody@FreeBSD.org  Sun Jan 27 09:46:29 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id 5DBD91A6
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 27 Jan 2013 09:46:29 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 3611488B
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 27 Jan 2013 09:46:29 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r0R9kShe048941
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 27 Jan 2013 09:46:28 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id r0R9kS39048940;
	Sun, 27 Jan 2013 09:46:28 GMT
	(envelope-from nobody)
Message-Id: <201301270946.r0R9kS39048940@red.freebsd.org>
Date: Sun, 27 Jan 2013 09:46:28 GMT
From: Rainer Hurling <rhurlin@gwdg.de>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] graphics/geos: update to 3.3.7
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: konstantin@saurbier.net

>Number:         175623
>Category:       ports
>Synopsis:       [PATCH] graphics/geos: update to 3.3.7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 27 09:50:00 UTC 2013
>Closed-Date:    Sat Feb 16 22:43:44 UTC 2013
>Last-Modified:  Sat Feb 16 22:50:00 UTC 2013
>Originator:     Rainer Hurling
>Release:        10.0-CURRENT (amd64)
>Organization:
>Environment:
FreeBSD xxx.xxx.xxx 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r245911: Fri Jan 25 19:59:21 CET 2013     xxx@xxx.xxx.xxx:/usr/obj/usr/src/sys/XXX  amd64
>Description:
graphics/geos is at version 3.3.3 from 2012-04-01. The newest version 3.3.7 from 2013-01-22 brings in a lot of bug fixes and improvements.

>How-To-Repeat:

>Fix:
The following small patch should update the port to the newest version. This should work on all platforms (only testet on amd64).

Their remains a problem with option RUBY enabled. This breaks the build.

Patch attached with submission follows:

diff -Naur geos.orig/Makefile geos/Makefile
--- geos.orig/Makefile	2012-08-03 14:33:13.000000000 +0200
+++ geos/Makefile	2013-01-27 09:22:27.000000000 +0100
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	geos
-PORTVERSION=	3.3.3
+PORTVERSION=	3.3.7
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://download.osgeo.org/geos/
 
diff -Naur geos.orig/distinfo geos/distinfo
--- geos.orig/distinfo	2012-08-03 14:33:13.000000000 +0200
+++ geos/distinfo	2013-01-27 09:23:15.000000000 +0100
@@ -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 -Naur geos.orig/pkg-plist geos/pkg-plist
--- geos.orig/pkg-plist	2012-08-03 14:33:13.000000000 +0200
+++ geos/pkg-plist	2013-01-27 09:59:00.000000000 +0100
@@ -356,7 +356,7 @@
 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,6 @@
 lib/libgeos_c.la
 lib/libgeos_c.so
 lib/libgeos_c.so.8
-@dirrm lib/geos
 @dirrm include/geos/util
 @dirrm include/geos/simplify
 @dirrm include/geos/precision
@@ -410,10 +409,10 @@
 %%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_PHP%%lib/php/20100525/geos.so
+%%WITH_PHP%%@dirrmtry lib/php/20100525


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sun Jan 27 09:50:08 UTC 2013 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=175623 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: konstantin@saurbier.net
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/175623: [PATCH] graphics/geos: update to 3.3.7
Date: Sun, 27 Jan 2013 09:50:07 UT

 Maintainer of graphics/geos,
 
 Please note that PR ports/175623 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/175623
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
State-Changed-From-To: feedback->closed 
State-Changed-By: pawel 
State-Changed-When: Sat Feb 16 22:43:42 UTC 2013 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=175623 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/175623: commit references a PR
Date: Sat, 16 Feb 2013 22:43:44 +0000 (UTC)

 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 <rhurlin@gwdg.de>
   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 <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>
 
 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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
