- Update to 5.1.0

PR:		228754
Submitted by:	wen@(myself)
Approved by:	maintainer(timeout, > 30 days)

4 files changed, 19 insertions, 25 deletions

diff --git a/graphics/proj/Makefile b/graphics/proj/Makefile
index 49cede5884b4..f598da08efef 100644
--- a/graphics/proj/Makefile
+++ b/graphics/proj/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	proj
-PORTVERSION=	4.9.3
+PORTVERSION=	5.1.0
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://download.osgeo.org/proj/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DATUM_GRID_FILES}
@@ -14,7 +14,7 @@ COMMENT=	Cartographic Projections library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-DATUM_GRID_FILES=	proj-datumgrid-1.6.zip
+DATUM_GRID_FILES=	proj-datumgrid-1.7.zip
 
 GNU_CONFIGURE=	yes
 USES=		compiler gmake libtool pathfix
@@ -28,10 +28,6 @@ INSTALL_TARGET=	install-strip
 post-extract:
 	@${TAR} -xf ${DISTDIR}/${DATUM_GRID_FILES} -C ${WRKSRC}/nad
 
-pre-configure:
-	@${REINPLACE_CMD} -e 's|gcc|${COMPILER_TYPE}|' \
-		${WRKSRC}/cmake/Proj4SystemInfo.cmake
-
 post-install:
 .for m in 1 3
 	(cd ${STAGEDIR}${MANPREFIX}/man/man${m} && ${GZIP_CMD} ${FMAN${m}})
diff --git a/graphics/proj/distinfo b/graphics/proj/distinfo
index b74252b4351c..c1f91b2c2861 100644
--- a/graphics/proj/distinfo
+++ b/graphics/proj/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1483895414
-SHA256 (proj-4.9.3.tar.gz) = 6984542fea333488de5c82eea58d699e4aff4b359200a9971537cd7e047185f7
-SIZE (proj-4.9.3.tar.gz) = 921448
-SHA256 (proj-datumgrid-1.6.zip) = 054e7b63b474926c79f25fbe5cd8760351e8d93e5a167b5473e993c01bb08866
-SIZE (proj-datumgrid-1.6.zip) = 2766762
+TIMESTAMP = 1527753974
+SHA256 (proj-5.1.0.tar.gz) = 6b1379a53317d9b5b8c723c1dc7bf2e3a8eb22ceb46b8807a1ce48ef65685bb3
+SIZE (proj-5.1.0.tar.gz) = 1006324
+SHA256 (proj-datumgrid-1.7.zip) = ffcad4453fac3b4a13ca678ef343e688496e18019f35709ef03c5f200e9fb85a
+SIZE (proj-datumgrid-1.7.zip) = 6601627
diff --git a/graphics/proj/files/patch-src-pj_mutex.c b/graphics/proj/files/patch-src-pj_mutex.c
deleted file mode 100644
index 55346aef46f7..000000000000
--- a/graphics/proj/files/patch-src-pj_mutex.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/pj_mutex.c.orig	2016-08-29 18:47:58 UTC
-+++ src/pj_mutex.c
-@@ -124,7 +124,7 @@ void pj_acquire_lock()
-         pthread_mutex_lock( &pj_precreated_lock);
- 
-         pthread_mutexattr_init(&mutex_attr);
--#ifdef HAVE_PTHREAD_MUTEX_RECURSIVE
-+#if defined(HAVE_PTHREAD_MUTEX_RECURSIVE) || defined(__FreeBSD__)
-         pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE);
- #else
-         pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE_NP);
diff --git a/graphics/proj/pkg-plist b/graphics/proj/pkg-plist
index 19d402150e9a..da0525421a0e 100644
--- a/graphics/proj/pkg-plist
+++ b/graphics/proj/pkg-plist
@@ -1,34 +1,43 @@
+bin/cct
 bin/cs2cs
 bin/geod
+bin/gie
 bin/invgeod
 bin/invproj
 bin/nad2bin
 bin/proj
 include/geodesic.h
 include/org_proj4_PJ.h
-include/org_proj4_Projections.h
+include/proj.h
 include/proj_api.h
 include/projects.h
 lib/libproj.a
 lib/libproj.so
-lib/libproj.so.12
-lib/libproj.so.12.0.0
+lib/libproj.so.13
+lib/libproj.so.13.1.0
 libdata/pkgconfig/proj.pc
+man/man1/cct.1.gz
 man/man1/cs2cs.1.gz
 man/man1/geod.1.gz
+man/man1/gie.1.gz
 man/man1/proj.1.gz
 man/man3/geodesic.3.gz
 man/man3/pj_init.3.gz
+%%DATADIR%%/BETA2007.gsb
 %%DATADIR%%/CH
 %%DATADIR%%/FL
 %%DATADIR%%/GL27
 %%DATADIR%%/IGNF
+%%DATADIR%%/ITRF2000
+%%DATADIR%%/ITRF2008
+%%DATADIR%%/ITRF2014
 %%DATADIR%%/MD
 %%DATADIR%%/TN
 %%DATADIR%%/WI
 %%DATADIR%%/WO
 %%DATADIR%%/alaska
 %%DATADIR%%/conus
+%%DATADIR%%/egm96_15.gtx
 %%DATADIR%%/epsg
 %%DATADIR%%/esri
 %%DATADIR%%/esri.extra