From owner-svn-ports-head@freebsd.org  Thu Feb  9 18:20:05 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A9C9ECD3F5B;
 Thu,  9 Feb 2017 18:20:05 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6A8E41B86;
 Thu,  9 Feb 2017 18:20:05 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v19IK4lH093712;
 Thu, 9 Feb 2017 18:20:04 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v19IK41U093710;
 Thu, 9 Feb 2017 18:20:04 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201702091820.v19IK41U093710@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Thu, 9 Feb 2017 18:20:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r433764 - in head/graphics/geos35: . files
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.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Feb 2017 18:20:05 -0000

Author: amdmi3
Date: Thu Feb  9 18:20:04 2017
New Revision: 433764
URL: https://svnweb.freebsd.org/changeset/ports/433764

Log:
  - Update comment
  - Add forgotten geos-config patch
  - Remove unused configure argument

Added:
  head/graphics/geos35/files/
  head/graphics/geos35/files/patch-tools_geos-config.in   (contents, props changed)
Modified:
  head/graphics/geos35/Makefile

Modified: head/graphics/geos35/Makefile
==============================================================================
--- head/graphics/geos35/Makefile	Thu Feb  9 18:16:26 2017	(r433763)
+++ head/graphics/geos35/Makefile	Thu Feb  9 18:20:04 2017	(r433764)
@@ -3,20 +3,19 @@
 
 PORTNAME=	geos
 PORTVERSION=	3.5.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://download.osgeo.org/geos/ \
 		LOCAL/sunpoet
 PKGNAMESUFFIX=	35
 
 MAINTAINER=	amdmi3@FreeBSD.org
-COMMENT=	GEOS implements all the OpenGIS "Simple Features for SQL"
+COMMENT=	GEOS implements all the OpenGIS "Simple Features for SQL" (legacy)
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-CONFIGURE_ARGS=	--program-suffix=35 \
-		ac_cv_path_SWIG=${LOCALBASE}/bin/swig3.0
+CONFIGURE_ARGS=	--program-suffix=35
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check

Added: head/graphics/geos35/files/patch-tools_geos-config.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/geos35/files/patch-tools_geos-config.in	Thu Feb  9 18:20:04 2017	(r433764)
@@ -0,0 +1,49 @@
+--- tools/geos-config.in.orig	2015-08-14 18:23:15 UTC
++++ tools/geos-config.in
+@@ -6,7 +6,7 @@ libdir=@libdir@
+ usage()
+ {
+     cat <<EOF
+-Usage: geos-config [OPTIONS]
++Usage: geos35-config [OPTIONS]
+ Options:
+      [--prefix]
+      [--version]
+@@ -38,30 +38,30 @@ case $1 in
+     echo @VERSION@
+      ;;
+     --cflags)
+-    echo -I${prefix}/include 
++    echo -I${prefix}/include/geos35
+       ;;
+     --libs)
+       # TODO: make an alias for --clibs
+       # see http://trac.osgeo.org/geos/ticket/497
+-      echo -L${libdir} -lgeos
++      echo -L${libdir} -lgeos35
+       ;;
+     --clibs)
+-      echo -L${libdir} -lgeos_c
++      echo -L${libdir} -lgeos_c35
+       ;;
+     --cclibs)
+-      echo -L${libdir} -lgeos
++      echo -L${libdir} -lgeos35
+       ;;
+     --static-clibs)
+-      echo -L${libdir} -lgeos_c -lgeos -m
++      echo -L${libdir} -lgeos_c35 -lgeos -m
+       ;;
+     --static-cclibs)
+-      echo -L${libdir} -lgeos -m
++      echo -L${libdir} -lgeos35 -m
+       ;;
+     --ldflags)
+       echo -L${libdir}
+       ;;
+     --includes)
+-      echo ${prefix}/include
++      echo ${prefix}/include/geos35
+       ;;
+     --jtsport)
+     echo @JTS_PORT@