- 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)
2015-06-15 13:03:11 +00:00
parent 641184f77f
commit 70e12eef45
28 changed files with 61 additions and 38 deletions
--- a/astro/merkaartor/Makefile
+++ b/astro/merkaartor/Makefile
@@ -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/
--- a/astro/qlandkartegt/Makefile
+++ b/astro/qlandkartegt/Makefile
@@ -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}

--- a/converters/osm2pgsql/Makefile
+++ b/converters/osm2pgsql/Makefile
@@ -3,6 +3,7 @@

 PORTNAME=	osm2pgsql
 PORTVERSION=	0.87.2
+PORTREVISION=	1
 CATEGORIES=	converters geography

 MAINTAINER=	amdmi3@FreeBSD.org
--- a/databases/grass/Makefile
+++ b/databases/grass/Makefile
@@ -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%/ \
--- a/databases/postgis20/Makefile
+++ b/databases/postgis20/Makefile
@@ -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
--- a/databases/postgis21/Makefile
+++ b/databases/postgis21/Makefile
@@ -2,6 +2,7 @@

 PORTNAME=	postgis
 PORTVERSION=	2.1.7
+PORTREVISION=	1
 CATEGORIES=	databases geography
 MASTER_SITES=	http://download.osgeo.org/postgis/source/

--- a/databases/pyspatialite/Makefile
+++ b/databases/pyspatialite/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	pyspatialite
 PORTVERSION=	3.0.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/databases/spatialite-tools/Makefile
+++ b/databases/spatialite-tools/Makefile
@@ -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/

--- a/databases/spatialite/Makefile
+++ b/databases/spatialite/Makefile
@@ -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}
--- a/devel/shapelib/Makefile
+++ b/devel/shapelib/Makefile
@@ -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/ \
--- a/graphics/R-cran-rgdal/Makefile
+++ b/graphics/R-cran-rgdal/Makefile
@@ -3,6 +3,7 @@

 PORTNAME=	rgdal
 DISTVERSION=	0.9-3
+PORTREVISION=	1
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${DISTVERSION}

--- a/graphics/fpc-proj4/Makefile
+++ b/graphics/fpc-proj4/Makefile
@@ -1,7 +1,7 @@
 # Created by: Christopher Key <cjk32@cam.ac.uk>
 # $FreeBSD$

-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-proj4

--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -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}/ \
--- a/graphics/libgeotiff/Makefile
+++ b/graphics/libgeotiff/Makefile
@@ -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/ \
--- a/graphics/librasterlite/Makefile
+++ b/graphics/librasterlite/Makefile
@@ -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/

--- a/graphics/librasterlite2/Makefile
+++ b/graphics/librasterlite2/Makefile
@@ -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/

--- a/graphics/libreatlas/Makefile
+++ b/graphics/libreatlas/Makefile
@@ -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/

--- a/graphics/mapnik/Makefile
+++ b/graphics/mapnik/Makefile
@@ -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}/

--- a/graphics/mapserver/Makefile
+++ b/graphics/mapserver/Makefile
@@ -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/

--- a/graphics/p5-Geo-Proj4/Makefile
+++ b/graphics/p5-Geo-Proj4/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	Geo-Proj4
 PORTVERSION=	1.04
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
--- a/graphics/proj/Makefile
+++ b/graphics/proj/Makefile
@@ -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 <bsd.port.mk>
--- a/graphics/proj/distinfo
+++ b/graphics/proj/distinfo
@@ -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
--- a/graphics/proj/files/patch-src-pj_mutex.c
+++ b/graphics/proj/files/patch-src-pj_mutex.c
@@ -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;
+ 
--- a/graphics/proj/pkg-plist
+++ b/graphics/proj/pkg-plist
@@ -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
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -3,6 +3,7 @@

 PORTNAME=	qgis
 PORTVERSION=	2.8.2
+PORTREVISION=	1
 CATEGORIES=	graphics geography

 MAINTAINER=	rhurlin@gwdg.de
--- a/math/octave-forge-octproj/Makefile
+++ b/math/octave-forge-octproj/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	octave-forge-octproj
 PORTVERSION=	1.1.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math

 MAINTAINER=	stephen@FreeBSD.org
--- a/math/saga/Makefile
+++ b/math/saga/Makefile
@@ -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}
--- a/science/cdo/Makefile
+++ b/science/cdo/Makefile
@@ -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