3 files changed, 66 insertions, 2 deletions
diff --git a/graphics/enblend-enfuse/patches/patch-ad b/graphics/enblend-enfuse/patches/patch-ad
index 0e2ef89ba27..6b463a24961 100644
--- a/graphics/enblend-enfuse/patches/patch-ad
+++ b/graphics/enblend-enfuse/patches/patch-ad
@@ -1,8 +1,28 @@
-$NetBSD: patch-ad,v 1.1 2010/05/15 05:47:58 adam Exp $
+$NetBSD: patch-ad,v 1.2 2010/12/14 18:26:35 adam Exp $
 
 --- configure.orig	2009-12-20 15:40:28.000000000 +0000
 +++ configure
-@@ -14111,11 +14107,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -5533,10 +5533,6 @@ echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ 
+-if test "x$GXX" = xyes; then
+-    # Fixes SourceForge bug id 2121647 on some systems with newer GCCs.
+-    CXXFLAGS="$CXXFLAGS --param inline-unit-growth=60"
+-fi
+ 
+ 
+ 
+@@ -14030,7 +14030,7 @@ if test "x$enable_debug" = "xyes" \
+ echo "${ECHO_T}yes" >&6; }
+     enable_debug=yes
+ else
+-    CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG -Wall"
++    CXXFLAGS="$CXXFLAGS -DNDEBUG -Wall"
+     { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+     enable_debug=no
+@@ -14111,11 +14111,11 @@ cat >>conftest.$ac_ext <<_ACEOF
  #ifdef __cplusplus
  extern "C"
  #endif
diff --git a/graphics/enblend-enfuse/patches/patch-af b/graphics/enblend-enfuse/patches/patch-af
new file mode 100644
index 00000000000..11b2b15d9cf
--- /dev/null
+++ b/graphics/enblend-enfuse/patches/patch-af
@@ -0,0 +1,22 @@
+$NetBSD: patch-af,v 1.1 2010/12/14 18:26:35 adam Exp $
+
+--- src/anneal.h.orig	2010-10-30 19:43:51.000000000 +0000
++++ src/anneal.h
+@@ -656,14 +656,14 @@ protected:
+ 
+     bool segmentIntersect(const Point2D& l1a, const Point2D& l1b,
+                           const Point2D& l2a, const Point2D& l2b) const {
+-        const int denom =
++        int denom =
+             (l2b.y - l2a.y) * (l1b.x - l1a.x) - (l2b.x - l2a.x) * (l1b.y - l1a.y);
+         if (denom == 0) {
+             return false;       // lines are parallel or coincident
+         }
+-        const int uaNum =
++        int uaNum =
+             (l2b.x - l2a.x) * (l1a.y - l2a.y) - (l2b.y - l2a.y) * (l1a.x - l2a.x);
+-        const int ubNum =
++        int ubNum =
+             (l1b.x - l1a.x) * (l1a.y - l2a.y) - (l1b.y - l1a.y) * (l1a.x - l2a.x);
+         if (denom < 0) {
+             uaNum *= -1;
diff --git a/graphics/enblend-enfuse/patches/patch-ag b/graphics/enblend-enfuse/patches/patch-ag
new file mode 100644
index 00000000000..0c785b20b42
--- /dev/null
+++ b/graphics/enblend-enfuse/patches/patch-ag
@@ -0,0 +1,22 @@
+$NetBSD: patch-ag,v 1.1 2010/12/14 18:26:35 adam Exp $
+
+--- include/vigra/cachedfileimage.hxx.orig	2010-10-30 19:45:49.000000000 +0000
++++ include/vigra/cachedfileimage.hxx
+@@ -556,7 +556,7 @@ class NotifyingDirectionSelector;
+ template <class T, class Notify>
+ class NotifyingDirectionSelector<UnstridedArrayTag, T, Notify>
+ {
+-#ifdef __GNUC__
++#if defined(__GNUC__) && !defined(__clang__)
+ friend class Notify::self_type;
+ #else
+ friend typename Notify::self_type;
+@@ -602,7 +602,7 @@ private:
+ 
+ template <class T, class Notify>
+ class NotifyingDirectionSelector<StridedArrayTag, T, Notify> {
+-#ifdef __GNUC__
++#if defined(__GNUC__) && !defined(__clang__)
+ friend class Notify::self_type;
+ #else
+ friend typename Notify::self_type;