4 files changed, 1 insertions, 35 deletions

diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile
index c201e3d374da..62b507aa13cc 100644
--- a/graphics/hugin/Makefile
+++ b/graphics/hugin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	hugin
 PORTVERSION=	2015.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
 
diff --git a/graphics/hugin/files/patch-src__foreign__vigra__vigra__cachedfileimage.hxx b/graphics/hugin/files/patch-src__foreign__vigra__vigra__cachedfileimage.hxx
deleted file mode 100644
index 00dd91263adf..000000000000
--- a/graphics/hugin/files/patch-src__foreign__vigra__vigra__cachedfileimage.hxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/foreign/vigra/vigra/cachedfileimage.hxx.orig	2012-11-12 13:33:18.000000000 +0200
-+++ src/foreign/vigra/vigra/cachedfileimage.hxx	2012-11-12 13:34:44.000000000 +0200
-@@ -555,7 +555,7 @@
- class NotifyingDirectionSelector<UnstridedArrayTag, T, Notify>
- {
- #ifdef __GNUC__
--friend class Notify::self_type;
-+friend class Notify::CachedFileImageIteratorBase;
- #else
- friend typename Notify::self_type;
- #endif
diff --git a/graphics/hugin/files/patch-src__foreign__zthread__include__zthread__Guard.h b/graphics/hugin/files/patch-src__foreign__zthread__include__zthread__Guard.h
deleted file mode 100644
index 6781c151fc09..000000000000
--- a/graphics/hugin/files/patch-src__foreign__zthread__include__zthread__Guard.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/foreign/zthread/include/zthread/Guard.h.orig      2011-12-02 18:02:37.253022000 +0100
-+++ src/foreign/zthread/include/zthread/Guard.h    2013-01-18 19:08:14.000000000 +0100
-@@ -108,7 +108,7 @@
-   }
-
-   template <class LockType>
--  static void createScope(LockHolder<LockType>& l, unsigned long ms) {
-+  static bool createScope(LockHolder<LockType>& l, unsigned long ms) {
-
-     if(Scope1::createScope(l, ms))
-       if(!Scope2::createScope(l, ms)) {
diff --git a/graphics/hugin/files/patch-src_hugin__base_lensdb_LensDB.cpp b/graphics/hugin/files/patch-src_hugin__base_lensdb_LensDB.cpp
deleted file mode 100644
index 12b3d2f5c0c6..000000000000
--- a/graphics/hugin/files/patch-src_hugin__base_lensdb_LensDB.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/hugin_base/lensdb/LensDB.cpp.orig	2015-03-30 06:14:16 UTC
-+++ src/hugin_base/lensdb/LensDB.cpp
-@@ -627,7 +627,9 @@ bool LensDB::GetDistortion(double focal,
-                 break;
-             case LF_DIST_MODEL_NONE:
-             case LF_DIST_MODEL_POLY5:
-+#if LF_VERSION_MAJOR == 0 && LF_VERSION_MINOR < 3
-             case LF_DIST_MODEL_FOV1:
-+#endif
-             default:
-                 return false;
-                 break;