aboutsummaryrefslogtreecommitdiff
path: root/graphics/proj
diff options
context:
space:
mode:
authorSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2016-04-30 15:39:03 +0000
committerSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2016-04-30 15:39:03 +0000
commit3989bbdb4b4ec520f3af9ceac63c0a870bb33405 (patch)
tree6ab29205008f5a9ab23f4b83598393e24276a014 /graphics/proj
parent450a9e34df18303d53acbfdf265b251434c7e9b8 (diff)
downloadports-3989bbdb4b4ec520f3af9ceac63c0a870bb33405.tar.gz
ports-3989bbdb4b4ec520f3af9ceac63c0a870bb33405.zip
- Update to 4.9.2
Changes: https://github.com/OSGeo/proj.4/blob/master/NEWS PR: 208512 Reported by: Darcy Buskermolen <darcy@dbitech.ca> Submitted by: Taoka Fumiyoshi <fmysh@iijmio-mail.jp> (maintainer)
Notes
Notes: svn path=/head/; revision=414347
Diffstat (limited to 'graphics/proj')
-rw-r--r--graphics/proj/Makefile2
-rw-r--r--graphics/proj/distinfo4
-rw-r--r--graphics/proj/files/patch-src-pj_mutex.c12
-rw-r--r--graphics/proj/pkg-plist21
4 files changed, 20 insertions, 19 deletions
diff --git a/graphics/proj/Makefile b/graphics/proj/Makefile
index aef61234977d..ab17690d6774 100644
--- a/graphics/proj/Makefile
+++ b/graphics/proj/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= proj
-PORTVERSION= 4.9.1
+PORTVERSION= 4.9.2
CATEGORIES= graphics geography
MASTER_SITES= ftp://ftp.remotesensing.org/proj/ \
http://download.osgeo.org/proj/
diff --git a/graphics/proj/distinfo b/graphics/proj/distinfo
index 149dcca5c700..1527aa167c6d 100644
--- a/graphics/proj/distinfo
+++ b/graphics/proj/distinfo
@@ -1,4 +1,4 @@
-SHA256 (proj-4.9.1.tar.gz) = fca0388f3f8bc5a1a803d2f6ff30017532367992b30cf144f2d39be88f36c319
-SIZE (proj-4.9.1.tar.gz) = 876386
+SHA256 (proj-4.9.2.tar.gz) = 60bf9ad1ed1c18158e652dfff97865ba6fb2b67f1511bc8dceae4b3c7e657796
+SIZE (proj-4.9.2.tar.gz) = 874816
SHA256 (proj-datumgrid-1.6RC1.zip) = 054e7b63b474926c79f25fbe5cd8760351e8d93e5a167b5473e993c01bb08866
SIZE (proj-datumgrid-1.6RC1.zip) = 2766762
diff --git a/graphics/proj/files/patch-src-pj_mutex.c b/graphics/proj/files/patch-src-pj_mutex.c
index 69a45a26a1f6..e0dd8112f0f8 100644
--- a/graphics/proj/files/patch-src-pj_mutex.c
+++ b/graphics/proj/files/patch-src-pj_mutex.c
@@ -1,13 +1,13 @@
---- 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 @@
+--- src/pj_mutex.c.orig 2015-09-10 13:41:24 UTC
++++ src/pj_mutex.c
+@@ -122,11 +122,7 @@ void pj_acquire_lock()
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
+-#ifdef HAVE_PTHREAD_MUTEX_RECURSIVE
pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE);
+-#else
+- pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE_NP);
-#endif
pthread_mutex_init(&pj_core_lock, &mutex_attr);
pj_core_lock_created = 1;
diff --git a/graphics/proj/pkg-plist b/graphics/proj/pkg-plist
index 6b84b75500f6..ce22ba18a93a 100644
--- a/graphics/proj/pkg-plist
+++ b/graphics/proj/pkg-plist
@@ -12,7 +12,7 @@ include/projects.h
lib/libproj.a
lib/libproj.so
lib/libproj.so.9
-lib/libproj.so.9.0.0
+lib/libproj.so.9.1.0
libdata/pkgconfig/proj.pc
man/man1/cs2cs.1.gz
man/man1/geod.1.gz
@@ -20,29 +20,30 @@ man/man1/proj.1.gz
man/man3/geodesic.3.gz
man/man3/pj_init.3.gz
%%DATADIR%%/CH
+%%DATADIR%%/FL
%%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