From owner-svn-ports-all@FreeBSD.ORG Mon Jun 15 13:03:20 2015 Return-Path: Delivered-To: svn-ports-all@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8973C17C; Mon, 15 Jun 2015 13:03:20 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 753ECD7E; Mon, 15 Jun 2015 13:03:20 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5FD3K7Q028780; Mon, 15 Jun 2015 13:03:20 GMT (envelope-from wen@FreeBSD.org) Received: (from wen@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5FD3C9s028700; Mon, 15 Jun 2015 13:03:12 GMT (envelope-from wen@FreeBSD.org) Message-Id: <201506151303.t5FD3C9s028700@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: wen set sender to wen@FreeBSD.org using -f From: Wen Heping Date: Mon, 15 Jun 2015 13:03:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r389704 - in head: astro/merkaartor astro/qlandkartegt converters/osm2pgsql databases/grass databases/postgis20 databases/postgis21 databases/pyspatialite databases/spatialite databases... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Jun 2015 13:03:20 -0000 Author: wen Date: Mon Jun 15 13:03:11 2015 New Revision: 389704 URL: https://svnweb.freebsd.org/changeset/ports/389704 Log: - Update graphics/proj to 4.9.1 - Bump PORTREVISION to chase the update of proj PR: 200434 Submitted by: wen@(myself) Approved by: maintainer(timeout, >20 days) Added: head/graphics/proj/files/ head/graphics/proj/files/patch-src-pj_mutex.c (contents, props changed) Modified: head/astro/merkaartor/Makefile head/astro/qlandkartegt/Makefile head/converters/osm2pgsql/Makefile head/databases/grass/Makefile head/databases/postgis20/Makefile head/databases/postgis21/Makefile head/databases/pyspatialite/Makefile head/databases/spatialite-tools/Makefile head/databases/spatialite/Makefile head/devel/shapelib/Makefile head/graphics/R-cran-rgdal/Makefile head/graphics/fpc-proj4/Makefile head/graphics/gdal/Makefile head/graphics/libgeotiff/Makefile head/graphics/librasterlite/Makefile head/graphics/librasterlite2/Makefile head/graphics/libreatlas/Makefile head/graphics/mapnik/Makefile head/graphics/mapserver/Makefile head/graphics/p5-Geo-Proj4/Makefile head/graphics/proj/Makefile head/graphics/proj/distinfo head/graphics/proj/pkg-plist head/graphics/qgis/Makefile head/math/octave-forge-octproj/Makefile head/math/saga/Makefile head/science/cdo/Makefile Modified: head/astro/merkaartor/Makefile ============================================================================== --- head/astro/merkaartor/Makefile Mon Jun 15 12:36:13 2015 (r389703) +++ head/astro/merkaartor/Makefile Mon Jun 15 13:03:11 2015 (r389704) @@ -3,7 +3,7 @@ PORTNAME= merkaartor PORTVERSION= 0.18.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= astro MASTER_SITES= http://merkaartor.be/attachments/download/301/ \ https://secure.ohos.nl/downloads/ Modified: head/astro/qlandkartegt/Makefile ============================================================================== --- head/astro/qlandkartegt/Makefile Mon Jun 15 12:36:13 2015 (r389703) +++ head/astro/qlandkartegt/Makefile Mon Jun 15 13:03:11 2015 (r389704) @@ -3,7 +3,7 @@ PORTNAME= qlandkartegt PORTVERSION= 1.7.6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= astro MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/QLandkarte%20GT%20${PORTVERSION} Modified: head/converters/osm2pgsql/Makefile ============================================================================== --- head/converters/osm2pgsql/Makefile Mon Jun 15 12:36:13 2015 (r389703) +++ head/converters/osm2pgsql/Makefile Mon Jun 15 13:03:11 2015 (r389704) @@ -3,6 +3,7 @@ PORTNAME= osm2pgsql PORTVERSION= 0.87.2 +PORTREVISION= 1 CATEGORIES= converters geography MAINTAINER= amdmi3@FreeBSD.org Modified: head/databases/grass/Makefile ============================================================================== --- head/databases/grass/Makefile Mon Jun 15 12:36:13 2015 (r389703) +++ head/databases/grass/Makefile Mon Jun 15 13:03:11 2015 (r389704) @@ -3,7 +3,7 @@ PORTNAME= grass PORTVERSION= 6.4.4 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 2 CATEGORIES= databases geography MASTER_SITES= http://grass.osgeo.org/%SUBDIR%/ \ Modified: head/databases/postgis20/Makefile ============================================================================== --- head/databases/postgis20/Makefile Mon Jun 15 12:36:13 2015 (r389703) +++ head/databases/postgis20/Makefile Mon Jun 15 13:03:11 2015 (r389704) @@ -2,6 +2,7 @@ PORTNAME= postgis PORTVERSION= 2.0.7 +PORTREVISION= 1 CATEGORIES= databases geography MASTER_SITES= http://download.osgeo.org/postgis/source/ PKGNAMESUFFIX= 20 Modified: head/databases/postgis21/Makefile ============================================================================== --- head/databases/postgis21/Makefile Mon Jun 15 12:36:13 2015 (r389703) +++ head/databases/postgis21/Makefile Mon Jun 15 13:03:11 2015 (r389704) @@ -2,6 +2,7 @@ PORTNAME= postgis PORTVERSION= 2.1.7 +PORTREVISION= 1 CATEGORIES= databases geography MASTER_SITES= http://download.osgeo.org/postgis/source/ Modified: head/databases/pyspatialite/Makefile ============================================================================== --- head/databases/pyspatialite/Makefile Mon Jun 15 12:36:13 2015 (r389703) +++ head/databases/pyspatialite/Makefile Mon Jun 15 13:03:11 2015 (r389704) @@ -3,7 +3,7 @@ PORTNAME= pyspatialite PORTVERSION= 3.0.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= databases python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: head/databases/spatialite-tools/Makefile ============================================================================== --- head/databases/spatialite-tools/Makefile Mon Jun 15 12:36:13 2015 (r389703) +++ head/databases/spatialite-tools/Makefile Mon Jun 15 13:03:11 2015 (r389704) @@ -2,6 +2,7 @@ PORTNAME= spatialite-tools PORTVERSION= 4.2.0 +PORTREVISION= 1 CATEGORIES= databases geography MASTER_SITES= http://www.gaia-gis.it/gaia-sins/ Modified: head/databases/spatialite/Makefile ============================================================================== --- head/databases/spatialite/Makefile Mon Jun 15 12:36:13 2015 (r389703) +++ head/databases/spatialite/Makefile Mon Jun 15 13:03:11 2015 (r389704) @@ -3,6 +3,7 @@ PORTNAME= spatialite PORTVERSION= 4.2.0 +PORTREVISION= 1 CATEGORIES= databases geography MASTER_SITES= http://www.gaia-gis.it/gaia-sins/ DISTNAME= lib${PORTNAME}-${PORTVERSION} Modified: head/devel/shapelib/Makefile ============================================================================== --- head/devel/shapelib/Makefile Mon Jun 15 12:36:13 2015 (r389703) +++ head/devel/shapelib/Makefile Mon Jun 15 13:03:11 2015 (r389704) @@ -3,7 +3,7 @@ PORTNAME= shapelib PORTVERSION= 1.3.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= devel geography MASTER_SITES= http://download.osgeo.org/shapelib/ \ ftp://ftp.remotesensing.org/shapelib/ \ Modified: head/graphics/R-cran-rgdal/Makefile ============================================================================== --- head/graphics/R-cran-rgdal/Makefile Mon Jun 15 12:36:13 2015 (r389703) +++ head/graphics/R-cran-rgdal/Makefile Mon Jun 15 13:03:11 2015 (r389704) @@ -3,6 +3,7 @@ PORTNAME= rgdal DISTVERSION= 0.9-3 +PORTREVISION= 1 CATEGORIES= graphics DISTNAME= ${PORTNAME}_${DISTVERSION} Modified: head/graphics/fpc-proj4/Makefile ============================================================================== --- head/graphics/fpc-proj4/Makefile Mon Jun 15 12:36:13 2015 (r389703) +++ head/graphics/fpc-proj4/Makefile Mon Jun 15 13:03:11 2015 (r389704) @@ -1,7 +1,7 @@ # Created by: Christopher Key # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics lang PKGNAMESUFFIX= -proj4 Modified: head/graphics/gdal/Makefile ============================================================================== --- head/graphics/gdal/Makefile Mon Jun 15 12:36:13 2015 (r389703) +++ head/graphics/gdal/Makefile Mon Jun 15 13:03:11 2015 (r389704) @@ -3,7 +3,7 @@ PORTNAME= gdal PORTVERSION= 1.11.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics geography MASTER_SITES= http://download.osgeo.org/gdal/${PORTVERSION}/ \ ftp://ftp.remotesensing.org/pub/gdal/${PORTVERSION}/ \ Modified: head/graphics/libgeotiff/Makefile ============================================================================== --- head/graphics/libgeotiff/Makefile Mon Jun 15 12:36:13 2015 (r389703) +++ head/graphics/libgeotiff/Makefile Mon Jun 15 13:03:11 2015 (r389704) @@ -3,7 +3,7 @@ PORTNAME= libgeotiff PORTVERSION= 1.4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://download.osgeo.org/geotiff/libgeotiff/ \ ftp://ftp.remotesensing.org/geotiff/libgeotiff/ \ Modified: head/graphics/librasterlite/Makefile ============================================================================== --- head/graphics/librasterlite/Makefile Mon Jun 15 12:36:13 2015 (r389703) +++ head/graphics/librasterlite/Makefile Mon Jun 15 13:03:11 2015 (r389704) @@ -3,7 +3,7 @@ PORTNAME= librasterlite PORTVERSION= 1.1g -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics geography MASTER_SITES= http://www.gaia-gis.it/gaia-sins/librasterlite-sources/ Modified: head/graphics/librasterlite2/Makefile ============================================================================== --- head/graphics/librasterlite2/Makefile Mon Jun 15 12:36:13 2015 (r389703) +++ head/graphics/librasterlite2/Makefile Mon Jun 15 13:03:11 2015 (r389704) @@ -4,6 +4,7 @@ PORTNAME= librasterlite2 PORTVERSION= 1.0.0 DISTVERSIONSUFFIX=-rc0 +PORTREVISION= 1 CATEGORIES= graphics geography MASTER_SITES= http://www.gaia-gis.it/gaia-sins/ Modified: head/graphics/libreatlas/Makefile ============================================================================== --- head/graphics/libreatlas/Makefile Mon Jun 15 12:36:13 2015 (r389703) +++ head/graphics/libreatlas/Makefile Mon Jun 15 13:03:11 2015 (r389704) @@ -3,7 +3,7 @@ PORTNAME= libreatlas PORTVERSION= 1.0.0a -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES= graphics geography MASTER_SITES= http://www.gaia-gis.it/gaia-sins/ Modified: head/graphics/mapnik/Makefile ============================================================================== --- head/graphics/mapnik/Makefile Mon Jun 15 12:36:13 2015 (r389703) +++ head/graphics/mapnik/Makefile Mon Jun 15 13:03:11 2015 (r389704) @@ -4,7 +4,7 @@ PORTNAME= mapnik PORTVERSION= 2.2.0 DISTVERSIONPREFIX= v -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= graphics geography MASTER_SITES= http://mapnik.s3.amazonaws.com/dist/v${PORTVERSION}/ Modified: head/graphics/mapserver/Makefile ============================================================================== --- head/graphics/mapserver/Makefile Mon Jun 15 12:36:13 2015 (r389703) +++ head/graphics/mapserver/Makefile Mon Jun 15 13:03:11 2015 (r389704) @@ -3,7 +3,7 @@ PORTNAME= mapserver PORTVERSION= 6.4.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics www geography MASTER_SITES= http://download.osgeo.org/mapserver/ Modified: head/graphics/p5-Geo-Proj4/Makefile ============================================================================== --- head/graphics/p5-Geo-Proj4/Makefile Mon Jun 15 12:36:13 2015 (r389703) +++ head/graphics/p5-Geo-Proj4/Makefile Mon Jun 15 13:03:11 2015 (r389704) @@ -3,7 +3,7 @@ PORTNAME= Geo-Proj4 PORTVERSION= 1.04 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- Modified: head/graphics/proj/Makefile ============================================================================== --- head/graphics/proj/Makefile Mon Jun 15 12:36:13 2015 (r389703) +++ head/graphics/proj/Makefile Mon Jun 15 13:03:11 2015 (r389704) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= proj -PORTVERSION= 4.8.0 -PORTREVISION= 4 +PORTVERSION= 4.9.1 CATEGORIES= graphics geography MASTER_SITES= ftp://ftp.remotesensing.org/proj/ \ http://download.osgeo.org/proj/ @@ -13,18 +12,15 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= fmysh@iijmio-mail.jp COMMENT= Cartographic Projections library -CONFLICTS= proj4-[0-9]* +EXTRACT_DEPENDS= ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip -DATUM_GRID_FILES= proj-datumgrid-1.5.zip +DATUM_GRID_FILES= proj-datumgrid-1.6RC1.zip GNU_CONFIGURE= yes -USES= gmake libtool pathfix zip:infozip +USES= gmake libtool pathfix USE_LDCONFIG= yes post-extract: @${UNZIP_CMD} -q ${DISTDIR}/${DATUM_GRID_FILES} -d ${WRKSRC}/nad -post-install: - ${INSTALL_DATA} ${WRKSRC}/src/projects.h ${STAGEDIR}${PREFIX}/include - .include Modified: head/graphics/proj/distinfo ============================================================================== --- head/graphics/proj/distinfo Mon Jun 15 12:36:13 2015 (r389703) +++ head/graphics/proj/distinfo Mon Jun 15 13:03:11 2015 (r389704) @@ -1,4 +1,4 @@ -SHA256 (proj-4.8.0.zip) = b502df56db315e358d4e73a268426d7b0a17a7a5644d5339e8c270fa3c6c72ec -SIZE (proj-4.8.0.zip) = 901078 -SHA256 (proj-datumgrid-1.5.zip) = 723c4017d95d7a8abdf3bda4e18d3c15d79b00f9326d453da5fdf13f96c287db -SIZE (proj-datumgrid-1.5.zip) = 2250131 +SHA256 (proj-4.9.1.tar.gz) = fca0388f3f8bc5a1a803d2f6ff30017532367992b30cf144f2d39be88f36c319 +SIZE (proj-4.9.1.tar.gz) = 876386 +SHA256 (proj-datumgrid-1.6RC1.zip) = 054e7b63b474926c79f25fbe5cd8760351e8d93e5a167b5473e993c01bb08866 +SIZE (proj-datumgrid-1.6RC1.zip) = 2766762 Added: head/graphics/proj/files/patch-src-pj_mutex.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/proj/files/patch-src-pj_mutex.c Mon Jun 15 13:03:11 2015 (r389704) @@ -0,0 +1,14 @@ +--- src/pj_mutex.c.orig 2015-05-25 16:01:14.724346000 +0800 ++++ src/pj_mutex.c 2015-05-25 16:03:52.777784000 +0800 +@@ -118,11 +118,7 @@ + pthread_mutex_lock( &pj_precreated_lock); + + pthread_mutexattr_init(&mutex_attr); +-#ifndef PTHREAD_MUTEX_RECURSIVE +- pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE_NP); +-#else + pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE); +-#endif + pthread_mutex_init(&pj_core_lock, &mutex_attr); + pj_core_lock_created = 1; + Modified: head/graphics/proj/pkg-plist ============================================================================== --- head/graphics/proj/pkg-plist Mon Jun 15 12:36:13 2015 (r389703) +++ head/graphics/proj/pkg-plist Mon Jun 15 13:03:11 2015 (r389704) @@ -4,42 +4,45 @@ bin/invgeod bin/invproj bin/nad2bin bin/proj +include/geodesic.h +include/org_proj4_PJ.h include/org_proj4_Projections.h include/proj_api.h include/projects.h lib/libproj.a lib/libproj.so -lib/libproj.so.0 -lib/libproj.so.0.7.0 +lib/libproj.so.9 +lib/libproj.so.9.0.0 libdata/pkgconfig/proj.pc man/man1/cs2cs.1.gz man/man1/geod.1.gz man/man1/proj.1.gz +man/man3/geodesic.3.gz man/man3/pj_init.3.gz -%%DATADIR%%/FL +%%DATADIR%%/CH %%DATADIR%%/GL27 %%DATADIR%%/IGNF +%%DATADIR%%/epsg +%%DATADIR%%/esri +%%DATADIR%%/esri.extra +%%DATADIR%%/nad.lst +%%DATADIR%%/nad27 +%%DATADIR%%/nad83 +%%DATADIR%%/other.extra +%%DATADIR%%/world +%%DATADIR%%/FL %%DATADIR%%/MD %%DATADIR%%/TN %%DATADIR%%/WI %%DATADIR%%/WO %%DATADIR%%/alaska %%DATADIR%%/conus -%%DATADIR%%/epsg -%%DATADIR%%/esri -%%DATADIR%%/esri.extra %%DATADIR%%/hawaii -%%DATADIR%%/nad.lst -%%DATADIR%%/nad27 -%%DATADIR%%/nad83 %%DATADIR%%/ntf_r93.gsb %%DATADIR%%/ntv1_can.dat %%DATADIR%%/null %%DATADIR%%/nzgd2kgrid0005.gsb -%%DATADIR%%/other.extra -%%DATADIR%%/proj_def.dat %%DATADIR%%/prvi %%DATADIR%%/stgeorge %%DATADIR%%/stlrnc %%DATADIR%%/stpaul -%%DATADIR%%/world Modified: head/graphics/qgis/Makefile ============================================================================== --- head/graphics/qgis/Makefile Mon Jun 15 12:36:13 2015 (r389703) +++ head/graphics/qgis/Makefile Mon Jun 15 13:03:11 2015 (r389704) @@ -3,6 +3,7 @@ PORTNAME= qgis PORTVERSION= 2.8.2 +PORTREVISION= 1 CATEGORIES= graphics geography MAINTAINER= rhurlin@gwdg.de Modified: head/math/octave-forge-octproj/Makefile ============================================================================== --- head/math/octave-forge-octproj/Makefile Mon Jun 15 12:36:13 2015 (r389703) +++ head/math/octave-forge-octproj/Makefile Mon Jun 15 13:03:11 2015 (r389704) @@ -3,7 +3,7 @@ PORTNAME= octave-forge-octproj PORTVERSION= 1.1.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= math MAINTAINER= stephen@FreeBSD.org Modified: head/math/saga/Makefile ============================================================================== --- head/math/saga/Makefile Mon Jun 15 12:36:13 2015 (r389703) +++ head/math/saga/Makefile Mon Jun 15 13:03:11 2015 (r389704) @@ -3,6 +3,7 @@ PORTNAME= saga PORTVERSION= 2.1.4 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]*$//}/SAGA%20${PORTVERSION} DISTNAME= ${PORTNAME}_${PORTVERSION} Modified: head/science/cdo/Makefile ============================================================================== --- head/science/cdo/Makefile Mon Jun 15 12:36:13 2015 (r389703) +++ head/science/cdo/Makefile Mon Jun 15 13:03:11 2015 (r389704) @@ -3,6 +3,7 @@ PORTNAME= cdo PORTVERSION= 1.6.9 +PORTREVISION= 1 CATEGORIES= science MASTER_SITES= https://code.zmaw.de/attachments/download/10198/ \ LOCAL/sunpoet