From b2dd2667ca05425513fc70430a5dac8c80e02277 Mon Sep 17 00:00:00 2001
From: Volker Grabsch <vog@notjusthosting.com>
Date: Sun, 4 Oct 2009 00:01:52 +0200
Subject: update version of package proj

---
 src/proj-win32.patch | 33 +++++++++++++++++++++++++++++++++
 src/proj.mk          |  4 ++--
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 src/proj-win32.patch

diff --git a/src/proj-win32.patch b/src/proj-win32.patch
new file mode 100644
index 0000000..e49c3af
--- /dev/null
+++ b/src/proj-win32.patch
@@ -0,0 +1,33 @@
+Copyright (C) 2009  Volker Grabsch
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject
+to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+diff -ru proj-4.7.0.orig/src/pj_mutex.c proj-4.7.0/src/pj_mutex.c
+--- proj-4.7.0.orig/src/pj_mutex.c	2009-09-23 21:03:26.000000000 +0200
++++ proj-4.7.0/src/pj_mutex.c	2009-10-03 23:32:03.000000000 +0200
+@@ -37,7 +37,7 @@
+ #include <proj_api.h>
+ #endif
+ 
+-#ifdef _WIN32
++#if defined(_WIN32) && !defined(MUTEX_pthread)
+ #  define MUTEX_win32
+ #endif
+ 
diff --git a/src/proj.mk b/src/proj.mk
index 950a325..82dbc93 100644
--- a/src/proj.mk
+++ b/src/proj.mk
@@ -22,8 +22,8 @@
 # proj
 PKG             := proj
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.6.1
-$(PKG)_CHECKSUM := ddfdad6cba28af5f91b14fd6690bd22bbbc79390
+$(PKG)_VERSION  := 4.7.0
+$(PKG)_CHECKSUM := bfe59b8dc1ea0c57e1426c37ff2b238fea66acd7
 $(PKG)_SUBDIR   := proj-$($(PKG)_VERSION)
 $(PKG)_FILE     := proj-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://trac.osgeo.org/proj/
-- 
cgit v0.12