6 files changed, 4 insertions, 74 deletions

diff --git a/graphics/opencollada/Makefile b/graphics/opencollada/Makefile
index 2d690117a3d8..ca6aee671272 100644
--- a/graphics/opencollada/Makefile
+++ b/graphics/opencollada/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	opencollada
-PORTVERSION=	1.2.2.20131105
+PORTVERSION=	1.2.2.20140214
 PORTREVISION=	1
 CATEGORIES=	graphics devel
 
@@ -16,7 +16,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	KhronosGroup
 GH_PROJECT=	OpenCOLLADA
 GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	bd15211
+GH_COMMIT=	8dc9e4e
 
 WRKSRC=		${WRKDIR}/KhronosGroup-OpenCOLLADA-${GH_COMMIT}
 
diff --git a/graphics/opencollada/distinfo b/graphics/opencollada/distinfo
index d01aa4eea853..93d2fcf54f5e 100644
--- a/graphics/opencollada/distinfo
+++ b/graphics/opencollada/distinfo
@@ -1,2 +1,2 @@
-SHA256 (opencollada-1.2.2.20131105.tar.gz) = 01210cb260acd05b34068148d5056511682cdfcb695af0ebcc18b3b5d4c316d4
-SIZE (opencollada-1.2.2.20131105.tar.gz) = 11658878
+SHA256 (opencollada-1.2.2.20140214.tar.gz) = be54538b1a4ee195fc0de561f7a65780921a78fa8a7d96882ce3315688029b05
+SIZE (opencollada-1.2.2.20140214.tar.gz) = 11659545
diff --git a/graphics/opencollada/files/patch-COLLADABaseUtils_include_COLLADABUPlatform.h b/graphics/opencollada/files/patch-COLLADABaseUtils_include_COLLADABUPlatform.h
deleted file mode 100644
index 67f060de1aab..000000000000
--- a/graphics/opencollada/files/patch-COLLADABaseUtils_include_COLLADABUPlatform.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- COLLADABaseUtils/include/COLLADABUPlatform.h.orig	2013-11-16 10:53:05.000000000 +0100
-+++ COLLADABaseUtils/include/COLLADABUPlatform.h	2013-11-16 10:53:21.000000000 +0100
-@@ -23,7 +23,7 @@
- #  define COLLADABU_OS_WIN64
- #elif (defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__))
- #  define COLLADABU_OS_WIN32
--#elif defined(__linux__) || defined(__linux)
-+#elif defined(__linux__) || defined(__linux) || defined(__FreeBSD__)
- #  define COLLADABU_OS_LINUX
- #endif
- 
diff --git a/graphics/opencollada/files/patch-COLLADABaseUtils_include_COLLADABUhash_map.h b/graphics/opencollada/files/patch-COLLADABaseUtils_include_COLLADABUhash_map.h
deleted file mode 100644
index 1b7f5c9b757b..000000000000
--- a/graphics/opencollada/files/patch-COLLADABaseUtils_include_COLLADABUhash_map.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- COLLADABaseUtils/include/COLLADABUhash_map.h.orig	2013-11-16 18:46:18.000000000 +0100
-+++ COLLADABaseUtils/include/COLLADABUhash_map.h	2013-11-16 18:57:20.000000000 +0100
-@@ -60,6 +60,15 @@
-         #define COLLADABU_HASH_NAMESPACE_CLOSE }
-         #define COLLADABU_HASH_FUN hash
-     #endif
-+#elif defined(__FreeBSD__) && defined(_LIBCPP_VERSION)
-+    #include <unordered_map>
-+    #include <unordered_set>
-+    #define COLLADABU_HASH_MAP std::unordered_map
-+    #define COLLADABU_HASH_MULTIMAP std::unordered_multimap
-+    #define COLLADABU_HASH_SET std::unordered_set
-+    #define COLLADABU_HASH_NAMESPACE_OPEN std
-+    #define COLLADABU_HASH_NAMESPACE_CLOSE
-+    #define COLLADABU_HASH_FUN hash
- #else   // Linux or Mac
-     #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3)
-         #include <ext/hash_map>
diff --git a/graphics/opencollada/files/patch-common_libBuffer_include_CommonFWriteBufferFlusher.h b/graphics/opencollada/files/patch-common_libBuffer_include_CommonFWriteBufferFlusher.h
deleted file mode 100644
index f1245c6185d6..000000000000
--- a/graphics/opencollada/files/patch-common_libBuffer_include_CommonFWriteBufferFlusher.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- common/libBuffer/include/CommonFWriteBufferFlusher.h.orig	2013-11-16 10:47:19.000000000 +0100
-+++ common/libBuffer/include/CommonFWriteBufferFlusher.h	2013-11-16 10:47:48.000000000 +0100
-@@ -35,6 +35,9 @@
- #ifdef __GNUC__
- #   include <cstdlib> /* size_t */
- #   include <cstdio>  /* FILE */
-+#ifdef __FreeBSD__
-+#include <stdint.h> /* int64_t */
-+#endif
- #endif
- 
- #if (defined(__GNUC__) && !defined(__STRICT_ANSI__) && !defined(__MINGW32__)) || (__STDC_VERSION__ >= 199901L)
diff --git a/graphics/opencollada/files/patch-common_libBuffer_src_CommonFWriteBufferFlusher.cpp b/graphics/opencollada/files/patch-common_libBuffer_src_CommonFWriteBufferFlusher.cpp
deleted file mode 100644
index 6c034fcba9cb..000000000000
--- a/graphics/opencollada/files/patch-common_libBuffer_src_CommonFWriteBufferFlusher.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- common/libBuffer/src/CommonFWriteBufferFlusher.cpp.orig	2013-11-06 03:41:32.000000000 +0100
-+++ common/libBuffer/src/CommonFWriteBufferFlusher.cpp	2013-11-16 10:49:45.000000000 +0100
-@@ -89,7 +89,7 @@
- 		FilePosType currentPos = ftello64(mStream);
- #elif defined( _WIN32)
- 		FilePosType currentPos = _ftelli64(mStream);
--#elif defined (__APPLE__)
-+#elif defined (__APPLE__) || defined(__FreeBSD__)
- 		FilePosType currentPos = ftello(mStream);
- #else
- 		FilePosType currentPos = ftello64(mStream);
-@@ -114,7 +114,7 @@
-   			return (fseeko64(mStream,0,SEEK_END) == 0);
- #elif defined( _WIN32)
- 			return (_fseeki64(mStream, 0, SEEK_END) == 0);
--#elif defined (__APPLE__)
-+#elif defined (__APPLE__) || defined(__FreeBSD__)
- 			return (fseeko(mStream, 0, SEEK_END) == 0);
- #else
- 			return (fseeko64(mStream, 0, SEEK_END) == 0);
-@@ -134,7 +134,7 @@
-   				bool success = (fseeko64(mStream,pos,SEEK_SET) == 0);
- #elif defined( _WIN32)
- 				bool success = (_fseeki64(mStream, pos, SEEK_SET) == 0);
--#elif defined (__APPLE__)
-+#elif defined (__APPLE__) || defined(__FreeBSD__)
- 				bool success = (fseeko(mStream, pos, SEEK_SET) == 0);
- #else
- 				bool success = (fseeko64(mStream, pos, SEEK_SET) == 0);