Mon May 5 03:56:02 UTC 2014

92 files changed, 1616 insertions, 408 deletions

diff --git a/community/agg/0001-Fix-non-terminating-loop-conditions-when-len-1.patch b/community/agg/0001-Fix-non-terminating-loop-conditions-when-len-1.patch
new file mode 100644
index 000000000..eaf0467fb
--- /dev/null
+++ b/community/agg/0001-Fix-non-terminating-loop-conditions-when-len-1.patch
@@ -0,0 +1,81 @@
+From efd33aad5e69f36ab343b1f28839a55db4538104 Mon Sep 17 00:00:00 2001
+From: Tom Hughes <tom@compton.nu>
+Date: Sun, 19 May 2013 10:55:37 +0100
+Subject: [PATCH 01/15] Fix non-terminating loop conditions when len=1
+
+-   while(abs(sx - lp.x1) + abs(sy - lp.y1) > lp2.len)
++   while(abs(sx - lp.x1) + abs(sy - lp.y1) > 1 + lp2.len)
+    {
+        sx = (lp.x1 + sx) >> 1;
+        sy = (lp.y1 + sy) >> 1;
+    }
+---
+ include/agg_renderer_outline_aa.h    | 8 ++++----
+ include/agg_renderer_outline_image.h | 4 ++--
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/include/agg_renderer_outline_aa.h b/include/agg_renderer_outline_aa.h
+index ce25a2e..cb2aa00 100644
+--- a/include/agg_renderer_outline_aa.h
++++ b/include/agg_renderer_outline_aa.h
+@@ -1659,7 +1659,7 @@ namespace agg
+                         }
+                         else
+                         {
+-                            while(abs(sx - lp.x1) + abs(sy - lp.y1) > lp2.len)
++                            while(abs(sx - lp.x1) + abs(sy - lp.y1) > 1 + lp2.len)
+                             {
+                                 sx = (lp.x1 + sx) >> 1;
+                                 sy = (lp.y1 + sy) >> 1;
+@@ -1726,7 +1726,7 @@ namespace agg
+                         }
+                         else
+                         {
+-                            while(abs(ex - lp.x2) + abs(ey - lp.y2) > lp2.len)
++                            while(abs(ex - lp.x2) + abs(ey - lp.y2) > 1 + lp2.len)
+                             {
+                                 ex = (lp.x2 + ex) >> 1;
+                                 ey = (lp.y2 + ey) >> 1;
+@@ -1798,7 +1798,7 @@ namespace agg
+                         }
+                         else
+                         {
+-                            while(abs(sx - lp.x1) + abs(sy - lp.y1) > lp2.len)
++                            while(abs(sx - lp.x1) + abs(sy - lp.y1) > 1 + lp2.len)
+                             {
+                                 sx = (lp.x1 + sx) >> 1;
+                                 sy = (lp.y1 + sy) >> 1;
+@@ -1811,7 +1811,7 @@ namespace agg
+                         }
+                         else
+                         {
+-                            while(abs(ex - lp.x2) + abs(ey - lp.y2) > lp2.len)
++                            while(abs(ex - lp.x2) + abs(ey - lp.y2) > 1 + lp2.len)
+                             {
+                                 ex = (lp.x2 + ex) >> 1;
+                                 ey = (lp.y2 + ey) >> 1;
+diff --git a/include/agg_renderer_outline_image.h b/include/agg_renderer_outline_image.h
+index fbfac10..66d2b9a 100644
+--- a/include/agg_renderer_outline_image.h
++++ b/include/agg_renderer_outline_image.h
+@@ -969,7 +969,7 @@ namespace agg
+                         }
+                         else
+                         {
+-                            while(abs(sx - lp.x1) + abs(sy - lp.y1) > lp2.len)
++                            while(abs(sx - lp.x1) + abs(sy - lp.y1) > 1 + lp2.len)
+                             {
+                                 sx = (lp.x1 + sx) >> 1;
+                                 sy = (lp.y1 + sy) >> 1;
+@@ -982,7 +982,7 @@ namespace agg
+                         }
+                         else
+                         {
+-                            while(abs(ex - lp.x2) + abs(ey - lp.y2) > lp2.len)
++                            while(abs(ex - lp.x2) + abs(ey - lp.y2) > 1 + lp2.len)
+                             {
+                                 ex = (lp.x2 + ex) >> 1;
+                                 ey = (lp.y2 + ey) >> 1;
+-- 
+1.8.1.4
+
diff --git a/community/agg/0002-Cure-recursion-by-aborting-if-the-co-ordinates-are-t.patch b/community/agg/0002-Cure-recursion-by-aborting-if-the-co-ordinates-are-t.patch
new file mode 100644
index 000000000..4fe74341e
--- /dev/null
+++ b/community/agg/0002-Cure-recursion-by-aborting-if-the-co-ordinates-are-t.patch
@@ -0,0 +1,40 @@
+From e269fe9b62af6fe314cebe0ee7a6d6d1a4a84d1c Mon Sep 17 00:00:00 2001
+From: Tom Hughes <tom@compton.nu>
+Date: Sun, 19 May 2013 11:03:26 +0100
+Subject: [PATCH 02/15] Cure recursion by aborting if the co-ordinates are to
+ big to handle
+
+---
+ include/agg_rasterizer_cells_aa.h | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/include/agg_rasterizer_cells_aa.h b/include/agg_rasterizer_cells_aa.h
+index d3bb138..3a616d9 100644
+--- a/include/agg_rasterizer_cells_aa.h
++++ b/include/agg_rasterizer_cells_aa.h
+@@ -40,7 +40,8 @@
+ #define AGG_RASTERIZER_CELLS_AA_INCLUDED
+ 
+ #include <string.h>
+-#include <math.h>
++#include <cstdlib>
++#include <limits>
+ #include "agg_math.h"
+ #include "agg_array.h"
+ 
+@@ -333,6 +334,12 @@ namespace agg
+         {
+             int cx = (x1 + x2) >> 1;
+             int cy = (y1 + y2) >> 1;
++
++            // Bail if values are so large they are likely to wrap
++            if ((std::abs(x1) >= std::numeric_limits<int>::max()/2) || (std::abs(y1) >= std::numeric_limits<int>::max()/2) ||
++                (std::abs(x2) >= std::numeric_limits<int>::max()/2) || (std::abs(y2) >= std::numeric_limits<int>::max()/2))
++                    return;
++
+             line(x1, y1, cx, cy);
+             line(cx, cy, x2, y2);
+         }
+-- 
+1.8.1.4
+
diff --git a/community/agg/0003-Get-coordinates-from-previous-vertex-if-last-command.patch b/community/agg/0003-Get-coordinates-from-previous-vertex-if-last-command.patch
new file mode 100644
index 000000000..b12684d18
--- /dev/null
+++ b/community/agg/0003-Get-coordinates-from-previous-vertex-if-last-command.patch
@@ -0,0 +1,30 @@
+From 032d5342430f4c5dfbc34a2817d67386a14fd51b Mon Sep 17 00:00:00 2001
+From: Tom Hughes <tom@compton.nu>
+Date: Sun, 19 May 2013 11:40:49 +0100
+Subject: [PATCH 03/15] Get coordinates from previous vertex if last command is
+ path_cmd_end_poly
+
+---
+ include/agg_path_storage.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/include/agg_path_storage.h b/include/agg_path_storage.h
+index 7be7393..8922fc8 100644
+--- a/include/agg_path_storage.h
++++ b/include/agg_path_storage.h
+@@ -878,6 +878,12 @@ namespace agg
+                 *x += x2;
+                 *y += y2;
+             }
++            else if (!is_stop(m_vertices.last_command()) &&
++                     is_vertex(m_vertices.prev_vertex(&x2, &y2)))
++            {
++                *x += x2;
++                *y += y2;
++            }
+         }
+     }
+ 
+-- 
+1.8.1.4
+
diff --git a/community/agg/0004-Make-rasterizer_outline_aa-ignore-close_polygon-when.patch b/community/agg/0004-Make-rasterizer_outline_aa-ignore-close_polygon-when.patch
new file mode 100644
index 000000000..0cecaf794
--- /dev/null
+++ b/community/agg/0004-Make-rasterizer_outline_aa-ignore-close_polygon-when.patch
@@ -0,0 +1,138 @@
+From b9c4b1c72b4ad6b24c37f402d3eec39ef393b0eb Mon Sep 17 00:00:00 2001
+From: Tom Hughes <tom@compton.nu>
+Date: Sun, 19 May 2013 14:17:43 +0100
+Subject: [PATCH 04/15] Make rasterizer_outline_aa ignore close_polygon when
+ vertex count < 3
+
+---
+ include/agg_rasterizer_outline_aa.h | 107 ++++++++++++++++++------------------
+ 1 file changed, 52 insertions(+), 55 deletions(-)
+
+diff --git a/include/agg_rasterizer_outline_aa.h b/include/agg_rasterizer_outline_aa.h
+index 4d6dd57..24301d5 100644
+--- a/include/agg_rasterizer_outline_aa.h
++++ b/include/agg_rasterizer_outline_aa.h
+@@ -333,68 +333,65 @@ namespace agg
+         int y2;
+         int lprev;
+ 
+-        if(close_polygon)
++        if(close_polygon && (m_src_vertices.size() >= 3))
+         {
+-            if(m_src_vertices.size() >= 3)
++            dv.idx = 2;
++
++            v     = &m_src_vertices[m_src_vertices.size() - 1];
++            x1    = v->x;
++            y1    = v->y;
++            lprev = v->len;
++
++            v  = &m_src_vertices[0];
++            x2 = v->x;
++            y2 = v->y;
++            dv.lcurr = v->len;
++            line_parameters prev(x1, y1, x2, y2, lprev);
++
++            v = &m_src_vertices[1];
++            dv.x1    = v->x;
++            dv.y1    = v->y;
++            dv.lnext = v->len;
++            dv.curr = line_parameters(x2, y2, dv.x1, dv.y1, dv.lcurr);
++
++            v = &m_src_vertices[dv.idx];
++            dv.x2 = v->x;
++            dv.y2 = v->y;
++            dv.next = line_parameters(dv.x1, dv.y1, dv.x2, dv.y2, dv.lnext);
++
++            dv.xb1 = 0;
++            dv.yb1 = 0;
++            dv.xb2 = 0;
++            dv.yb2 = 0;
++
++            switch(m_line_join)
+             {
+-                dv.idx = 2;
+-
+-                v     = &m_src_vertices[m_src_vertices.size() - 1];
+-                x1    = v->x;
+-                y1    = v->y;
+-                lprev = v->len;
+-
+-                v  = &m_src_vertices[0];
+-                x2 = v->x;
+-                y2 = v->y;
+-                dv.lcurr = v->len;
+-                line_parameters prev(x1, y1, x2, y2, lprev);
+-
+-                v = &m_src_vertices[1];
+-                dv.x1    = v->x;
+-                dv.y1    = v->y;
+-                dv.lnext = v->len;
+-                dv.curr = line_parameters(x2, y2, dv.x1, dv.y1, dv.lcurr);
+-
+-                v = &m_src_vertices[dv.idx];
+-                dv.x2 = v->x;
+-                dv.y2 = v->y;
+-                dv.next = line_parameters(dv.x1, dv.y1, dv.x2, dv.y2, dv.lnext);
+-
+-                dv.xb1 = 0;
+-                dv.yb1 = 0;
+-                dv.xb2 = 0;
+-                dv.yb2 = 0;
+-
+-                switch(m_line_join)
+-                {
+-                case outline_no_join:
+-                    dv.flags = 3;
+-                    break;
++            case outline_no_join:
++                dv.flags = 3;
++                break;
+ 
+-                case outline_miter_join:
+-                case outline_round_join:
+-                    dv.flags = 
+-                            (prev.diagonal_quadrant() == dv.curr.diagonal_quadrant()) |
+-                        ((dv.curr.diagonal_quadrant() == dv.next.diagonal_quadrant()) << 1);
+-                    break;
++            case outline_miter_join:
++            case outline_round_join:
++                dv.flags = 
++                        (prev.diagonal_quadrant() == dv.curr.diagonal_quadrant()) |
++                    ((dv.curr.diagonal_quadrant() == dv.next.diagonal_quadrant()) << 1);
++                break;
+ 
+-                case outline_miter_accurate_join:
+-                    dv.flags = 0;
+-                    break;
+-                }
++            case outline_miter_accurate_join:
++                dv.flags = 0;
++                break;
++            }
+ 
+-                if((dv.flags & 1) == 0 && m_line_join != outline_round_join)
+-                {
+-                    bisectrix(prev, dv.curr, &dv.xb1, &dv.yb1);
+-                }
++            if((dv.flags & 1) == 0 && m_line_join != outline_round_join)
++            {
++                bisectrix(prev, dv.curr, &dv.xb1, &dv.yb1);
++            }
+ 
+-                if((dv.flags & 2) == 0 && m_line_join != outline_round_join)
+-                {
+-                    bisectrix(dv.curr, dv.next, &dv.xb2, &dv.yb2);
+-                }
+-                draw(dv, 0, m_src_vertices.size());
++            if((dv.flags & 2) == 0 && m_line_join != outline_round_join)
++            {
++                bisectrix(dv.curr, dv.next, &dv.xb2, &dv.yb2);
+             }
++            draw(dv, 0, m_src_vertices.size());
+         }
+         else
+         {
+-- 
+1.8.1.4
+
diff --git a/community/agg/0005-Remove-VC-6-workaround.patch b/community/agg/0005-Remove-VC-6-workaround.patch
new file mode 100644
index 000000000..f38f7c40d
--- /dev/null
+++ b/community/agg/0005-Remove-VC-6-workaround.patch
@@ -0,0 +1,52 @@
+From b8c43fb0ba13af0cc2b1050f48f81d76d2fdf0c7 Mon Sep 17 00:00:00 2001
+From: Tom Hughes <tom@compton.nu>
+Date: Sun, 19 May 2013 15:04:05 +0100
+Subject: [PATCH 05/15] Remove VC++ 6 workaround
+
+---
+ include/agg_renderer_scanline.h | 29 +----------------------------
+ 1 file changed, 1 insertion(+), 28 deletions(-)
+
+diff --git a/include/agg_renderer_scanline.h b/include/agg_renderer_scanline.h
+index c3bb6f0..c27ca60 100644
+--- a/include/agg_renderer_scanline.h
++++ b/include/agg_renderer_scanline.h
+@@ -79,34 +79,7 @@ namespace agg
+             sl.reset(ras.min_x(), ras.max_x());
+             while(ras.sweep_scanline(sl))
+             {
+-                //render_scanline_aa_solid(sl, ren, ren_color);
+-
+-                // This code is equivalent to the above call (copy/paste). 
+-                // It's just a "manual" optimization for old compilers,
+-                // like Microsoft Visual C++ v6.0
+-                //-------------------------------
+-                int y = sl.y();
+-                unsigned num_spans = sl.num_spans();
+-                typename Scanline::const_iterator span = sl.begin();
+-
+-                for(;;)
+-                {
+-                    int x = span->x;
+-                    if(span->len > 0)
+-                    {
+-                        ren.blend_solid_hspan(x, y, (unsigned)span->len, 
+-                                              ren_color, 
+-                                              span->covers);
+-                    }
+-                    else
+-                    {
+-                        ren.blend_hline(x, y, (unsigned)(x - span->len - 1), 
+-                                        ren_color, 
+-                                        *(span->covers));
+-                    }
+-                    if(--num_spans == 0) break;
+-                    ++span;
+-                }
++                render_scanline_aa_solid(sl, ren, ren_color);
+             }
+         }
+     }
+-- 
+1.8.1.4
+
diff --git a/community/agg/0006-Implement-grain-merge-blending-mode-GIMP.patch b/community/agg/0006-Implement-grain-merge-blending-mode-GIMP.patch
new file mode 100644
index 000000000..f1e465b4d
--- /dev/null
+++ b/community/agg/0006-Implement-grain-merge-blending-mode-GIMP.patch
@@ -0,0 +1,85 @@
+From 9422570f4e099a834fc43619f7b2a7eb6b442e25 Mon Sep 17 00:00:00 2001
+From: Tom Hughes <tom@compton.nu>
+Date: Sun, 19 May 2013 15:31:01 +0100
+Subject: [PATCH 06/15] Implement grain-merge blending mode (GIMP)
+
+---
+ include/agg_pixfmt_rgba.h | 42 ++++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 40 insertions(+), 2 deletions(-)
+
+diff --git a/include/agg_pixfmt_rgba.h b/include/agg_pixfmt_rgba.h
+index 79d10dc..f576ce4 100644
+--- a/include/agg_pixfmt_rgba.h
++++ b/include/agg_pixfmt_rgba.h
+@@ -1401,9 +1401,46 @@ namespace agg
+         }
+     };
+ 
++    //================================================comp_op_rgba_grain_merge
++    template <typename ColorT, typename Order> struct comp_op_rgba_grain_merge
++    {
++        typedef ColorT color_type;
++        typedef Order order_type;
++        typedef typename color_type::value_type value_type;
++        typedef typename color_type::calc_type calc_type;
++        typedef typename color_type::long_type long_type;
++        enum base_scale_e
++        {
++            base_shift = color_type::base_shift,
++            base_mask  = color_type::base_mask
++        };
+ 
++        // E = I + M - 128
++        static AGG_INLINE void blend_pix(value_type* p,
++                                         unsigned sr, unsigned sg, unsigned sb,
++                                         unsigned sa, unsigned cover)
++        {
+ 
+-
++            if(cover < 255)
++            {
++                sr = (sr * cover + 255) >> 8;
++                sg = (sg * cover + 255) >> 8;
++                sb = (sb * cover + 255) >> 8;
++                sa = (sa * cover + 255) >> 8;
++            }
++            if(sa)
++            {
++                calc_type da = p[Order::A];
++                int dr = sr + p[Order::R] - 128;
++                int dg = sg + p[Order::G] - 128;
++                int db = sb + p[Order::B] - 128;
++                p[Order::R] = (value_type)(dr < 0 ? 0 : (dr > 255 ? 255 : dr));
++                p[Order::G] = (value_type)(dg < 0 ? 0 : (dg > 255 ? 255 : dg));
++                p[Order::B] = (value_type)(db < 0 ? 0 : (db > 255 ? 255 : db));
++                p[Order::A] = (value_type)(sa + da - ((sa * da + base_mask) >> base_shift));
++            }
++        }
++    };
+ 
+     //======================================================comp_op_table_rgba
+     template<class ColorT, class Order> struct comp_op_table_rgba
+@@ -1451,6 +1488,7 @@ namespace agg
+         comp_op_rgba_contrast   <ColorT,Order>::blend_pix,
+         comp_op_rgba_invert     <ColorT,Order>::blend_pix,
+         comp_op_rgba_invert_rgb <ColorT,Order>::blend_pix,
++        comp_op_rgba_grain_merge<ColorT,Order>::blend_pix,
+         0
+     };
+ 
+@@ -1486,6 +1524,7 @@ namespace agg
+         comp_op_contrast,      //----comp_op_contrast
+         comp_op_invert,        //----comp_op_invert
+         comp_op_invert_rgb,    //----comp_op_invert_rgb
++        comp_op_grain_merge,   //----comp_op_grain_merge
+ 
+         end_of_comp_op_e
+     };
+@@ -2908,4 +2947,3 @@ namespace agg
+ }
+ 
+ #endif
+-
+-- 
+1.8.1.4
+
diff --git a/community/agg/0007-Implement-grain-extract-blending-mode-GIMP.patch b/community/agg/0007-Implement-grain-extract-blending-mode-GIMP.patch
new file mode 100644
index 000000000..cafb36eb0
--- /dev/null
+++ b/community/agg/0007-Implement-grain-extract-blending-mode-GIMP.patch
@@ -0,0 +1,85 @@
+From abd440342e166a90d08610bf5b31d2a8357eafbe Mon Sep 17 00:00:00 2001
+From: Tom Hughes <tom@compton.nu>
+Date: Sun, 19 May 2013 15:43:18 +0100
+Subject: [PATCH 07/15] Implement grain-extract blending mode (GIMP)
+
+---
+ include/agg_pixfmt_rgba.h | 48 +++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 48 insertions(+)
+
+diff --git a/include/agg_pixfmt_rgba.h b/include/agg_pixfmt_rgba.h
+index f576ce4..42f0a05 100644
+--- a/include/agg_pixfmt_rgba.h
++++ b/include/agg_pixfmt_rgba.h
+@@ -1442,6 +1442,52 @@ namespace agg
+         }
+     };
+ 
++    //==============================================comp_op_rgba_grain_extract
++    template <typename ColorT, typename Order> struct comp_op_rgba_grain_extract
++    {
++        typedef ColorT color_type;
++        typedef Order order_type;
++        typedef typename color_type::value_type value_type;
++        typedef typename color_type::calc_type calc_type;
++        typedef typename color_type::long_type long_type;
++        enum base_scale_e
++        {
++            base_shift = color_type::base_shift,
++            base_mask  = color_type::base_mask
++        };
++
++        // E = I - M + 128
++        static AGG_INLINE void blend_pix(value_type* p,
++                                         unsigned sr, unsigned sg, unsigned sb,
++                                         unsigned sa, unsigned cover)
++        {
++            calc_type da = (p[Order::A] * sa + 255) >> 8;
++
++            int dr = p[Order::R] - sr + 128;
++            int dg = p[Order::G] - sg + 128;
++            int db = p[Order::B] - sb + 128;
++
++            dr = dr < 0 ? 0 : (dr > 255 ? 255 : dr);
++            dg = dg < 0 ? 0 : (dg > 255 ? 255 : dg);
++            db = db < 0 ? 0 : (db > 255 ? 255 : db);
++
++            p[Order::A] = da;
++
++            if(da < 255)
++            {
++                p[Order::R] = (dr * da + 255) >> 8;
++                p[Order::G] = (dg * da + 255) >> 8;
++                p[Order::B] = (db * da + 255) >> 8;
++            }
++            else
++            {
++                p[Order::R] = dr;
++                p[Order::G] = dg;
++                p[Order::B] = db;
++            }
++        }
++    };
++
+     //======================================================comp_op_table_rgba
+     template<class ColorT, class Order> struct comp_op_table_rgba
+     {
+@@ -1489,6 +1535,7 @@ namespace agg
+         comp_op_rgba_invert     <ColorT,Order>::blend_pix,
+         comp_op_rgba_invert_rgb <ColorT,Order>::blend_pix,
+         comp_op_rgba_grain_merge<ColorT,Order>::blend_pix,
++        comp_op_rgba_grain_extract<ColorT,Order>::blend_pix,
+         0
+     };
+ 
+@@ -1525,6 +1572,7 @@ namespace agg
+         comp_op_invert,        //----comp_op_invert
+         comp_op_invert_rgb,    //----comp_op_invert_rgb
+         comp_op_grain_merge,   //----comp_op_grain_merge
++        comp_op_grain_extract, //----comp_op_grain_extract
+ 
+         end_of_comp_op_e
+     };
+-- 
+1.8.1.4
+
diff --git a/community/agg/0008-Declare-multiplication-and-division-operators-as-con.patch b/community/agg/0008-Declare-multiplication-and-division-operators-as-con.patch
new file mode 100644
index 000000000..0ed92ee6c
--- /dev/null
+++ b/community/agg/0008-Declare-multiplication-and-division-operators-as-con.patch
@@ -0,0 +1,36 @@
+From 2688af280836b95908d3cfd6915510d55de673b8 Mon Sep 17 00:00:00 2001
+From: Tom Hughes <tom@compton.nu>
+Date: Sun, 19 May 2013 16:15:01 +0100
+Subject: [PATCH 08/15] Declare multiplication and division operators as const
+
+---
+ include/agg_trans_affine.h | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/include/agg_trans_affine.h b/include/agg_trans_affine.h
+index a662099..2f602a0 100644
+--- a/include/agg_trans_affine.h
++++ b/include/agg_trans_affine.h
+@@ -216,15 +216,15 @@ namespace agg
+         }
+ 
+         // Multiply the matrix by another one and return
+-        // the result in a separete matrix.
+-        trans_affine operator * (const trans_affine& m)
++        // the result in a separate matrix.
++        trans_affine operator * (const trans_affine& m) const
+         {
+             return trans_affine(*this).multiply(m);
+         }
+ 
+         // Multiply the matrix by inverse of another one 
+-        // and return the result in a separete matrix.
+-        trans_affine operator / (const trans_affine& m)
++        // and return the result in a separate matrix.
++        trans_affine operator / (const trans_affine& m) const
+         {
+             return trans_affine(*this).multiply_inv(m);
+         }
+-- 
+1.8.1.4
+
diff --git a/community/agg/0009-Add-a-static-identity-transformation.patch b/community/agg/0009-Add-a-static-identity-transformation.patch
new file mode 100644
index 000000000..01555cb3a
--- /dev/null
+++ b/community/agg/0009-Add-a-static-identity-transformation.patch
@@ -0,0 +1,37 @@
+From be9ed90897bc43b4547a3a1f8046827caaf13b4c Mon Sep 17 00:00:00 2001
+From: Tom Hughes <tom@compton.nu>
+Date: Sun, 19 May 2013 16:15:36 +0100
+Subject: [PATCH 09/15] Add a static identity transformation
+
+---
+ include/agg_trans_affine.h | 1 +
+ src/agg_trans_affine.cpp   | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/include/agg_trans_affine.h b/include/agg_trans_affine.h
+index 2f602a0..67fe5ca 100644
+--- a/include/agg_trans_affine.h
++++ b/include/agg_trans_affine.h
+@@ -92,6 +92,7 @@ namespace agg
+     //----------------------------------------------------------------------
+     struct trans_affine
+     {
++        static const trans_affine identity;
+         double sx, shy, shx, sy, tx, ty;
+ 
+         //------------------------------------------ Construction
+diff --git a/src/agg_trans_affine.cpp b/src/agg_trans_affine.cpp
+index aca18c2..b3d9bc0 100644
+--- a/src/agg_trans_affine.cpp
++++ b/src/agg_trans_affine.cpp
+@@ -28,6 +28,7 @@
+ 
+ namespace agg
+ {
++    const trans_affine trans_affine::identity;
+ 
+     //------------------------------------------------------------------------
+     const trans_affine& trans_affine::parl_to_parl(const double* src, 
+-- 
+1.8.1.4
+
diff --git a/community/agg/0010-Add-renderer_scanline_aa_alpha.patch b/community/agg/0010-Add-renderer_scanline_aa_alpha.patch
new file mode 100644
index 000000000..b0be2583f
--- /dev/null
+++ b/community/agg/0010-Add-renderer_scanline_aa_alpha.patch
@@ -0,0 +1,193 @@
+From 749c8cd11e9e6f81e93ae5ce19258431722b6bdf Mon Sep 17 00:00:00 2001
+From: Tom Hughes <tom@compton.nu>
+Date: Sun, 19 May 2013 16:43:25 +0100
+Subject: [PATCH 10/15] Add renderer_scanline_aa_alpha
+
+---
+ include/agg_pixfmt_rgba.h       | 24 +++++++++++++-
+ include/agg_renderer_base.h     | 28 ++++++++++++++++
+ include/agg_renderer_scanline.h | 71 +++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 122 insertions(+), 1 deletion(-)
+
+diff --git a/include/agg_pixfmt_rgba.h b/include/agg_pixfmt_rgba.h
+index 42f0a05..6c4bc37 100644
+--- a/include/agg_pixfmt_rgba.h
++++ b/include/agg_pixfmt_rgba.h
+@@ -2247,7 +2247,6 @@ namespace agg
+         }
+ 
+ 
+-
+         //--------------------------------------------------------------------
+         void blend_color_vspan(int x, int y,
+                                unsigned len, 
+@@ -2751,6 +2750,29 @@ namespace agg
+         }
+ 
+         //--------------------------------------------------------------------
++        void blend_color_hspan_alpha(int x, int y, unsigned len,
++                                     const color_type* colors,
++                                     value_type alpha,
++                                     const int8u* covers,
++                                     int8u cover)
++        {
++            value_type* p = (value_type*)m_rbuf->row_ptr(x, y, len) + (x << 2);
++            do
++            {
++                blender_type::blend_pix(m_comp_op,
++                                        p,
++                                        (colors->r * alpha + 255) >> 8,
++                                        (colors->g * alpha + 255) >> 8,
++                                        (colors->b * alpha + 255) >> 8,
++                                        (colors->a * alpha + 255) >> 8,
++                                        covers ? *covers++ : cover);
++                p += 4;
++                ++colors;
++            }
++            while(--len);
++        }
++
++        //--------------------------------------------------------------------
+         void blend_color_vspan(int x, int y, unsigned len, 
+                                const color_type* colors, 
+                                const int8u* covers,
+diff --git a/include/agg_renderer_base.h b/include/agg_renderer_base.h
+index 1808944..25f07c3 100644
+--- a/include/agg_renderer_base.h
++++ b/include/agg_renderer_base.h
+@@ -37,6 +37,7 @@ namespace agg
+     public:
+         typedef PixelFormat pixfmt_type;
+         typedef typename pixfmt_type::color_type color_type;
++        typedef typename pixfmt_type::color_type::value_type value_type;
+         typedef typename pixfmt_type::row_data row_data;
+ 
+         //--------------------------------------------------------------------
+@@ -383,6 +384,33 @@ namespace agg
+         }
+ 
+         //--------------------------------------------------------------------
++        void blend_color_hspan_alpha(int x, int y, int len,
++                               const color_type* colors,
++                               value_type alpha,
++                               const cover_type* covers,
++                               cover_type cover = agg::cover_full)
++        {
++            if(y > ymax()) return;
++            if(y < ymin()) return;
++
++            if(x < xmin())
++            {
++                int d = xmin() - x;
++                len -= d;
++                if(len <= 0) return;
++                if(covers) covers += d;
++                colors += d;
++                x = xmin();
++            }
++            if(x + len > xmax())
++            {
++                len = xmax() - x + 1;
++                if(len <= 0) return;
++            }
++            m_ren->blend_color_hspan_alpha(x, y, len, colors, alpha,  covers, cover);
++        }
++
++        //--------------------------------------------------------------------
+         void blend_color_vspan(int x, int y, int len, 
+                                const color_type* colors, 
+                                const cover_type* covers,
+diff --git a/include/agg_renderer_scanline.h b/include/agg_renderer_scanline.h
+index c27ca60..4fcb557 100644
+--- a/include/agg_renderer_scanline.h
++++ b/include/agg_renderer_scanline.h
+@@ -156,6 +156,35 @@ namespace agg
+         }
+     }
+ 
++    //================================================render_scanline_aa_alpha
++    template<class Scanline, class BaseRenderer,
++             class SpanAllocator, class SpanGenerator>
++    void render_scanline_aa_alpha(const Scanline& sl, BaseRenderer& ren,
++                                  SpanAllocator& alloc, SpanGenerator& span_gen,
++                                  unsigned alpha)
++    {
++        int y = sl.y();
++
++        unsigned num_spans = sl.num_spans();
++        typename Scanline::const_iterator span = sl.begin();
++        for(;;)
++        {
++            int x = span->x;
++            int len = span->len;
++            const typename Scanline::cover_type* covers = span->covers;
++
++            if(len < 0) len = -len;
++            typename BaseRenderer::color_type* colors = alloc.allocate(len);
++            span_gen.generate(colors, x, y, len);
++            ren.blend_color_hspan_alpha(x, y, len, colors, alpha,
++                                  (span->len < 0) ? 0 : covers, *covers);
++
++            if(--num_spans == 0) break;
++            ++span;
++        }
++    }
++
++
+     //=====================================================render_scanlines_aa
+     template<class Rasterizer, class Scanline, class BaseRenderer, 
+              class SpanAllocator, class SpanGenerator>
+@@ -216,8 +245,50 @@ namespace agg
+     };
+ 
+ 
++    //==============================================renderer_scanline_aa_alpha
++    template<class BaseRenderer, class SpanAllocator, class SpanGenerator>
++    class renderer_scanline_aa_alpha
++    {
++    public:
++        typedef BaseRenderer  base_ren_type;
++        typedef SpanAllocator alloc_type;
++        typedef SpanGenerator span_gen_type;
+ 
++        //--------------------------------------------------------------------
++        renderer_scanline_aa_alpha() : m_ren(0), m_alloc(0), m_span_gen(0), m_alpha(1.0) {}
++        renderer_scanline_aa_alpha(base_ren_type& ren,
++                             alloc_type& alloc,
++                             span_gen_type& span_gen,
++                             unsigned alpha) :
++            m_ren(&ren),
++            m_alloc(&alloc),
++            m_span_gen(&span_gen),
++            m_alpha(alpha)
++        {}
++        void attach(base_ren_type& ren,
++                    alloc_type& alloc,
++                    span_gen_type& span_gen)
++        {
++            m_ren = &ren;
++            m_alloc = &alloc;
++            m_span_gen = &span_gen;
++        }
+ 
++        //--------------------------------------------------------------------
++        void prepare() { m_span_gen->prepare(); }
++
++        //--------------------------------------------------------------------
++        template<class Scanline> void render(const Scanline& sl)
++        {
++            render_scanline_aa_alpha(sl, *m_ren, *m_alloc, *m_span_gen, m_alpha);
++        }
++
++    private:
++        base_ren_type* m_ren;
++        alloc_type*    m_alloc;
++        span_gen_type* m_span_gen;
++        unsigned       m_alpha;
++    };
+ 
+ 
+     //===============================================render_scanline_bin_solid
+-- 
+1.8.1.4
+
diff --git a/community/agg/0011-Avoid-division-by-zero-in-color-burn-mode.patch b/community/agg/0011-Avoid-division-by-zero-in-color-burn-mode.patch
new file mode 100644
index 000000000..2a0d198fe
--- /dev/null
+++ b/community/agg/0011-Avoid-division-by-zero-in-color-burn-mode.patch
@@ -0,0 +1,58 @@
+From 0ec68d7f5695403eccac75025ba7f6f7ecf1814e Mon Sep 17 00:00:00 2001
+From: Tom Hughes <tom@compton.nu>
+Date: Sun, 19 May 2013 16:49:08 +0100
+Subject: [PATCH 11/15] Avoid division by zero in color-burn mode
+
+FIXME: re-work using latest math from http://www.w3.org/TR/SVGCompositing/
+---
+ include/agg_pixfmt_rgba.h | 21 ++++++++++++++++++---
+ 1 file changed, 18 insertions(+), 3 deletions(-)
+
+diff --git a/include/agg_pixfmt_rgba.h b/include/agg_pixfmt_rgba.h
+index 6c4bc37..5d6b511 100644
+--- a/include/agg_pixfmt_rgba.h
++++ b/include/agg_pixfmt_rgba.h
+@@ -1027,6 +1027,21 @@ namespace agg
+         //   Dca' = Sa.(Sca.Da + Dca.Sa - Sa.Da)/Sca + Sca.(1 - Da) + Dca.(1 - Sa)
+         // 
+         // Da'  = Sa + Da - Sa.Da 
++
++
++        // http://www.w3.org/TR/SVGCompositing/
++        // if Sca == 0 and Dca == Da
++        //   Dca' = Sa × Da + Sca × (1 - Da) + Dca × (1 - Sa)
++        //        = Sa × Da + Dca × (1 - Sa)
++        //        = Da = Dca
++        // otherwise if Sca == 0
++        //   Dca' = Sca × (1 - Da) + Dca × (1 - Sa)
++        //        = Dca × (1 - Sa)
++        // otherwise if Sca > 0
++        //   Dca' = Sa × Da - Sa × Da × min(1, (1 - Dca/Da) × Sa/Sca) + Sca × (1 - Da) + Dca × (1 - Sa)
++        //        = Sa × Da × (1 - min(1, (1 - Dca/Da) × Sa/Sca)) + Sca × (1 - Da) + Dca × (1 - Sa)
++
++        //   sa * da * (255 - std::min(255, (255 - p[0]/da)*(sa/(sc*sa)) +
+         static AGG_INLINE void blend_pix(value_type* p, 
+                                          unsigned sr, unsigned sg, unsigned sb, 
+                                          unsigned sa, unsigned cover)
+@@ -1056,15 +1071,15 @@ namespace agg
+ 
+                 p[Order::R] = (value_type)(((srda + drsa <= sada) ? 
+                     sr * d1a + dr * s1a :
+-                    sa * (srda + drsa - sada) / sr + sr * d1a + dr * s1a + base_mask) >> base_shift);
++                   (sr > 0 ? sa * (srda + drsa - sada) / sr + sr * d1a + dr * s1a + base_mask : 0)) >> base_shift);
+ 
+                 p[Order::G] = (value_type)(((sgda + dgsa <= sada) ? 
+                     sg * d1a + dg * s1a :
+-                    sa * (sgda + dgsa - sada) / sg + sg * d1a + dg * s1a + base_mask) >> base_shift);
++                   (sg > 0 ? sa * (sgda + dgsa - sada) / sg + sg * d1a + dg * s1a + base_mask : 0)) >> base_shift);
+ 
+                 p[Order::B] = (value_type)(((sbda + dbsa <= sada) ? 
+                     sb * d1a + db * s1a :
+-                    sa * (sbda + dbsa - sada) / sb + sb * d1a + db * s1a + base_mask) >> base_shift);
++                   (sb > 0 ? sa * (sbda + dbsa - sada) / sb + sb * d1a + db * s1a + base_mask : 0)) >> base_shift);
+ 
+                 p[Order::A] = (value_type)(sa + da - ((sa * da + base_mask) >> base_shift));
+             }
+-- 
+1.8.1.4
+
diff --git a/community/agg/0012-Avoid-pixel-artifacts-when-compositing.patch b/community/agg/0012-Avoid-pixel-artifacts-when-compositing.patch
new file mode 100644
index 000000000..b3e641e6f
--- /dev/null
+++ b/community/agg/0012-Avoid-pixel-artifacts-when-compositing.patch
@@ -0,0 +1,26 @@
+From bf0e0b71360cfbc690a29f4abe15d7b9b61b8479 Mon Sep 17 00:00:00 2001
+From: Tom Hughes <tom@compton.nu>
+Date: Sat, 22 Jun 2013 12:11:54 +0100
+Subject: [PATCH 12/15] Avoid pixel artifacts when compositing
+
+Change src_over alpha to avoid pixel artifacts by reordering computations.
+---
+ include/agg_pixfmt_rgba.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/agg_pixfmt_rgba.h b/include/agg_pixfmt_rgba.h
+index 5d6b511..bb255cd 100644
+--- a/include/agg_pixfmt_rgba.h
++++ b/include/agg_pixfmt_rgba.h
+@@ -346,7 +346,7 @@ namespace agg
+             p[Order::R] = (value_type)(sr + ((p[Order::R] * s1a + base_mask) >> base_shift));
+             p[Order::G] = (value_type)(sg + ((p[Order::G] * s1a + base_mask) >> base_shift));
+             p[Order::B] = (value_type)(sb + ((p[Order::B] * s1a + base_mask) >> base_shift));
+-            p[Order::A] = (value_type)(sa + p[Order::A] - ((sa * p[Order::A] + base_mask) >> base_shift));
++            p[Order::A] = (value_type)(sa + ((p[Order::A] * s1a + base_mask) >> base_shift));
+         }
+     };
+ 
+-- 
+1.8.1.4
+
diff --git a/community/agg/0013-Modify-agg-conv-classes-to-allow-access-to-the-origi.patch b/community/agg/0013-Modify-agg-conv-classes-to-allow-access-to-the-origi.patch
new file mode 100644
index 000000000..9deb90473
--- /dev/null
+++ b/community/agg/0013-Modify-agg-conv-classes-to-allow-access-to-the-origi.patch
@@ -0,0 +1,93 @@
+From 6f1ab5f4b470bcf4e7e72aac6e2f7f6ee3e7b424 Mon Sep 17 00:00:00 2001
+From: Tom Hughes <tom@compton.nu>
+Date: Sat, 22 Jun 2013 12:16:42 +0100
+Subject: [PATCH 13/15] Modify agg conv classes to allow access to the original
+ geometry type
+
+---
+ include/agg_conv_adaptor_vcgen.h | 2 ++
+ include/agg_conv_adaptor_vpgen.h | 1 +
+ include/agg_conv_clip_polygon.h  | 1 +
+ include/agg_conv_clip_polyline.h | 1 +
+ include/agg_conv_smooth_poly1.h  | 2 ++
+ 5 files changed, 7 insertions(+)
+
+diff --git a/include/agg_conv_adaptor_vcgen.h b/include/agg_conv_adaptor_vcgen.h
+index 7bd9b07..fef4579 100644
+--- a/include/agg_conv_adaptor_vcgen.h
++++ b/include/agg_conv_adaptor_vcgen.h
+@@ -38,6 +38,7 @@ namespace agg
+ 
+         void rewind(unsigned) {}
+         unsigned vertex(double*, double*) { return path_cmd_stop; }
++        unsigned type() const { return 0; }
+     };
+ 
+ 
+@@ -73,6 +74,7 @@ namespace agg
+         }
+ 
+         unsigned vertex(double* x, double* y);
++        unsigned type() const { return m_source->type(); }
+ 
+     private:
+         // Prohibit copying
+diff --git a/include/agg_conv_adaptor_vpgen.h b/include/agg_conv_adaptor_vpgen.h
+index dca9415..a39102d 100644
+--- a/include/agg_conv_adaptor_vpgen.h
++++ b/include/agg_conv_adaptor_vpgen.h
+@@ -42,6 +42,7 @@ namespace agg
+ 
+         void rewind(unsigned path_id);
+         unsigned vertex(double* x, double* y);
++        unsigned type() const { return m_source->type(); }
+ 
+     private:
+         conv_adaptor_vpgen(const conv_adaptor_vpgen<VertexSource, VPGen>&);
+diff --git a/include/agg_conv_clip_polygon.h b/include/agg_conv_clip_polygon.h
+index 3c34590..e417a7d 100644
+--- a/include/agg_conv_clip_polygon.h
++++ b/include/agg_conv_clip_polygon.h
+@@ -60,6 +60,7 @@ namespace agg
+         double y1() const { return base_type::vpgen().y1(); }
+         double x2() const { return base_type::vpgen().x2(); }
+         double y2() const { return base_type::vpgen().y2(); }
++        unsigned type() const { return base_type::type(); }
+ 
+     private:
+         conv_clip_polygon(const conv_clip_polygon<VertexSource>&);
+diff --git a/include/agg_conv_clip_polyline.h b/include/agg_conv_clip_polyline.h
+index d45067f..0de4b57 100644
+--- a/include/agg_conv_clip_polyline.h
++++ b/include/agg_conv_clip_polyline.h
+@@ -60,6 +60,7 @@ namespace agg
+         double y1() const { return base_type::vpgen().y1(); }
+         double x2() const { return base_type::vpgen().x2(); }
+         double y2() const { return base_type::vpgen().y2(); }
++        unsigned type() const { return base_type::type(); }
+ 
+     private:
+         conv_clip_polyline(const conv_clip_polyline<VertexSource>&);
+diff --git a/include/agg_conv_smooth_poly1.h b/include/agg_conv_smooth_poly1.h
+index 15f7f8d..0956c4e 100644
+--- a/include/agg_conv_smooth_poly1.h
++++ b/include/agg_conv_smooth_poly1.h
+@@ -48,6 +48,7 @@ namespace agg
+ 
+         void   smooth_value(double v) { base_type::generator().smooth_value(v); }
+         double smooth_value() const { return base_type::generator().smooth_value(); }
++        unsigned type() const { return base_type::type(); }
+ 
+     private:
+         conv_smooth_poly1(const conv_smooth_poly1<VertexSource>&);
+@@ -70,6 +71,7 @@ namespace agg
+ 
+         void   smooth_value(double v) { m_smooth.generator().smooth_value(v); }
+         double smooth_value() const { return m_smooth.generator().smooth_value(); }
++        unsigned type() const { return m_smooth.type(); }
+ 
+     private:
+         conv_smooth_poly1_curve(const conv_smooth_poly1_curve<VertexSource>&);
+-- 
+1.8.1.4
+
diff --git a/community/agg/0014-Avoid-potential-zero-division-resulting-in-nan-in-ag.patch b/community/agg/0014-Avoid-potential-zero-division-resulting-in-nan-in-ag.patch
new file mode 100644
index 000000000..547b0d218
--- /dev/null
+++ b/community/agg/0014-Avoid-potential-zero-division-resulting-in-nan-in-ag.patch
@@ -0,0 +1,30 @@
+From 6433a64f4cd41e88499386b0b7c7ae05d30683b8 Mon Sep 17 00:00:00 2001
+From: Tom Hughes <tom@compton.nu>
+Date: Sat, 22 Jun 2013 12:33:32 +0100
+Subject: [PATCH 14/15] Avoid potential zero division resulting in nan in
+ agg::gamma_linear
+
+---
+ include/agg_gamma_functions.h | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/include/agg_gamma_functions.h b/include/agg_gamma_functions.h
+index fa38a45..beb0c04 100644
+--- a/include/agg_gamma_functions.h
++++ b/include/agg_gamma_functions.h
+@@ -94,7 +94,11 @@ namespace agg
+         {
+             if(x < m_start) return 0.0;
+             if(x > m_end) return 1.0;
+-            return (x - m_start) / (m_end - m_start);
++            double delta = m_end - m_start;
++            // avoid nan from potential zero division
++            // https://github.com/mapnik/mapnik/issues/761
++            if (delta <= 0.0) return 0.0;
++            return (x - m_start) / delta;
+         }
+ 
+     private:
+-- 
+1.8.1.4
+
diff --git a/community/agg/0015-Ensure-first-value-in-the-gamma-table-is-always-zero.patch b/community/agg/0015-Ensure-first-value-in-the-gamma-table-is-always-zero.patch
new file mode 100644
index 000000000..6214bd62e
--- /dev/null
+++ b/community/agg/0015-Ensure-first-value-in-the-gamma-table-is-always-zero.patch
@@ -0,0 +1,24 @@
+From ca818d4dcd428c5560fc3c341fbaf427a7485e32 Mon Sep 17 00:00:00 2001
+From: Tom Hughes <tom@compton.nu>
+Date: Sat, 22 Jun 2013 12:34:37 +0100
+Subject: [PATCH 15/15] Ensure first value in the gamma table is always zero
+
+---
+ include/agg_gamma_functions.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/agg_gamma_functions.h b/include/agg_gamma_functions.h
+index beb0c04..b8eda52 100644
+--- a/include/agg_gamma_functions.h
++++ b/include/agg_gamma_functions.h
+@@ -49,6 +49,7 @@ namespace agg
+ 
+         double operator() (double x) const
+         {
++            if (x == 0.0) return 0.0;
+             return pow(x, m_gamma);
+         }
+ 
+-- 
+1.8.1.4
+
diff --git a/community/agg/PKGBUILD b/community/agg/PKGBUILD
index 0c235e835..8c5136ff2 100644
--- a/community/agg/PKGBUILD
+++ b/community/agg/PKGBUILD
@@ -1,36 +1,84 @@
-# $Id: PKGBUILD 107181 2014-03-14 08:12:44Z andrea $
+# $Id: PKGBUILD 110598 2014-05-04 04:26:44Z heftig $
 # Maintainer: Jonathan Conder <jonno dot conder at gmail dot com>
 
 pkgname=agg
 pkgver=2.5
-pkgrel=5
+pkgrel=6
 pkgdesc="A High Quality Rendering Engine for C++"
 arch=('i686' 'x86_64')
-url="http://www.antigrain.com/"
+url="http://pkgs.fedoraproject.org/cgit/agg.git"
 license=('GPL')
 depends=('gcc-libs' 'sdl' 'freetype2')
 provides=('antigrain')
 replaces=('antigrain')
-options=('!makeflags')
-source=("http://www.antigrain.com/${pkgname}-${pkgver}.tar.gz"
+source=("ftp://ftp.archlinux.org/other/community/agg/${pkgname}-free-${pkgver}.tar.gz"
         agg-2.4-depends.patch
         agg-2.5-pkgconfig.patch
-        autotools.patch)
-md5sums=('0229a488bc47be10a2fee6cf0b2febd6'
+        agg-2.5-autotools.patch
+        0001-Fix-non-terminating-loop-conditions-when-len-1.patch
+        0002-Cure-recursion-by-aborting-if-the-co-ordinates-are-t.patch
+        0003-Get-coordinates-from-previous-vertex-if-last-command.patch
+        0004-Make-rasterizer_outline_aa-ignore-close_polygon-when.patch
+        0005-Remove-VC-6-workaround.patch
+        0006-Implement-grain-merge-blending-mode-GIMP.patch
+        0007-Implement-grain-extract-blending-mode-GIMP.patch
+        0008-Declare-multiplication-and-division-operators-as-con.patch
+        0009-Add-a-static-identity-transformation.patch
+        0010-Add-renderer_scanline_aa_alpha.patch
+        0011-Avoid-division-by-zero-in-color-burn-mode.patch
+        0012-Avoid-pixel-artifacts-when-compositing.patch
+        0013-Modify-agg-conv-classes-to-allow-access-to-the-origi.patch
+        0014-Avoid-potential-zero-division-resulting-in-nan-in-ag.patch
+        0015-Ensure-first-value-in-the-gamma-table-is-always-zero.patch)
+md5sums=('d84c648bc2b57266e33d702c1af2a786'
          '22f8e48c137d25038181c86d5e40b110'
          '43a19a7b1564c591e56c8d09a0fd8da5'
-         'e042231955a8daee5f3cdfa4ee4e866a')
+         'e042231955a8daee5f3cdfa4ee4e866a'
+         '2f701b49c441f1b91694600ff9d219e4'
+         '9e46762241b223ff4c7fba36f82628fa'
+         'd7597bd1c17c5623b1af6b79c68986f4'
+         '97d25ec4d0571e74324a433f2fe5d11d'
+         'af7a447a4b0469cd263cf3e65a7464e6'
+         '30a1d8cd1b657b7b51655f2e5e888031'
+         'a7bd6df05c6504d9066f7a954f07baf6'
+         'b438aa60165cccb406e20b6e0f0267d2'
+         '6ce59e5aa2c993ef66aed9bae4345284'
+         '67bedac31a1e8d40da7bb32c84a6159d'
+         'fb8f3902a39fcb1f065fc46b72567869'
+         '02e7df597ce0174cb3f8c665bcc6e436'
+         '398c544671060b45b70ed24ada3285f4'
+         'da05a1ef008e2702d2b0ca379ea07e2a'
+         '703351fc0af2d5e21ec3d67fcf112d0d')
 
 prepare() {
   cd ${pkgname}-${pkgver}
-  patch -p1 -i "${srcdir}/agg-2.4-depends.patch"
-  patch -p1 -i "${srcdir}/agg-2.5-pkgconfig.patch"
-  patch -p0 -i "${srcdir}/autotools.patch"
+  patch -p1 -i ../agg-2.4-depends.patch
+  patch -p1 -i ../agg-2.5-pkgconfig.patch
+  patch -p0 -i ../agg-2.5-autotools.patch
+  patch -p1 -i ../0001-Fix-non-terminating-loop-conditions-when-len-1.patch
+  patch -p1 -i ../0002-Cure-recursion-by-aborting-if-the-co-ordinates-are-t.patch
+  patch -p1 -i ../0003-Get-coordinates-from-previous-vertex-if-last-command.patch
+  patch -p1 -i ../0004-Make-rasterizer_outline_aa-ignore-close_polygon-when.patch
+  patch -p1 -i ../0005-Remove-VC-6-workaround.patch
+  patch -p1 -i ../0006-Implement-grain-merge-blending-mode-GIMP.patch
+  patch -p1 -i ../0007-Implement-grain-extract-blending-mode-GIMP.patch
+  patch -p1 -i ../0008-Declare-multiplication-and-division-operators-as-con.patch
+  patch -p1 -i ../0009-Add-a-static-identity-transformation.patch
+  patch -p1 -i ../0010-Add-renderer_scanline_aa_alpha.patch
+  patch -p1 -i ../0011-Avoid-division-by-zero-in-color-burn-mode.patch
+  patch -p1 -i ../0012-Avoid-pixel-artifacts-when-compositing.patch
+  patch -p1 -i ../0013-Modify-agg-conv-classes-to-allow-access-to-the-origi.patch
+  patch -p1 -i ../0014-Avoid-potential-zero-division-resulting-in-nan-in-ag.patch
+  patch -p1 -i ../0015-Ensure-first-value-in-the-gamma-table-is-always-zero.patch
+  aclocal
+  autoheader
+  autoconf
+  libtoolize -f
+  automake --foreign -a -i
 }
 
 build() {
   cd ${pkgname}-${pkgver}
-  sh ./autogen.sh
   ./configure --prefix=/usr --disable-static
   make
 }
diff --git a/community/agg/autotools.patch b/community/agg/agg-2.5-autotools.patch
index b273477a3..b273477a3 100644
--- a/community/agg/autotools.patch
+++ b/community/agg/agg-2.5-autotools.patch
diff --git a/community/alex/PKGBUILD b/community/alex/PKGBUILD
index 9c2cdff22..befe89d13 100644
--- a/community/alex/PKGBUILD
+++ b/community/alex/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 102107 2013-12-05 10:44:35Z arodseth $
+# $Id: PKGBUILD 110605 2014-05-04 13:54:45Z td123 $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Vesa Kaihlavirta <vegai@iki.fi>
@@ -6,13 +6,13 @@
 
 pkgname=alex
 pkgver=3.1.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Lexical analyser generator for Haskell'
 arch=('x86_64' 'i686')
 url='http://hackage.haskell.org/package/alex'
 license=('custom:BSD3')
-depends=('gmp')
-makedepends=('ghc=7.6.3-1' 'haskell-quickcheck>=2' 'happy')
+depends=('gmp' 'libffi')
+makedepends=('ghc=7.8.2' 'haskell-quickcheck' 'happy' 'libffi')
 source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz")
 sha256sums=('8d41a6e72a016155f00c846f7146ab4b27fe9640668a4b592d6a9b856f970a92')
 
diff --git a/community/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch b/community/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch
deleted file mode 100644
index 1c6a7dd65..000000000
--- a/community/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 7d94bcd36eb1d5a2feae182fcb74f9d6ca439a80 Mon Sep 17 00:00:00 2001
-From: Thomas Dziedzic <gostrc@gmail.com>
-Date: Wed, 12 Sep 2012 03:29:46 -0700
-Subject: [PATCH] fix for ghc 7.6.1 changes
-
----
- c2hs/base/general/FileOps.hs  | 3 ++-
- c2hs/base/state/StateTrans.hs | 3 ++-
- c2hs/toplevel/C2HSConfig.hs   | 2 +-
- 3 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/c2hs/base/general/FileOps.hs b/c2hs/base/general/FileOps.hs
-index 83ac70c..4914c4b 100644
---- a/c2hs/base/general/FileOps.hs
-+++ b/c2hs/base/general/FileOps.hs
-@@ -39,6 +39,7 @@ import Control.Monad	 (liftM)
- import System.Random    (newStdGen, randomRs)
- 
- import FNameOps  (dirname, stripDirname, addPath)
-+import System.IO.Error (catchIOError)
- 
- 
- -- search for the given file in the given list of directories (EXPORTED)
-@@ -89,7 +90,7 @@ mktemp pre post =
- 			     in do
- 			       h <- openFile fname ReadWriteMode
- 			       return (h, fname)
--			     `catch` \_ -> createLoop (attempts - 1) rs'
-+			     `catchIOError` \_ -> createLoop (attempts - 1) rs'
-     --
-     sixChars :: [Int] -> ([Int], String)
-     sixChars is = 
-diff --git a/c2hs/base/state/StateTrans.hs b/c2hs/base/state/StateTrans.hs
-index ada62f4..2ab0ad1 100644
---- a/c2hs/base/state/StateTrans.hs
-+++ b/c2hs/base/state/StateTrans.hs
-@@ -84,6 +84,7 @@ import System.IO  (fixIO)
- import Data.IORef (IORef, newIORef, readIORef, writeIORef)
- 
- import Errors (interr)
-+import System.IO.Error (catchIOError)
- 
- infixr 1 +>=, +>
- 
-@@ -337,7 +338,7 @@ fatalsHandledBy m handler  =
- 				  ioError err
- 	      Right a          -> return state
- 	    )
--	    `catch` (\err -> let
-+	    `catchIOError` (\err -> let
- 			       STB handler' = handler err
- 			     in
- 			     handler' bs gs)
-diff --git a/c2hs/toplevel/C2HSConfig.hs b/c2hs/toplevel/C2HSConfig.hs
-index e8deddf..af32886 100644
---- a/c2hs/toplevel/C2HSConfig.hs
-+++ b/c2hs/toplevel/C2HSConfig.hs
-@@ -46,7 +46,7 @@ import Data.Array (Array, array)
- 
- import Foreign (Ptr, FunPtr)
- import Foreign  (Storable(sizeOf, alignment), toBool)
--import Foreign.C (CInt)
-+import Foreign.C (CInt(..))
- import System.Info (os)
- 
- -- program settings
--- 
-1.7.12
-
diff --git a/community/gtk2hs-buildtools/PKGBUILD b/community/gtk2hs-buildtools/PKGBUILD
index 86fc34f32..132968c78 100644
--- a/community/gtk2hs-buildtools/PKGBUILD
+++ b/community/gtk2hs-buildtools/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 102051 2013-12-04 14:18:24Z spupykin $
+# $Id: PKGBUILD 110606 2014-05-04 13:54:46Z td123 $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=gtk2hs-buildtools
-pkgver=0.12.5.1
-pkgrel=1
+pkgver=0.12.5.2
+pkgrel=2
 pkgdesc="Tools to build the Gtk2Hs suite of User Interface libraries."
 url="http://hackage.haskell.org/package/gtk2hs-buildtools"
 license=('GPL2')
 arch=('i686' 'x86_64')
-makedepends=('ghc' 'alex' 'happy' 'haskell-random')
+options=('staticlibs')
+makedepends=('ghc=7.8.2-2' 'alex' 'happy' 'haskell-random' 'haskell-hashtables')
 depends=('gmp')
-options=('strip')
 provides=('haskell-gtk2hs-buildtools')
-source=(http://hackage.haskell.org/packages/archive/gtk2hs-buildtools/$pkgver/gtk2hs-buildtools-$pkgver.tar.gz)
-md5sums=('2f8f761559185c7375b0b31354d791c8')
+source=("http://hackage.haskell.org/packages/archive/gtk2hs-buildtools/$pkgver/gtk2hs-buildtools-$pkgver.tar.gz")
+md5sums=('dd39243ae579ab32236fbc17dbeec107')
 
 build() {
     cd ${srcdir}/gtk2hs-buildtools-$pkgver
diff --git a/community/haddock/PKGBUILD b/community/haddock/PKGBUILD
index 5c82eff82..e8ad82a65 100644
--- a/community/haddock/PKGBUILD
+++ b/community/haddock/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 102045 2013-12-04 13:09:12Z arodseth $
+# $Id: PKGBUILD 110607 2014-05-04 13:54:47Z td123 $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 
 pkgname=haddock
-pkgver=2.13.2.1
+pkgver=2.14.2
 pkgrel=1
 pkgdesc='Tool for generating documentation for Haskell libraries'
 url='http://hackage.haskell.org/package/haddock/'
@@ -14,7 +14,7 @@ makedepends=('alex' 'happy')
 depends=('ghc' 'haskell-xhtml' 'haskell-ghc-paths')
 install="$pkgname.install"
 source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz")
-sha256sums=('c9cfe2bd2e8e1201870f88bc9a2ccdb0173315d0a8c734b459ec344feb1af34e')
+sha256sums=('33df230cd8baeed87caa31fc13257a921778b6b700c78bd9237024e08d942641')
 options=('staticlibs')
 
 build() {
diff --git a/community/happy/PKGBUILD b/community/happy/PKGBUILD
index 0eab25381..734c48086 100644
--- a/community/happy/PKGBUILD
+++ b/community/happy/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 106258 2014-02-25 23:08:43Z bpiotrowski $
+# $Id: PKGBUILD 110608 2014-05-04 13:54:48Z td123 $
 # Maintainer: Thomas Dziedzic <gostrc@gmail.com>
 # Contributor: simo <simo@archlinux.org>
 # Contributor: Vesa Kaihlavirta <vegai@iki.fi>
 
 pkgname=happy
 pkgver=1.19.3
-pkgrel=1
+pkgrel=2
 pkgdesc="The Parser Generator for Haskell"
 url="http://hackage.haskell.org/package/happy"
 arch=('i686' 'x86_64')
 license=("custom:BSD3")
 depends=('gmp')
-makedepends=('ghc=7.6.3-1' 'haskell-mtl=2.1.2-3')
+makedepends=('ghc=7.8.2-2' 'haskell-mtl=2.1.3.1-2')
 source=("http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('fb9f4aec9d9e3b92be95a8abc43704b4')
 
diff --git a/community/haskell-bytestring-show/PKGBUILD b/community/haskell-bytestring-show/PKGBUILD
index d5892f4f4..1ef6b78a2 100644
--- a/community/haskell-bytestring-show/PKGBUILD
+++ b/community/haskell-bytestring-show/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 102053 2013-12-04 14:18:45Z spupykin $
+# $Id: PKGBUILD 110609 2014-05-04 13:54:49Z td123 $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-bytestring-show
-pkgver=0.3.5.5
+pkgver=0.3.5.6
 pkgrel=1
 pkgdesc="Efficient conversion of values into readable byte strings."
 url="http://hackage.haskell.org/package/bytestring-show"
@@ -12,7 +12,7 @@ depends=("ghc")
 options=('staticlibs')
 install="${pkgname}.install"
 source=("http://hackage.haskell.org/packages/archive/bytestring-show/${pkgver}/bytestring-show-${pkgver}.tar.gz")
-md5sums=('7ed08495da103ecc17b90dce70d1ca39')
+md5sums=('c9041eed86a52e17e6b53a415967f7cb')
 
 build() {
   cd ${srcdir}/bytestring-show-${pkgver}
diff --git a/community/haskell-cairo/PKGBUILD b/community/haskell-cairo/PKGBUILD
index 99e9e555b..70a16fb52 100644
--- a/community/haskell-cairo/PKGBUILD
+++ b/community/haskell-cairo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 108163 2014-03-24 08:19:59Z spupykin $
+# $Id: PKGBUILD 110610 2014-05-04 13:54:50Z td123 $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-cairo
 pkgver=0.12.5.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Binding to the cairo library for Gtk2Hs."
 url="http://hackage.haskell.org/package/cairo"
 license=('LGPL2.1')
diff --git a/community/haskell-data-default-class/PKGBUILD b/community/haskell-data-default-class/PKGBUILD
index e2950265b..1f1362233 100644
--- a/community/haskell-data-default-class/PKGBUILD
+++ b/community/haskell-data-default-class/PKGBUILD
@@ -2,17 +2,19 @@
 _hkgname=data-default-class
 pkgname=haskell-data-default-class
 pkgver=0.0.1
-pkgrel=1
+pkgrel=3
 pkgdesc="A class for types with a default value"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
 makedepends=()
-depends=('ghc=7.6.3')
+depends=('ghc=7.8.2-2')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
 md5sums=('abfd756bcc6d92e47436992c80ccdb80')
+options=('staticlibs')
+
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
     runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \
diff --git a/community/haskell-data-default-instances-base/PKGBUILD b/community/haskell-data-default-instances-base/PKGBUILD
index b9eb03b1e..163b42e00 100644
--- a/community/haskell-data-default-instances-base/PKGBUILD
+++ b/community/haskell-data-default-instances-base/PKGBUILD
@@ -2,13 +2,13 @@
 _hkgname=data-default-instances-base
 pkgname=haskell-data-default-instances-base
 pkgver=0.0.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Default instances for types in base"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
 makedepends=()
-depends=('ghc=7.6.3' 'haskell-data-default-class')
+depends=('ghc=7.8.2' 'haskell-data-default-class')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
diff --git a/community/haskell-data-default-instances-containers/PKGBUILD b/community/haskell-data-default-instances-containers/PKGBUILD
index 5a77dca00..979d10e67 100644
--- a/community/haskell-data-default-instances-containers/PKGBUILD
+++ b/community/haskell-data-default-instances-containers/PKGBUILD
@@ -2,17 +2,19 @@
 _hkgname=data-default-instances-containers
 pkgname=haskell-data-default-instances-containers
 pkgver=0.0.1
-pkgrel=1
+pkgrel=3
 pkgdesc="Default instances for types in containers"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
 makedepends=()
-depends=('ghc=7.6.3' 'haskell-containers=0.5.0.0' 'haskell-data-default-class=0.0.1')
+depends=('ghc=7.8.2' 'haskell-containers=0.5.5.1' 'haskell-data-default-class=0.0.1')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
 md5sums=('1c574d87bf9bc69d4748e3236d575a3c')
+options=('staticlibs')
+
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
     runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \
diff --git a/community/haskell-data-default-instances-dlist/PKGBUILD b/community/haskell-data-default-instances-dlist/PKGBUILD
index 6bd021546..03973e23c 100644
--- a/community/haskell-data-default-instances-dlist/PKGBUILD
+++ b/community/haskell-data-default-instances-dlist/PKGBUILD
@@ -2,17 +2,19 @@
 _hkgname=data-default-instances-dlist
 pkgname=haskell-data-default-instances-dlist
 pkgver=0.0.1
-pkgrel=1
+pkgrel=4
 pkgdesc="Default instances for types in dlist"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
 makedepends=()
-depends=('ghc=7.6.3' 'haskell-data-default-class=0.0.1' 'haskell-dlist=0.5-24')
+depends=('ghc=7.8.2' 'haskell-data-default-class=0.0.1' 'haskell-dlist=0.5-26')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
 md5sums=('6683d943ab70b7077ff6837fce75b4de')
+options=('staticlibs')
+
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
     runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \
diff --git a/community/haskell-data-default-instances-old-locale/PKGBUILD b/community/haskell-data-default-instances-old-locale/PKGBUILD
index fbfe9959b..6950f27ec 100644
--- a/community/haskell-data-default-instances-old-locale/PKGBUILD
+++ b/community/haskell-data-default-instances-old-locale/PKGBUILD
@@ -2,17 +2,19 @@
 _hkgname=data-default-instances-old-locale
 pkgname=haskell-data-default-instances-old-locale
 pkgver=0.0.1
-pkgrel=1
+pkgrel=3
 pkgdesc="Default instances for types in old-locale"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
 makedepends=()
-depends=('ghc=7.6.3' 'haskell-data-default-class' 'haskell-old-locale=1.0.0.5')
+depends=('ghc=7.8.2' 'haskell-data-default-class' 'haskell-old-locale=1.0.0.6')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
 md5sums=('43bd868049d870ee722eda6bdd89fc28')
+options=('staticlibs')
+
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
     runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \
diff --git a/community/haskell-data-default/PKGBUILD b/community/haskell-data-default/PKGBUILD
index 819635eaf..e334b5d33 100644
--- a/community/haskell-data-default/PKGBUILD
+++ b/community/haskell-data-default/PKGBUILD
@@ -2,17 +2,19 @@
 _hkgname=data-default
 pkgname=haskell-data-default
 pkgver=0.5.3
-pkgrel=1
+pkgrel=3
 pkgdesc="A class for types with a default value"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
 makedepends=()
-depends=('ghc=7.6.3' 'haskell-data-default-class' 'haskell-data-default-instances-base' 'haskell-data-default-instances-containers' 'haskell-data-default-instances-dlist' 'haskell-data-default-instances-old-locale')
+depends=('ghc=7.8.2' 'haskell-data-default-class' 'haskell-data-default-instances-base' 'haskell-data-default-instances-containers' 'haskell-data-default-instances-dlist' 'haskell-data-default-instances-old-locale')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
 md5sums=('03a98d999273ad20d5bc0c711bf1c533')
+options=('staticlibs')
+
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
     runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \
diff --git a/community/haskell-dataenc/0001-update-build-deps-for-ghc-7.6.1.patch b/community/haskell-dataenc/0001-update-build-deps-for-ghc-7.6.1.patch
deleted file mode 100644
index 9f544bb27..000000000
--- a/community/haskell-dataenc/0001-update-build-deps-for-ghc-7.6.1.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 961892779b5f5a2f46d6baa44c31d06c39e56470 Mon Sep 17 00:00:00 2001
-From: Thomas Dziedzic <gostrc@gmail.com>
-Date: Tue, 11 Sep 2012 05:06:59 -0700
-Subject: [PATCH] update build deps for ghc 7.6.1
-
----
- dataenc.cabal | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dataenc.cabal b/dataenc.cabal
-index 1ad42ca..3a4f5bb 100644
---- a/dataenc.cabal
-+++ b/dataenc.cabal
-@@ -21,7 +21,7 @@ flag BuildTests
- 
- library
-     hs-source-dirs: src
--    build-depends: array >= 0.1.0 && < 0.5, base >= 3.0.0 && < 4.6, containers >= 0.1.0 && < 0.5
-+    build-depends: array >= 0.1.0 && < 0.5, base >= 3.0.0 && < 4.7, containers >= 0.1.0 && < 0.6
-     exposed-modules:
-             Codec.Binary.Base16
-             Codec.Binary.Base32
--- 
-1.7.12
-
diff --git a/community/haskell-dataenc/0001-update-build-deps-for-ghc-7.8.2.patch b/community/haskell-dataenc/0001-update-build-deps-for-ghc-7.8.2.patch
new file mode 100644
index 000000000..23bcc21ae
--- /dev/null
+++ b/community/haskell-dataenc/0001-update-build-deps-for-ghc-7.8.2.patch
@@ -0,0 +1,12 @@
+diff -aur dataenc-0.14.0.5/dataenc.cabal dataenc-0.14.0.5-new/dataenc.cabal
+--- dataenc-0.14.0.5/dataenc.cabal	2012-12-30 11:30:27.000000000 +0100
++++ dataenc-0.14.0.5-new/dataenc.cabal	2014-04-27 22:01:21.640940945 +0200
+@@ -21,7 +21,7 @@
+ 
+ library
+     hs-source-dirs: src
+-    build-depends: array >= 0.1.0 && < 0.5, base >= 3.0.0 && < 4.7, containers >= 0.1.0 && < 0.6
++    build-depends: array >= 0.1.0 && <= 0.5.0.0, base >= 3.0.0 && <= 4.7.0.0, containers >= 0.1.0 && < 0.6
+     exposed-modules:
+             Codec.Binary.Base16
+             Codec.Binary.Base32
diff --git a/community/haskell-dataenc/PKGBUILD b/community/haskell-dataenc/PKGBUILD
index c1bd00b18..d00ad725a 100644
--- a/community/haskell-dataenc/PKGBUILD
+++ b/community/haskell-dataenc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 103336 2014-01-03 11:09:18Z bpiotrowski $
+# $Id: PKGBUILD 110617 2014-05-04 13:54:56Z td123 $
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 # Package generated by cabal2arch 0.7.5
@@ -6,24 +6,26 @@
 _hkgname=dataenc
 pkgname=haskell-dataenc
 pkgver=0.14.0.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Data encoding library"
 url="http://hackage.haskell.org/package/dataenc"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.6.3-1' sh)
+depends=('ghc=7.8.2-2' sh)
 install=${pkgname}.install
 options=('staticlibs')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz
-        '0001-update-build-deps-for-ghc-7.6.1.patch')
+        '0001-update-build-deps-for-ghc-7.8.2.patch')
 md5sums=('4da812ca7a1640a5fdcc676009ab160c'
-         '662056adcb79efe8898298c271b49600')
+         '9fead0d2676158c60290d85ca7899718')
 
-build() {
+prepare() {
     cd ${srcdir}/${_hkgname}-${pkgver}
+    patch -Np1 -i $srcdir/0001-update-build-deps-for-ghc-7.8.2.patch
+}
 
-    # update build deps for ghc 7.6.1
-#    patch -Np1 -i ${srcdir}/0001-update-build-deps-for-ghc-7.6.1.patch
+build() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
 
     runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
       --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
diff --git a/community/haskell-dlist/PKGBUILD b/community/haskell-dlist/PKGBUILD
index d43156f40..32211ab6e 100644
--- a/community/haskell-dlist/PKGBUILD
+++ b/community/haskell-dlist/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 89299 2013-04-28 16:52:20Z td123 $
+# $Id: PKGBUILD 110618 2014-05-04 13:54:57Z td123 $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Don Stewart <dons@galois.com>
 # Contributor: Lex Black <autumn-wind at web dot de>
@@ -7,17 +7,18 @@ pkgname=haskell-dlist
 pkgver=0.5
 _hkgname=dlist
 _licensefile=LICENSE
-pkgrel=24
+pkgrel=26
 pkgdesc="Differences lists"
 url="http://code.haskell.org/~dons/code/dlist/"
 license=("BSD3")
 arch=('i686' 'x86_64')
-makedepends=('ghc=7.6.3-1')
-depends=('ghc=7.6.3-1')
+makedepends=('ghc=7.8.2-2')
+depends=('ghc=7.8.2-2')
 options=('strip')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 sha256sums=('4780e5409eff55bbfdd7470ef802a087a04048c9cd5efe0482c82878292f19ea')
 install="${pkgname}.install"
+options=('staticlibs')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/community/haskell-extensible-exceptions/PKGBUILD b/community/haskell-extensible-exceptions/PKGBUILD
index 784b9ebba..873fb06ad 100644
--- a/community/haskell-extensible-exceptions/PKGBUILD
+++ b/community/haskell-extensible-exceptions/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 89300 2013-04-28 16:52:21Z td123 $
+# $Id: PKGBUILD 110619 2014-05-04 13:54:58Z td123 $
 # Maintainer: Jelle van der Waa <jelle@vdwaa.nl>
 
 _hkgname=extensible-exceptions
 pkgname=haskell-${_hkgname}
 pkgver=0.1.1.4
-pkgrel=5
+pkgrel=6
 pkgdesc="extensible exceptions for both new and old versions of GHC"
 url="http://hackage.haskell.org/package/extensible-exceptions"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.6.3-1' sh)
+depends=('ghc=7.8.2' sh)
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=$pkgname.install
+options=('staticlibs')
 md5sums=('fa1cadd15c1c7aa362618d41c6e17d8b')
 
 build() {
diff --git a/community/haskell-ghc-paths/PKGBUILD b/community/haskell-ghc-paths/PKGBUILD
index cab7251c1..f6d483a8c 100644
--- a/community/haskell-ghc-paths/PKGBUILD
+++ b/community/haskell-ghc-paths/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 99206 2013-10-25 16:17:55Z arodseth $
+# $Id: PKGBUILD 110620 2014-05-04 13:54:59Z td123 $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 
 pkgname=haskell-ghc-paths
 pkgver=0.1.0.9
-pkgrel=3
+pkgrel=5
 pkgdesc="Knowledge of GHC's installation directories"
 url='http://hackage.haskell.org/package/ghc-paths'
 license=('custom:BSD3')
 arch=('x86_64' 'i686')
-depends=('ghc=7.6.3-1')
+depends=('ghc=7.8.2')
 source=("http://hackage.haskell.org/packages/archive/ghc-paths/$pkgver/ghc-paths-$pkgver.tar.gz")
 install="$pkgname.install"
 options=('staticlibs')
diff --git a/community/haskell-glib/PKGBUILD b/community/haskell-glib/PKGBUILD
index 4790a8ede..4861e4134 100644
--- a/community/haskell-glib/PKGBUILD
+++ b/community/haskell-glib/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 108165 2014-03-24 08:20:18Z spupykin $
+# $Id: PKGBUILD 110621 2014-05-04 13:55:00Z td123 $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-glib
-pkgver=0.12.5.3
+pkgver=0.12.5.4
 pkgrel=1
 pkgdesc="Binding to the GLIB library for Gtk2Hs."
 url="http://hackage.haskell.org/package/glib"
@@ -17,7 +17,7 @@ provides=('gtk2hs-glib')
 replaces=('gtk2hs-glib')
 conflicts=('gtk2hs-glib')
 source=(http://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz)
-md5sums=('fa062e23f75072dbc52abbb862c4ca8f')
+md5sums=('3923fd267072e99e4aad247e5147d319')
 
 build() {
     cd glib-$pkgver
diff --git a/community/haskell-gtk/PKGBUILD b/community/haskell-gtk/PKGBUILD
index 746405a1c..b0dd2cf5d 100644
--- a/community/haskell-gtk/PKGBUILD
+++ b/community/haskell-gtk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 108175 2014-03-24 09:05:00Z spupykin $
+# $Id: PKGBUILD 110622 2014-05-04 13:55:01Z td123 $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-gtk
-pkgver=0.12.5.6
+pkgver=0.12.5.7
 pkgrel=1
 pkgdesc="Binding to the gtk library for Gtk2Hs."
 url="http://hackage.haskell.org/package/gtk"
@@ -16,7 +16,7 @@ conflicts=('gtk2hs-gtk')
 options=('strip' 'staticlibs')
 install=gtk2hs-gtk.install
 source=(http://hackage.haskell.org/packages/archive/gtk/$pkgver/gtk-$pkgver.tar.gz)
-md5sums=('aa102599967851e6efeeb7338961557f')
+md5sums=('13020ad1f3f80a0d5b17c4e519172362')
 
 build() {
   cd ${srcdir}/gtk-${pkgver}
diff --git a/community/haskell-hashable/PKGBUILD b/community/haskell-hashable/PKGBUILD
new file mode 100644
index 000000000..2c54d01f3
--- /dev/null
+++ b/community/haskell-hashable/PKGBUILD
@@ -0,0 +1,47 @@
+_hkgname=hashable
+pkgname=haskell-hashable
+pkgver=1.2.1.0
+pkgrel=1
+pkgdesc="Mutable hash tables in the ST monad"
+url="http://hackage.haskell.org/package/${_hkgname}"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+options=('staticlibs')
+depends=('ghc=7.8.2-2' 'sh' 'haskell-text')
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
+install=${pkgname}.install
+md5sums=('74f7cadb836e63f4d4b1a24be401228d')
+
+build() {
+  cd ${_hkgname}-${pkgver}
+
+  runhaskell Setup configure -O -p \
+    --enable-split-objs \
+    --enable-shared \
+    --prefix=/usr \
+    --docdir=/usr/share/doc/${pkgname} \
+    --libsubdir=\$compiler/site-local/\$pkgid
+
+  runhaskell Setup build
+
+  runhaskell Setup haddock
+
+  runhaskell Setup register   --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${_hkgname}-${pkgver}
+
+  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+  install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+
+  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+  ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+
+  runhaskell Setup copy --destdir=${pkgdir}
+
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+}
diff --git a/extra/haskell-transformers/haskell-transformers.install b/community/haskell-hashable/haskell-hashable.install
index a59cd9850..f175f58ba 100644
--- a/extra/haskell-transformers/haskell-transformers.install
+++ b/community/haskell-hashable/haskell-hashable.install
@@ -1,4 +1,4 @@
-pkgname=haskell-transformers
+pkgname=haskell-hashable
 
 _register() {
   usr/share/haskell/${pkgname}/register.sh
diff --git a/community/haskell-hashtables/PKGBUILD b/community/haskell-hashtables/PKGBUILD
new file mode 100644
index 000000000..255501137
--- /dev/null
+++ b/community/haskell-hashtables/PKGBUILD
@@ -0,0 +1,47 @@
+_hkgname=hashtables
+pkgname=haskell-hashtables
+pkgver=1.1.2.1
+pkgrel=1
+pkgdesc="Mutable hash tables in the ST monad"
+url="http://hackage.haskell.org/package/${_hkgname}"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+options=('staticlibs')
+depends=('ghc=7.8.2-2' 'sh' 'haskell-hashable' 'haskell-primitive' 'haskell-vector')
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
+install=${pkgname}.install
+md5sums=('e8880201938b78ba26ef33370912aeff')
+
+build() {
+  cd ${_hkgname}-${pkgver}
+
+  runhaskell Setup configure -O -p \
+    --enable-split-objs \
+    --enable-shared \
+    --prefix=/usr \
+    --docdir=/usr/share/doc/${pkgname} \
+    --libsubdir=\$compiler/site-local/\$pkgid
+
+  runhaskell Setup build
+
+  runhaskell Setup haddock
+
+  runhaskell Setup register   --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${_hkgname}-${pkgver}
+
+  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+  install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+
+  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+  ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+
+  runhaskell Setup copy --destdir=${pkgdir}
+
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+}
diff --git a/community/haskell-hashtables/haskell-hashtables.install b/community/haskell-hashtables/haskell-hashtables.install
new file mode 100644
index 000000000..cfedbd818
--- /dev/null
+++ b/community/haskell-hashtables/haskell-hashtables.install
@@ -0,0 +1,35 @@
+pkgname=haskell-hashtables
+
+_register() {
+  usr/share/haskell/${pkgname}/register.sh
+}
+
+_unregister() {
+  usr/share/haskell/${pkgname}/unregister.sh
+}
+
+_gen_contents() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+post_install() {
+  _register
+  _gen_contents
+}
+
+pre_upgrade() {
+  _unregister
+}
+
+post_upgrade() {
+  _register
+  _gen_contents
+}
+
+pre_remove() {
+  _unregister
+}
+
+post_remove() {
+  _gen_contents
+}
diff --git a/community/haskell-haskeline/PKGBUILD b/community/haskell-haskeline/PKGBUILD
index d9c122ca6..fed85e6e9 100644
--- a/community/haskell-haskeline/PKGBUILD
+++ b/community/haskell-haskeline/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 106287 2014-02-26 15:19:55Z bpiotrowski $
+# $Id: PKGBUILD 110623 2014-05-04 13:55:02Z td123 $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 # Package generated by cabal2arch 0.7.6
@@ -6,12 +6,12 @@
 _hkgname=haskeline
 pkgname=haskell-haskeline
 pkgver=0.7.1.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A command-line interface for user input, written in Haskell."
 url="http://hackage.haskell.org/package/haskeline"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.6.3-1' 'sh' 'haskell-utf8-string=0.3.7-5' 'haskell-mtl=2.1.2-3' 'haskell-terminfo=0.4.0.0-1')
+depends=('ghc=7.8.2-2' 'sh' 'haskell-utf8-string=0.3.7-7' 'haskell-mtl=2.1.3.1' 'haskell-terminfo=0.4.0.0-2')
 install=${pkgname}.install
 options=('staticlibs')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
diff --git a/community/haskell-hslogger/0001-relax-network-upper-bound-to-2.6.patch b/community/haskell-hslogger/0001-relax-network-upper-bound-to-2.6.patch
new file mode 100644
index 000000000..f61dc89bd
--- /dev/null
+++ b/community/haskell-hslogger/0001-relax-network-upper-bound-to-2.6.patch
@@ -0,0 +1,25 @@
+From 118f8134e1d2f7578cba5474b00f3b1cbd1219e3 Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc@gmail.com>
+Date: Sun, 27 Apr 2014 19:38:59 -0700
+Subject: [PATCH] relax network upper bound to 2.6
+
+---
+ hslogger.cabal | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hslogger.cabal b/hslogger.cabal
+index 3e0ca27..74c262a 100644
+--- a/hslogger.cabal
++++ b/hslogger.cabal
+@@ -42,7 +42,7 @@ Library
+         System.Log.Handler.Growl, System.Log.Handler.Log4jXML,
+         System.Log.Logger
+     Extensions: CPP, ExistentialQuantification
+-    Build-Depends: network < 2.5, mtl
++    Build-Depends: network < 2.6, mtl
+     if !os(windows)
+         Build-Depends: unix
+     if flag(small_base)
+-- 
+1.9.2
+
diff --git a/community/haskell-hslogger/PKGBUILD b/community/haskell-hslogger/PKGBUILD
index 6bde5b545..310d1dd54 100644
--- a/community/haskell-hslogger/PKGBUILD
+++ b/community/haskell-hslogger/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 102061 2013-12-04 14:20:16Z spupykin $
+# $Id: PKGBUILD 110624 2014-05-04 13:55:03Z td123 $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Arch Haskell Team <arch-haskell@haskell.org>
 
 pkgname=haskell-hslogger
 pkgver=1.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Versatile logging framework"
 url="http://hackage.haskell.org/package/hslogger"
 license=('LGPL')
@@ -12,11 +12,17 @@ arch=('i686' 'x86_64')
 depends=('ghc' 'haskell-mtl' 'haskell-network')
 options=('staticlibs')
 install=${pkgname}.install
-source=(http://hackage.haskell.org/packages/archive/hslogger/${pkgver}/hslogger-${pkgver}.tar.gz)
-md5sums=('4047e50789860c8ac3e8998f7de68ca5')
+source=("http://hackage.haskell.org/packages/archive/hslogger/${pkgver}/hslogger-${pkgver}.tar.gz"
+        '0001-relax-network-upper-bound-to-2.6.patch')
+md5sums=('4047e50789860c8ac3e8998f7de68ca5'
+         '14b3339395dcb5ba666987bc6aac998e')
 
 build() {
   cd ${srcdir}/hslogger-${pkgver}
+
+  # upstream bug: https://github.com/jgoerzen/hslogger/pull/22
+  patch -Np1 -i ${srcdir}/0001-relax-network-upper-bound-to-2.6.patch
+
   runhaskell Setup configure -p --prefix=/usr --docdir=/usr/share/doc/${pkgname} -O \
 	--enable-split-objs --enable-shared --libsubdir=\$compiler/site-local/\$pkgid \
 	--enable-library-profiling
diff --git a/community/haskell-html/PKGBUILD b/community/haskell-html/PKGBUILD
index 05cd89c76..4b7b6ac27 100644
--- a/community/haskell-html/PKGBUILD
+++ b/community/haskell-html/PKGBUILD
@@ -6,15 +6,16 @@
 _hkgname=html
 pkgname=haskell-html
 pkgver=1.0.1.2
-pkgrel=15
+pkgrel=17
 pkgdesc="HTML combinator library"
 url="http://hackage.haskell.org/package/html"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.6.3-1' 'sh')
+depends=('ghc=7.8.2-2' 'sh')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
 md5sums=('2a7de5a2af9a2f80d39825d6a95ee445')
+options=('staticlibs')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/community/haskell-http/0001-relax-upper-bound-on-network.patch b/community/haskell-http/0001-relax-upper-bound-on-network.patch
new file mode 100644
index 000000000..0c750ee02
--- /dev/null
+++ b/community/haskell-http/0001-relax-upper-bound-on-network.patch
@@ -0,0 +1,25 @@
+From 48063198a77c0274ae7d9ba2f50dc4c25ddba99f Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc@gmail.com>
+Date: Fri, 18 Apr 2014 09:40:01 -0700
+Subject: [PATCH] relax upper bound on network
+
+---
+ HTTP.cabal | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/HTTP.cabal b/HTTP.cabal
+index 594e22d..a1b5578 100644
+--- a/HTTP.cabal
++++ b/HTTP.cabal
+@@ -85,7 +85,7 @@ Library
+                  Network.HTTP.Utils
+                  Paths_HTTP
+   GHC-options: -fwarn-missing-signatures -Wall
+-  Build-depends: base >= 2 && < 4.8, network < 2.5, parsec
++  Build-depends: base >= 2 && < 4.8, network < 2.6, parsec
+   Extensions: FlexibleInstances
+   if flag(old-base)
+     Build-depends: base < 3
+-- 
+1.9.2
+
diff --git a/extra/haskell-http/PKGBUILD b/community/haskell-http/PKGBUILD
index 6e3fa134e..4eed8349a 100644
--- a/extra/haskell-http/PKGBUILD
+++ b/community/haskell-http/PKGBUILD
@@ -2,21 +2,26 @@
 
 _hkgname=HTTP
 pkgname=haskell-http
-pkgver=4000.2.11
-pkgrel=1
+pkgver=4000.2.12
+pkgrel=2
 pkgdesc="A library for client-side HTTP"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.6.3-1' 'sh' 'haskell-network=2.4.1.2-1' 'haskell-parsec=3.1.3-3' 'haskell-mtl=2.1.2-3')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install=${pkgname}.install
 options=('staticlibs')
-md5sums=('a293c8a1b6caebda06cf655f42d473d0')
+depends=('ghc=7.8.2-2' 'sh' 'haskell-network=2.5.0.0-1' 'haskell-parsec=3.1.5-2' 'haskell-mtl=2.1.3.1-2')
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"
+        '0001-relax-upper-bound-on-network.patch')
+install=${pkgname}.install
+md5sums=('cd69429866439890353ec98100e3ba32'
+         '490004d105b18535bb6c77ec2566053e')
 
 build() {
   cd ${_hkgname}-${pkgver}
 
+  # fixes https://github.com/haskell/HTTP/issues/55
+  patch -Np1 -i ${srcdir}/0001-relax-upper-bound-on-network.patch
+
   runhaskell Setup configure -O -p \
     --enable-split-objs \
     --enable-shared \
@@ -47,4 +52,3 @@ package() {
   install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
   rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
 }
-
diff --git a/extra/haskell-http/haskell-http.install b/community/haskell-http/haskell-http.install
index 0593ec4e2..0593ec4e2 100644
--- a/extra/haskell-http/haskell-http.install
+++ b/community/haskell-http/haskell-http.install
diff --git a/extra/haskell-mtl/PKGBUILD b/community/haskell-mtl/PKGBUILD
index 9ff28ad5e..fb3c0f4d0 100644
--- a/extra/haskell-mtl/PKGBUILD
+++ b/community/haskell-mtl/PKGBUILD
@@ -2,17 +2,17 @@
 
 _hkgname=mtl
 pkgname=haskell-mtl
-pkgver=2.1.2
-pkgrel=3
+pkgver=2.1.3.1
+pkgrel=2
 pkgdesc="Monad classes, using functional dependencies"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.6.3-1' 'sh' 'haskell-transformers=0.3.0.0-4')
+options=('staticlibs')
+depends=('ghc=7.8.2-2' 'sh')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
-options=('staticlibs')
-md5sums=('943c110524d96126bfa0e61f7df1ebcd')
+md5sums=('8f3927677bf3e0efb6fcce08b1be2eac')
 
 build() {
   cd ${_hkgname}-${pkgver}
diff --git a/extra/haskell-mtl/haskell-mtl.install b/community/haskell-mtl/haskell-mtl.install
index 17c40da11..17c40da11 100644
--- a/extra/haskell-mtl/haskell-mtl.install
+++ b/community/haskell-mtl/haskell-mtl.install
diff --git a/extra/haskell-network/PKGBUILD b/community/haskell-network/PKGBUILD
index 0ef09b9b5..76cd99463 100644
--- a/extra/haskell-network/PKGBUILD
+++ b/community/haskell-network/PKGBUILD
@@ -2,17 +2,17 @@
 
 _hkgname=network
 pkgname=haskell-network
-pkgver=2.4.1.2
+pkgver=2.5.0.0
 pkgrel=1
 pkgdesc="Low-level networking interface"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.6.3-1' 'sh' 'haskell-parsec=3.1.3-3')
+options=('staticlibs')
+depends=('ghc=7.8.2-2' 'sh' 'haskell-parsec=3.1.5-2')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
-options=('staticlibs')
-md5sums=('032075c35dea5d23923af3928f9a5511')
+md5sums=('ce4a584d3c04905b88275a156273dac6')
 
 build() {
   cd ${_hkgname}-${pkgver}
diff --git a/extra/haskell-network/haskell-network.install b/community/haskell-network/haskell-network.install
index e6177f643..e6177f643 100644
--- a/extra/haskell-network/haskell-network.install
+++ b/community/haskell-network/haskell-network.install
diff --git a/community/haskell-pango/PKGBUILD b/community/haskell-pango/PKGBUILD
index 379fb744a..f5a94b19a 100644
--- a/community/haskell-pango/PKGBUILD
+++ b/community/haskell-pango/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 108171 2014-03-24 08:30:46Z spupykin $
+# $Id: PKGBUILD 110626 2014-05-04 13:55:04Z td123 $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-pango
 pkgver=0.12.5.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Binding to the pango library for Gtk2Hs."
 url="http://hackage.haskell.org/package/pango"
 license=('LGPL2.1')
diff --git a/extra/haskell-parsec/PKGBUILD b/community/haskell-parsec/PKGBUILD
index 613897c4d..c8556e11e 100644
--- a/extra/haskell-parsec/PKGBUILD
+++ b/community/haskell-parsec/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 199158 2013-11-08 18:16:08Z eric $
 # Maintainer: Thomas Dziedzic <gostrc@gmail.com>
 
 _hkgname=parsec
 pkgname=haskell-parsec
-pkgver=3.1.3
-pkgrel=3
+pkgver=3.1.5
+pkgrel=2
 pkgdesc="Monadic parser combinators"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.6.3-1' 'sh' 'haskell-mtl=2.1.2-3' 'haskell-text=0.11.2.3-3')
+options=('staticlibs')
+depends=('ghc=7.8.2-2' 'sh' 'haskell-mtl=2.1.3.1-2' 'haskell-text=1.1.0.1-2')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
-options=('staticlibs')
-md5sums=('d72fc94b81153132c61125a1ec52a4a5')
+md5sums=('00e822decff17a034a68c462d2a3e099')
 
 build() {
   cd ${_hkgname}-${pkgver}
diff --git a/extra/haskell-parsec/haskell-parsec.install b/community/haskell-parsec/haskell-parsec.install
index 25f4e6e9b..25f4e6e9b 100644
--- a/extra/haskell-parsec/haskell-parsec.install
+++ b/community/haskell-parsec/haskell-parsec.install
diff --git a/community/haskell-primitive/PKGBUILD b/community/haskell-primitive/PKGBUILD
index 44405ba1b..229c15578 100644
--- a/community/haskell-primitive/PKGBUILD
+++ b/community/haskell-primitive/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 108167 2014-03-24 08:20:40Z spupykin $
+# $Id: PKGBUILD 110627 2014-05-04 13:55:05Z td123 $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-primitive
 pkgver=0.5.2.1
-pkgrel=1
+pkgrel=4
 pkgdesc="Wrappers for primitive operations"
 url="http://hackage.haskell.org/package/primitive"
 license=("custom:BSD3")
@@ -13,8 +13,6 @@ depends=("ghc")
 options=('strip' 'staticlibs')
 install="${pkgname}.install"
 source=("http://hackage.haskell.org/packages/archive/primitive/${pkgver}/primitive-${pkgver}.tar.gz")
-sha256sums=('526c9d4d06b7b379cb1aaffeffbb30bef810e771f29617ef6d0d99df711f4313')
-sha256sums=('8817a5f307c4605709b37857c048caa22fcc7550d681d64a2eea756126721529')
 sha256sums=('0e516b81c2ef2c96d47dc40561663cc2cbfece0f135948e77e9b53025ff1c3ee')
 
 build() {
diff --git a/community/haskell-quickcheck/PKGBUILD b/community/haskell-quickcheck/PKGBUILD
index 3d792152f..dc634aae5 100644
--- a/community/haskell-quickcheck/PKGBUILD
+++ b/community/haskell-quickcheck/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 108389 2014-03-27 12:31:34Z arodseth $
+# $Id: PKGBUILD 110628 2014-05-04 13:55:06Z td123 $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
@@ -6,7 +6,7 @@
 _hkgname=QuickCheck
 pkgname=haskell-quickcheck
 pkgver=2.7.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Automatic testing of Haskell programs'
 url='http://hackage.haskell.org/package/QuickCheck'
 license=('custom:BSD3')
diff --git a/extra/haskell-random/PKGBUILD b/community/haskell-random/PKGBUILD
index ba0c472c3..ca36486f4 100644
--- a/extra/haskell-random/PKGBUILD
+++ b/community/haskell-random/PKGBUILD
@@ -3,15 +3,15 @@
 _hkgname=random
 pkgname=haskell-random
 pkgver=1.0.1.1
-pkgrel=5
+pkgrel=7
 pkgdesc="random number library"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.6.3-1' 'sh')
+options=('staticlibs')
+depends=('ghc=7.8.2-2' 'sh')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
-options=('staticlibs')
 md5sums=('9a249cfa7ff6793cbf2be06e9fcd7538')
 
 build() {
diff --git a/extra/haskell-random/haskell-random.install b/community/haskell-random/haskell-random.install
index 0dc80227b..0dc80227b 100644
--- a/extra/haskell-random/haskell-random.install
+++ b/community/haskell-random/haskell-random.install
diff --git a/community/haskell-regex-base/PKGBUILD b/community/haskell-regex-base/PKGBUILD
index 70f31e2e2..2f1910042 100644
--- a/community/haskell-regex-base/PKGBUILD
+++ b/community/haskell-regex-base/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 108122 2014-03-23 11:53:03Z arodseth $
+# $Id: PKGBUILD 110629 2014-05-04 13:55:08Z td123 $
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
@@ -6,12 +6,12 @@
 _hkgname=regex-base
 pkgname=haskell-regex-base
 pkgver=0.93.2
-pkgrel=16
+pkgrel=18
 pkgdesc='Interface API for regex-posix,pcre,parsec,tdfa,dfa'
 url='http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-base'
 license=('custom:BSD3')
 arch=('x86_64' 'i686')
-depends=('ghc' 'haskell-mtl')
+depends=('ghc=7.8.2-2' 'haskell-mtl')
 source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz")
 install="$pkgname.install"
 options=('staticlibs')
diff --git a/community/haskell-regex-compat/PKGBUILD b/community/haskell-regex-compat/PKGBUILD
index 4a85ba633..02d03f584 100644
--- a/community/haskell-regex-compat/PKGBUILD
+++ b/community/haskell-regex-compat/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 99394 2013-10-28 10:42:23Z arodseth $
+# $Id: PKGBUILD 110630 2014-05-04 13:55:09Z td123 $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
@@ -6,7 +6,7 @@
 _hkgname=regex-compat
 pkgname=haskell-regex-compat
 pkgver=0.95.1
-pkgrel=7
+pkgrel=8
 pkgdesc='Replaces and enhances Text.Regex'
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
diff --git a/community/haskell-regex-posix/PKGBUILD b/community/haskell-regex-posix/PKGBUILD
index 2ee285bcb..b6aedeb54 100644
--- a/community/haskell-regex-posix/PKGBUILD
+++ b/community/haskell-regex-posix/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 99396 2013-10-28 10:47:29Z arodseth $
+# $Id: PKGBUILD 110631 2014-05-04 13:55:10Z td123 $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
@@ -6,7 +6,7 @@
 _hkgname=regex-posix
 pkgname=haskell-regex-posix
 pkgver=0.95.2
-pkgrel=6
+pkgrel=7
 pkgdesc='The posix regex backend for regex-base'
 url="http://hackage.haskell.org/package/$_hkgname"
 license=('custom:BSD3')
diff --git a/community/haskell-stm/PKGBUILD b/community/haskell-stm/PKGBUILD
index 0fa5c7670..6c656b70c 100644
--- a/community/haskell-stm/PKGBUILD
+++ b/community/haskell-stm/PKGBUILD
@@ -3,16 +3,17 @@
 # Package generated by cabal2arch 0.7.5
 _hkgname=stm
 pkgname=haskell-stm
-pkgver=2.4.2
+pkgver=2.4.3
 pkgrel=2
 pkgdesc="A modular composable concurrency abstraction."
 url="http://hackage.haskell.org/package/stm"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.6.3-1' 'sh')
+depends=('ghc=7.8.2' 'sh')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
 install=${pkgname}.install
-md5sums=('a0008fce2e12a18ab230516132d4117e')
+options=('staticlibs')
+md5sums=('aaf57b183a7a4a1bda7df6f00866e709')
 
 build() {
     cd ${srcdir}/${_hkgname}-$pkgver
diff --git a/community/haskell-tar/PKGBUILD b/community/haskell-tar/PKGBUILD
index 6f62a0f20..45e8d8427 100644
--- a/community/haskell-tar/PKGBUILD
+++ b/community/haskell-tar/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 99400 2013-10-28 10:58:26Z arodseth $
+# $Id: PKGBUILD 110633 2014-05-04 13:55:12Z td123 $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 
 pkgname=haskell-tar
 pkgver=0.4.0.1
-pkgrel=6
+pkgrel=8
 pkgdesc='Reading, writing and manipulating tar archive files'
 url='http://hackage.haskell.org/package/tar'
 license=('custom:BSD3')
 arch=('x86_64' 'i686')
-depends=('ghc=7.6.3-1')
+depends=('ghc=7.8.2-2')
 source=("http://hackage.haskell.org/packages/archive/tar/$pkgver/tar-$pkgver.tar.gz")
 install=haskell-tar.install
 sha256sums=('a408274d8325f4e3144c5aa154d72f1ee7b0a7342570fd6805e3be3fe0d97a6d')
 options=('staticlibs')
 
 build() {
-  cd "$srcdir/tar-$pkgver"
+  cd "tar-$pkgver"
 
   runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
     --prefix=/usr --docdir="/usr/share/doc/$pkgname" \
@@ -29,7 +29,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/tar-$pkgver"
+  cd "tar-$pkgver"
 
   install -Dm 744 register.sh \
 	  $pkgdir/usr/share/haskell/$pkgname/register.sh
diff --git a/community/haskell-terminfo/PKGBUILD b/community/haskell-terminfo/PKGBUILD
index cfe3159d8..6b93d18a0 100644
--- a/community/haskell-terminfo/PKGBUILD
+++ b/community/haskell-terminfo/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 106226 2014-02-25 15:47:36Z bpiotrowski $
+# $Id: PKGBUILD 110634 2014-05-04 13:55:13Z td123 $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 
 _hkgname=terminfo
 pkgname=haskell-terminfo
 pkgver=0.4.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Haskell bindings to the terminfo library."
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.6.3-1' 'sh')
+depends=('ghc=7.8.2-2' 'sh')
 options=('staticlibs')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
diff --git a/extra/haskell-text/PKGBUILD b/community/haskell-text/PKGBUILD
index da4b5abf7..823622967 100644
--- a/extra/haskell-text/PKGBUILD
+++ b/community/haskell-text/PKGBUILD
@@ -2,17 +2,17 @@
 
 _hkgname=text
 pkgname=haskell-text
-pkgver=0.11.2.3
-pkgrel=3
+pkgver=1.1.0.1
+pkgrel=2
 pkgdesc="An efficient packed Unicode text type."
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.6.3-1' 'sh')
+options=('staticlibs')
+depends=('ghc=7.8.2-2' 'sh')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
-options=('staticlibs')
-md5sums=('7a469d49a7576fb3a18785cb64d4ee6c')
+md5sums=('e8e1017ed0f0fef2a872569d8f31883e')
 
 build() {
   cd ${_hkgname}-${pkgver}
diff --git a/extra/haskell-text/haskell-text.install b/community/haskell-text/haskell-text.install
index 44ef4244a..44ef4244a 100644
--- a/extra/haskell-text/haskell-text.install
+++ b/community/haskell-text/haskell-text.install
diff --git a/community/haskell-tf-random/PKGBUILD b/community/haskell-tf-random/PKGBUILD
index d62c8143d..f88885b69 100644
--- a/community/haskell-tf-random/PKGBUILD
+++ b/community/haskell-tf-random/PKGBUILD
@@ -4,7 +4,7 @@
 _hkgname=tf-random
 pkgname=haskell-tf-random
 pkgver=0.4
-pkgrel=1
+pkgrel=2
 pkgdesc='High-quality splittable pseudorandom number generator'
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
diff --git a/community/haskell-utf8-string/PKGBUILD b/community/haskell-utf8-string/PKGBUILD
index cbe6930f6..b6655f1eb 100644
--- a/community/haskell-utf8-string/PKGBUILD
+++ b/community/haskell-utf8-string/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 89325 2013-04-28 16:52:49Z td123 $
+# $Id: PKGBUILD 110636 2014-05-04 13:55:15Z td123 $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 # Package generated by cabal2arch 0.7.6
 _hkgname=utf8-string
 pkgname=haskell-utf8-string
 pkgver=0.3.7
-pkgrel=5
+pkgrel=7
 pkgdesc="Support for reading and writing UTF8 Strings"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.6.3-1' 'sh')
+depends=('ghc=7.8.2-2' 'sh')
 install=${pkgname}.install
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+options=('staticlibs')
 md5sums=('50e5c395713e716e0e4a56da73f87ccd')
 
 build() {
diff --git a/community/haskell-vector/PKGBUILD b/community/haskell-vector/PKGBUILD
index 7e0408b24..24f95ea36 100644
--- a/community/haskell-vector/PKGBUILD
+++ b/community/haskell-vector/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 108169 2014-03-24 08:21:00Z spupykin $
+# $Id: PKGBUILD 110637 2014-05-04 13:55:16Z td123 $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-vector
 pkgver=0.10.9.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Efficient Arrays"
 url="http://code.haskell.org/vector"
 license=("custom:BSD3")
diff --git a/community/haskell-x11-xft/PKGBUILD b/community/haskell-x11-xft/PKGBUILD
index a2ef0e0f2..8f7988771 100644
--- a/community/haskell-x11-xft/PKGBUILD
+++ b/community/haskell-x11-xft/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 89328 2013-04-28 16:52:54Z td123 $
+# $Id: PKGBUILD 110639 2014-05-04 13:55:18Z td123 $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 _hkgname=X11-xft
 pkgname=haskell-x11-xft
 pkgver=0.3.1
-pkgrel=9
+pkgrel=10
 pkgdesc="Bindings to the Xft, X Free Type interface library, and some Xrender parts"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('LGPL')
 arch=('i686' 'x86_64')
-depends=('ghc=7.6.3-1' 'haskell-x11=1.6.1.1-3' 'haskell-utf8-string=0.3.7' 'libxft')
+depends=('ghc=7.8.2' 'haskell-x11=1.6.1.1' 'haskell-utf8-string=0.3.7' 'libxft')
 options=('strip')
 install=haskell-x11-xft.install
 source=(http://hackage.haskell.org/packages/archive/X11-xft/$pkgver/X11-xft-$pkgver.tar.gz)
+options=('staticlibs')
 md5sums=('ad885150a59f63de328e73abe5ffc79e')
 
 build() {
@@ -34,5 +35,4 @@ package() {
   ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
   runhaskell Setup copy --destdir=${pkgdir}
   install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-  rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
 }
diff --git a/community/haskell-x11/PKGBUILD b/community/haskell-x11/PKGBUILD
index 5e93dc6b1..0b27cb27b 100644
--- a/community/haskell-x11/PKGBUILD
+++ b/community/haskell-x11/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 89327 2013-04-28 16:52:53Z td123 $
+# $Id: PKGBUILD 110638 2014-05-04 13:55:17Z td123 $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: shild <sxp@bk.ru>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
@@ -6,16 +6,17 @@
 _hkgname=X11
 pkgname=haskell-x11
 pkgver=1.6.1.1
-pkgrel=3
+pkgrel=5
 pkgdesc="A Haskell binding to the X11 graphics library."
 arch=(i686 x86_64)
 url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11"
 license=('custom:BSD3')
 options=('strip')
-depends=("ghc=7.6.3-1" "libx11" "libxinerama" "libxrandr" "haskell-data-default=0.5.3")
+depends=("ghc=7.8.2" "libx11" "libxinerama" "libxrandr" "haskell-data-default=0.5.3")
 conflicts=(haskell-x11-extras)
 install=hsmod.install
 source=(http://hackage.haskell.org/packages/archive/X11/$pkgver/X11-$pkgver.tar.gz)
+options=('staticlibs')
 md5sums=('80638b99238f72d4cc351b4fbd7274fc')
 
 build() {
diff --git a/community/haskell-xhtml/PKGBUILD b/community/haskell-xhtml/PKGBUILD
index 8f85d691d..5e09cee8e 100644
--- a/community/haskell-xhtml/PKGBUILD
+++ b/community/haskell-xhtml/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 99398 2013-10-28 10:55:23Z arodseth $
+# $Id: PKGBUILD 110640 2014-05-04 13:55:19Z td123 $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
@@ -6,19 +6,19 @@
 _hkgname=xhtml
 pkgname=haskell-xhtml
 pkgver=3000.2.1
-pkgrel=5
+pkgrel=7
 pkgdesc='Combinators for producing XHTML 1.0'
 url='http://hackage.haskell.org/package/xhtml'
 license=('custom:BSD3')
 arch=('x86_64' 'i686')
-depends=('ghc=7.6.3-1' 'sh')
+depends=('ghc=7.8.2-2' 'sh')
 source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz")
 install="$pkgname.install"
 options=('staticlibs')
 sha256sums=('33020782170c1c083bc59fc3bfcb72cec2db223e02d1181c07ae23b9fa7fdcd8')
 
 build() {
-    cd "$srcdir/$_hkgname-$pkgver"
+    cd "$_hkgname-$pkgver"
 
     runhaskell Setup configure -O -p \
       --enable-split-objs \
@@ -34,7 +34,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$_hkgname-$pkgver"
+  cd "$_hkgname-$pkgver"
   
   install -Dm744 register.sh \
     "$pkgdir/usr/share/haskell/$pkgname/register.sh"
diff --git a/extra/haskell-zlib/PKGBUILD b/community/haskell-zlib/PKGBUILD
index 5175a544f..7ddd4519a 100644
--- a/extra/haskell-zlib/PKGBUILD
+++ b/community/haskell-zlib/PKGBUILD
@@ -3,15 +3,15 @@
 _hkgname=zlib
 pkgname=haskell-zlib
 pkgver=0.5.4.1
-pkgrel=1
+pkgrel=3
 pkgdesc="Compression and decompression in the gzip and zlib formats"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.6.3-1' 'sh' 'zlib')
+options=('staticlibs')
+depends=('ghc=7.8.2-2' 'sh' 'zlib')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
-options=('staticlibs')
 md5sums=('d0d10786d2bbd1d401a8b28a83e88475')
 
 build() {
diff --git a/extra/haskell-zlib/haskell-zlib.install b/community/haskell-zlib/haskell-zlib.install
index a2bb66224..a2bb66224 100644
--- a/extra/haskell-zlib/haskell-zlib.install
+++ b/community/haskell-zlib/haskell-zlib.install
diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD
index be213374b..4afe87d68 100644
--- a/community/hedgewars/PKGBUILD
+++ b/community/hedgewars/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 104154 2014-01-16 11:39:31Z spupykin $
+# $Id: PKGBUILD 110641 2014-05-04 13:55:20Z td123 $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=hedgewars
 pkgver=0.9.20.5
-pkgrel=1
+pkgrel=2
 pkgdesc="turn based strategy, artillery, action and comedy game, featuring the
  antics of pink hedgehogs with attitude as they battle from the depths of hell
  to the depths of space."
@@ -22,17 +22,23 @@ makedepends=('fpc' 'cmake'
 	     'haskell-vector'
 	     'haskell-random')
 source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2
-	hedgewars.png)
+        hedgewars.png
+        'fix-ghc-7.8-build-failure.diff')
 md5sums=('c61eb01466e86da656e1e74ad70a3217'
-         'eeb14d50df39063549ac5eca9dbc65d1')
+         'eeb14d50df39063549ac5eca9dbc65d1'
+         '84a85365cbbf7a1aabe4d0f37bd5f03f')
 
 build() {
   cd $pkgname-src-*
+
+  patch -Np1 -i ${srcdir}/fix-ghc-7.8-build-failure.diff
+
   cmake \
 	-DCMAKE_BUILD_TYPE="Release" \
 	-DCMAKE_INSTALL_PREFIX=/usr \
 	-DDATA_INSTALL_DIR=/usr/share/hedgewars \
 	-DNOSERVER=0 .
+
   make
 }
 
diff --git a/community/hedgewars/fix-ghc-7.8-build-failure.diff b/community/hedgewars/fix-ghc-7.8-build-failure.diff
new file mode 100644
index 000000000..0381ceb44
--- /dev/null
+++ b/community/hedgewars/fix-ghc-7.8-build-failure.diff
@@ -0,0 +1,13 @@
+diff --git a/gameServer/Actions.hs b/gameServer/Actions.hs
+index 2cebe4f..355ee26 100644
+--- a/gameServer/Actions.hs
++++ b/gameServer/Actions.hs
+@@ -562,7 +562,7 @@ processAction (AddClient cl) = do
+     si <- gets serverInfo
+     newClId <- io $ do
+         ci <- addClient rnc cl
+-        _ <- Exception.mask (forkIO . clientRecvLoop (clientSocket cl) (coreChan si) (sendChan cl) ci)
++        _ <- Exception.mask (\x -> forkIO $ clientRecvLoop (clientSocket cl) (coreChan si) (sendChan cl) ci x)
+ 
+         infoM "Clients" (show ci ++ ": New client. Time: " ++ show (connectTime cl))
+ 
diff --git a/community/iasl/PKGBUILD b/community/iasl/PKGBUILD
index ad5583f12..02988e5a6 100644
--- a/community/iasl/PKGBUILD
+++ b/community/iasl/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 108836 2014-04-05 03:36:38Z lcarlier $
+# $Id: PKGBUILD 110595 2014-05-04 03:36:51Z lcarlier $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Alessio 'mOlOk' Bolognino <themolok@gmail.com>
 
 pkgname=iasl
-pkgver=20140325
+pkgver=20140424
 pkgrel=1
 pkgdesc="Intel ACPI Source Language compiler"
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ options=('!makeflags')
 #install=iasl.install
 source=(http://acpica.org/sites/acpica/files/acpica-unix-${pkgver}.tar.gz
 	LICENSE)
-md5sums=('08c2ee7ba766c76c9be379d121878cd8'
+md5sums=('d080d33792533c2a355a5ac3e7ae93ae'
          '8615526144f69ea4e870d9bc37df9b29')
 
 build() {
diff --git a/community/pidgin-gfire/PKGBUILD b/community/pidgin-gfire/PKGBUILD
index ee13bab11..05f9e2021 100644
--- a/community/pidgin-gfire/PKGBUILD
+++ b/community/pidgin-gfire/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 99954 2013-10-31 02:40:14Z allan $
+# $Id: PKGBUILD 110576 2014-05-03 23:18:16Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Slash <demodevil5[at]yahoo[dot]com>
 # Contributor: LookTJ <jesus[dot]christ[dot]i[dot]love[at]gmail[dot]com>
 
 pkgname=pidgin-gfire
-pkgver=0.9.4
-pkgrel=4
+pkgver=0.9.5
+pkgrel=1
 pkgdesc="Gfire is an Plugin for the Pidgin IM client which allows you to connect the Xfire network."
 arch=('i686' 'x86_64')
 url="http://gfireproject.org/"
@@ -13,16 +13,15 @@ license=('GPL')
 depends=('glib2' 'pidgin' 'libnotify' 'gtk2')
 makedepends=('pkgconfig' 'intltool' 'libtool')
 source=("http://downloads.sourceforge.net/gfire/pidgin-gfire-$pkgver.tar.bz2" "gfire-libnotify.patch")
-md5sums=('7167828fd77200603a318afdd4d9ebd2'
+md5sums=('6ad6197b6b1a0d5d82d7267661431907'
          '5d6fc2b98837fbebba6bef2648699d5e')
 
 build() {
-    cd "$srcdir/pidgin-gfire-$pkgver"
-
-    patch -p0 -i ../gfire-libnotify.patch
-    sed "/gthread.h/d" -i src/gf_base.h
     ./autogen.sh
     ./configure --prefix=/usr --enable-libnotify
     make
+}
+
+package() {
     make DESTDIR="$pkgdir" install
 }
diff --git a/community/xmobar/PKGBUILD b/community/xmobar/PKGBUILD
index 61cef82f1..7ce009aa9 100644
--- a/community/xmobar/PKGBUILD
+++ b/community/xmobar/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 107201 2014-03-14 13:17:51Z jelle $
+# $Id: PKGBUILD 110642 2014-05-04 13:55:20Z td123 $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 
 pkgname=xmobar
 pkgver=0.20.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A Minimalistic Text Based Status Bar"
 url="http://hackage.haskell.org/package/xmobar"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
 depends=('gmp' 'libxft' 'libxinerama' 'wireless_tools' 'libxrandr')
-makedepends=('ghc=7.6.3-1' 'haskell-x11=1.6.1.1-3' 'haskell-x11-xft=0.3.1-9' 'haskell-utf8-string=0.3.7-5'
-	     'haskell-stm=2.4.2-2' 'haskell-parsec=3.1.3-3' 'haskell-mtl=2.1.2-3' 'haskell-regex-base' 'haskell-regex-compat haskell-http')
+makedepends=('ghc=7.8.2-2' 'haskell-x11=1.6.1.1' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string=0.3.7'
+	     'haskell-stm=2.4.3' 'haskell-parsec=3.1.5' 'haskell-mtl=2.1.3.1' 'haskell-regex-base' 'haskell-regex-compat haskell-http')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz)
 md5sums=('cee66bfa9aa36d25329ffd5ac044aeaf')
diff --git a/community/xmonad-contrib/PKGBUILD b/community/xmonad-contrib/PKGBUILD
index 44f7ee06a..d71bd397c 100644
--- a/community/xmonad-contrib/PKGBUILD
+++ b/community/xmonad-contrib/PKGBUILD
@@ -1,22 +1,30 @@
-# $Id: PKGBUILD 96822 2013-09-06 02:46:41Z bgyorgy $
+# $Id: PKGBUILD 110644 2014-05-04 13:55:23Z td123 $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: orbisvicis <gmail.com>
 
 pkgname=xmonad-contrib
 pkgver=0.11.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Add-ons for xmonad"
 arch=('i686' 'x86_64')
 url="http://xmonad.org/"
 license=('BSD')
-depends=('ghc=7.6.3-1' 'xmonad=0.11-7' 'sh' 'haskell-x11=1.6.1.1-3' 'haskell-x11-xft=0.3.1-9' 'haskell-utf8-string=0.3.7-5' 'haskell-random=1.0.1.1-5')
+depends=('ghc=7.8.2-2' 'xmonad=0.11-8' 'sh' 'haskell-x11=1.6.1.1' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string=0.3.7' 'haskell-random=1.0.1.1')
 install='xmonad-contrib.install'
-source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('415a7ed9449198b0e93d49ab0a4a0f72')
+options=('staticlibs')
+source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz 'remove_unnecessary_contexts.patch')
+md5sums=('415a7ed9449198b0e93d49ab0a4a0f72'
+         '724a45ea306054ddb7f8a42b185e708f')
+
+prepare() {
+  cd $srcdir/$pkgname-$pkgver
+  patch -Np1 -i $srcdir/remove_unnecessary_contexts.patch
+}
 
 build() {
   cd $srcdir/$pkgname-$pkgver
+
   runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr -fuse_xft \
              --libsubdir=\$compiler/site-local/\$pkgid
   runhaskell Setup build
diff --git a/community/xmonad-contrib/remove_unnecessary_contexts.patch b/community/xmonad-contrib/remove_unnecessary_contexts.patch
new file mode 100644
index 000000000..cecf19e76
--- /dev/null
+++ b/community/xmonad-contrib/remove_unnecessary_contexts.patch
@@ -0,0 +1,21 @@
+diff -aur xmonad-contrib-0.11.2/XMonad/Layout/MultiToggle.hs xmonad-contrib-new/XMonad/Layout/MultiToggle.hs
+--- xmonad-contrib-0.11.2/XMonad/Layout/MultiToggle.hs	2013-07-16 04:52:11.000000000 +0200
++++ xmonad-contrib-new/XMonad/Layout/MultiToggle.hs	2014-04-27 21:26:20.746206511 +0200
+@@ -99,7 +99,7 @@
+     transform :: (LayoutClass l a) => t -> l a ->
+         (forall l'. (LayoutClass l' a) => l' a -> (l' a -> l a) -> b) -> b
+ 
+-data (LayoutClass l a) => EL l a = forall l'. (LayoutClass l' a) => EL (l' a) (l' a -> l a)
++data  EL l a = forall l'. (LayoutClass l' a) => EL (l' a) (l' a -> l a)
+ 
+ unEL :: (LayoutClass l a) => EL l a -> (forall l'. (LayoutClass l' a) => l' a -> b) -> b
+ unEL (EL x _) k = k x
+@@ -159,7 +159,7 @@
+ infixr 0 ??
+ -- | Prepend an element to a heterogeneous list. Used to build transformer
+ -- tables for 'mkToggle'.
+-(??) :: (HList b w) => a -> b -> HCons a b
++(??) ::  a -> b -> HCons a b
+ (??) = HCons
+ 
+ -- | Construct a singleton transformer table.
diff --git a/community/xmonad/PKGBUILD b/community/xmonad/PKGBUILD
index 9e473de44..3b49b1d81 100644
--- a/community/xmonad/PKGBUILD
+++ b/community/xmonad/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 96798 2013-09-05 16:17:45Z bgyorgy $
+# $Id: PKGBUILD 110643 2014-05-04 13:55:22Z td123 $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: shild <shildv@gmail.com>
 
 pkgname=xmonad
 pkgver=0.11
-pkgrel=7
+pkgrel=8
 pkgdesc="Lightweight X11 tiled window manager written in Haskell"
 arch=('i686' 'x86_64')
 url="http://xmonad.org/"
 license=('BSD')
-depends=('ghc=7.6.3-1' 'gmp' 'haskell-x11=1.6.1.1-3' 'sh' 'haskell-mtl=2.1.2-3' 'haskell-utf8-string=0.3.7-5' 'haskell-extensible-exceptions=0.1.1.4-5')
+depends=('ghc=7.8.2' 'gmp' 'haskell-x11=1.6.1.1' 'sh' 'haskell-mtl=2.1.3.1' 'haskell-utf8-string=0.3.7' 'haskell-extensible-exceptions=0.1.1.4')
 makedepends=('gendesk')
 optdepends=('xorg-xmessage: for displaying visual error messages')
 install='xmonad.install'
 source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz"
         'xmonad.svg')
+options=('staticlibs')
 md5sums=('5ac9dc1dae5e85dcbdfb9f70cbe312c1'
          '72bfa5e62e4e44fe7fa59b6a7593d993')
 
diff --git a/extra/cabal-install/PKGBUILD b/extra/cabal-install/PKGBUILD
index ae8403ea8..4683605f8 100644
--- a/extra/cabal-install/PKGBUILD
+++ b/extra/cabal-install/PKGBUILD
@@ -3,29 +3,34 @@
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 
 pkgname=cabal-install
-pkgver=1.18.0.2
-pkgrel=1
+pkgver=1.18.0.3
+pkgrel=3
 pkgdesc="The command-line interface for Cabal and Hackage."
 url="http://hackage.haskell.org/package/cabal-install"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-#depends=('ghc' 'gmp' 'zlib')
 makedepends=('ghc')
 depends=('gmp' 'zlib')
 source=("http://hackage.haskell.org/packages/archive/cabal-install/${pkgver}/cabal-install-${pkgver}.tar.gz")
-md5sums=('e7e46406d43539616388aeafa01c689d')
+md5sums=('f7823387c21b4969e64238f63bb25740')
 
 build() {
+  mkdir ${srcdir}/build
+  export PREFIX="${srcdir}/build"
+
   cd cabal-install-${pkgver}
 
   sh bootstrap.sh --user
 }
 
 package() {
+  install -D -m755 ${srcdir}/build/bin/cabal ${pkgdir}/usr/bin/cabal
+
   cd cabal-install-${pkgver}
 
-  install -D -m755 /build/.cabal/bin/cabal $pkgdir/usr/bin/cabal
-  install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  install -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 LICENSE \
+    ${pkgdir}/usr/share/licenses/${pkgname}
     
   # add bash completion
   install -d ${pkgdir}/usr/share/bash-completion/completions
diff --git a/extra/ghc/PKGBUILD b/extra/ghc/PKGBUILD
index b36efb967..5d7e91ce0 100644
--- a/extra/ghc/PKGBUILD
+++ b/extra/ghc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196900 2013-10-21 03:40:08Z td123 $
+# $Id: PKGBUILD 212004 2014-05-04 13:54:04Z td123 $
 # Maintainer: Thomas Dziedzic <gostrc@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Special note for devs looking to upgrade this package:
@@ -10,75 +10,75 @@
 # grep -r ghc /var/abs/ | awk -F '/' '{ print $5; }' | sort -u
 
 pkgname=ghc
-pkgver=7.6.3
-pkgrel=1
+pkgver=7.8.2
+pkgrel=3
 pkgdesc='The Glasgow Haskell Compiler'
 arch=('i686' 'x86_64')
 url='http://www.haskell.org/ghc/'
 license=('custom')
-# libffi might be needed in the future: http://hackage.haskell.org/trac/ghc/ticket/4496
-depends=('perl' 'gmp>=5.0' 'gcc') # 'libffi')
+depends=('perl' 'gmp' 'gcc' 'libffi')
 makedepends=('ghc' 'perl' 'libxslt' 'docbook-xsl')
 checkdepends=('python2')
 install='ghc.install'
-# keep this otherwise a lot of tests will show as unexpected failures... need to investigate why using -jn for n > 1 does this...
-#options=('!makeflags')
-# missing rtl?
 options=('staticlibs')
-provides=('haskell-array=0.4.0.1'
-          'haskell-base=4.6.0.1'
-          'haskell-binary=0.5.1.1'
+provides=('haskell-array=0.5.0.0'
+          'haskell-base=4.7.0.0'
+          'haskell-binary=0.7.1.0'
           'haskell-bin-package-db=0.0.0.0'
-          'haskell-bytestring=0.10.0.2'
-          'haskell-containers=0.5.0.0'
-          'haskell-deepseq=1.3.0.1'
-          'haskell-directory=1.2.0.1'
-          'haskell-filepath=1.3.0.1'
-          'haskell-ghc-prim=0.3.0.0'
-          'haskell-haskell2010=1.1.1.0'
-          'haskell-haskell98=2.0.0.2'
-          'haskell-hoopl=3.9.0.0'
-          'haskell-hpc=0.6.0.0'
-          'haskell-integer-gmp=0.5.0.0'
-          'haskell-old-locale=1.0.0.5'
-          'haskell-old-time=1.1.0.1'
-          'haskell-pretty=1.1.1.0'
-          'haskell-process=1.1.0.2'
-          'haskell-template-haskell=2.8.0.0'
-          'haskell-time=1.4.0.1'
-          'haskell-unix=2.6.0.1'
-          'haskell-cabal=1.16.0'
+          'haskell-bytestring=0.10.4.0'
+          'haskell-containers=0.5.5.1'
+          'haskell-deepseq=1.3.0.2'
+          'haskell-directory=1.2.1.0'
+          'haskell-filepath=1.3.0.2'
+          'haskell-ghc-prim=0.3.1.0'
+          'haskell-haskell2010=1.1.2.0'
+          'haskell-haskell98=2.0.0.3'
+          'haskell-hoopl=3.10.0.1'
+          'haskell-hpc=0.6.0.1'
+          'haskell-integer-gmp=0.5.1.0'
+          'haskell-old-locale=1.0.0.6'
+          'haskell-old-time=1.1.0.2'
+          'haskell-pretty=1.1.1.1'
+          'haskell-process=1.2.0.0'
+          'haskell-template-haskell=2.9.0.0'
+          'haskell-time=1.4.2'
+          'haskell-transformers=0.3.0.0'
+          'haskell-unix=2.7.0.1'
+          'haskell-cabal=1.18.1.3'
          )
-replaces=('haskell-array<0.4.0.1'
-          'haskell-base<4.6.0.1'
-          'haskell-binary<0.5.1.1'
+replaces=('haskell-array<0.5.0.0'
+          'haskell-base<4.7.0.0'
+          'haskell-binary<0.7.1.0'
           'haskell-bin-package-db<0.0.0.0'
-          'haskell-bytestring<0.10.0.2'
-          'haskell-containers<0.5.0.0'
-          'haskell-deepseq<1.3.0.1'
-          'haskell-directory<1.2.0.1'
-          'haskell-filepath<1.3.0.1'
-          'haskell-ghc-prim<0.3.0.0'
-          'haskell-haskell2010<1.1.1.0'
-          'haskell-haskell98<2.0.0.2'
-          'haskell-hoopl<3.9.0.0'
-          'haskell-hpc<0.6.0.0'
-          'haskell-integer-gmp<0.5.0.0'
-          'haskell-old-locale<1.0.0.5'
-          'haskell-old-time<1.1.0.1'
-          'haskell-pretty<1.1.1.0'
-          'haskell-process<1.1.0.2'
-          'haskell-template-haskell<2.8.0.0'
-          'haskell-time<1.4.0.1'
-          'haskell-unix<2.6.0.1'
-          'haskell-cabal<1.16.0'
+          'haskell-bytestring<0.10.4.0'
+          'haskell-containers<0.5.5.1'
+          'haskell-deepseq<1.3.0.2'
+          'haskell-directory<1.2.1.0'
+          'haskell-filepath<1.3.0.2'
+          'haskell-ghc-prim<0.3.1.0'
+          'haskell-haskell2010<1.1.2.0'
+          'haskell-haskell98<2.0.0.3'
+          'haskell-hoopl<3.10.0.1'
+          'haskell-hpc<0.6.0.1'
+          'haskell-integer-gmp<0.5.1.0'
+          'haskell-old-locale<1.0.0.6'
+          'haskell-old-time<1.1.0.2'
+          'haskell-pretty<1.1.1.1'
+          'haskell-process<1.2.0.0'
+          'haskell-template-haskell<2.9.0.0'
+          'haskell-time<1.4.2'
+          'haskell-transformers'
+          'haskell-unix<2.7.0.1'
+          'haskell-cabal<1.18.1.3'
          )
-source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.bz2"
-        "http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.bz2"
-        'build.mk')
-md5sums=('986d1f90ca30d60f7b2820d75c6b8ea7'
-         '66aa6177a31cc4b9d7eeb55cb1514918'
-         'c367ef26300648ee9b8aca3dee5c9669')
+source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.xz"
+        "http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.xz"
+        'build.mk'
+        'ghc')
+md5sums=('97578e0c27574a99e0d5071a7f35d136'
+         'ac54f7fa453010149a573740705ecbfb'
+         'c367ef26300648ee9b8aca3dee5c9669'
+         'c1d46d86752c50dd85e7143b029fa07f')
 
 build() {
   cd ghc-${pkgver}
@@ -86,7 +86,9 @@ build() {
   cp ${srcdir}/build.mk mk/build.mk
 
   ./configure \
-    --prefix=/usr
+    --prefix=/usr \
+    --with-system-libffi \
+    --with-ffi-includes=/usr/lib/libffi-3.0.13/include
 
   make
 }
@@ -98,7 +100,6 @@ check() {
   cd ghc-${pkgver}
 
   # python2 rename
-  sed -e 's/PYTHON = python/&2/' -i testsuite/mk/boilerplate.mk
   sed -e 's_#!/usr/bin/env python_&2_' -i testsuite/timeout/calibrate testsuite/timeout/timeout.py
 
   # upstream known failures on both i686 and x86_64:
@@ -132,4 +133,10 @@ package() {
   install -d ${pkgdir}/usr/share/licenses/ghc
   install -m644 LICENSE \
     ${pkgdir}/usr/share/licenses/ghc
+
+  # provide non vanilla bash completion since ghc currently doesn't ship with any:
+  # https://ghc.haskell.org/trac/ghc/ticket/9006
+  install -d ${pkgdir}/usr/share/bash-completion/completions
+  install -m644 ${srcdir}/ghc \
+    ${pkgdir}/usr/share/bash-completion/completions
 }
diff --git a/extra/ghc/ghc b/extra/ghc/ghc
new file mode 100644
index 000000000..5e1e189c5
--- /dev/null
+++ b/extra/ghc/ghc
@@ -0,0 +1,10 @@
+_ghc()
+{
+    local envs=`ghc --show-options`
+    # get the word currently being completed
+   local cur=${COMP_WORDS[$COMP_CWORD]}
+
+    # the resulting completions should be put into this array
+    COMPREPLY=( $( compgen -W "$envs" -- $cur ) )
+}
+complete -F _ghc -o default ghc
diff --git a/extra/ghc/print-provides-replaces.sh b/extra/ghc/print-provides-replaces.sh
index 33d1da051..a81a439e7 100755
--- a/extra/ghc/print-provides-replaces.sh
+++ b/extra/ghc/print-provides-replaces.sh
@@ -12,6 +12,11 @@ declare -A exclude
 exclude['Win32']=1
 # no integer-simple because we use integer-gmp
 exclude['integer-simple']=1
+# the rest are installed as dependencies of ghc and some shouldn't even be installed!
+# https://ghc.haskell.org/trac/ghc/ticket/8919
+exclude['haskeline']=1
+exclude['terminfo']=1
+exclude['xhtml']=1
 # extract excluded libraries from ghc.mk
 for exclude_pkg in $(sed 's/PKGS_THAT_ARE_INTREE_ONLY := //p' -n src/ghc-${pkgver}/ghc.mk); do
   exclude[${exclude_pkg}]=1
@@ -26,13 +31,17 @@ print_var() {
   for pkg in $(ls ./*/*.cabal | awk -F '/' '{ print $2 }'); do
     [[ ${exclude[${pkg}]} ]] && continue
     version=$(awk 'tolower($0) ~ /^version:/ {print $2 }' $pkg/$pkg.cabal)
-    printf "'haskell-$pkg$2$version'\n          "
+    printf "'haskell-$pkg"
+    [[ -n "$2" ]] && printf "$2$version"
+    printf "'\n          "
   done
   # also add cabal
   version=$(awk 'tolower($0) ~ /^version:/ { print $2 }' Cabal/Cabal/Cabal.cabal)
-  printf "'haskell-cabal$2$version'\n          "
+  printf "'haskell-cabal"
+  [[ -n "$2" ]] && printf "$2$version"
+  printf "'\n          "
   echo -e '\b)'
 }
 
 print_var 'provides' '='
-print_var 'replaces' '<'
+print_var 'replaces'
diff --git a/extra/haskell-transformers/PKGBUILD b/extra/haskell-transformers/PKGBUILD
deleted file mode 100644
index 144848401..000000000
--- a/extra/haskell-transformers/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-
-_hkgname=transformers
-pkgname=haskell-transformers
-pkgver=0.3.0.0
-pkgrel=4
-pkgdesc="Concrete functor and monad transformers"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.3-1' 'sh')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install=${pkgname}.install
-options=('staticlibs')
-md5sums=('852dc0b79cc2bcb39136287d3dd385e5')
-
-build() {
-  cd ${_hkgname}-${pkgver}
-
-  runhaskell Setup configure -O -p \
-    --enable-split-objs \
-    --enable-shared \
-    --prefix=/usr \
-    --docdir=/usr/share/doc/${pkgname} \
-    --libsubdir=\$compiler/site-local/\$pkgid
-
-  runhaskell Setup build
-
-  runhaskell Setup haddock
-
-  runhaskell Setup register   --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd ${_hkgname}-${pkgver}
-
-  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-  install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-
-  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-  ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-
-  runhaskell Setup copy --destdir=${pkgdir}
-
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-  rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
-
diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD
index dc40217c5..bb137ddf7 100644
--- a/extra/mercurial/PKGBUILD
+++ b/extra/mercurial/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 209809 2014-04-04 16:27:12Z giovanni $
+# $Id: PKGBUILD 212041 2014-05-04 16:12:39Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=mercurial
-pkgver=2.9.2
+pkgver=3.0
 pkgrel=1
 pkgdesc="A scalable distributed SCM tool"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI')
 backup=('etc/mercurial/hgrc')
 source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz"
         'mercurial.profile')
-md5sums=('1caeed1bea1232598fc5ce5d6d109f56'
+md5sums=('133ff0a31047d2c0b4640943a58535a7'
          '43e1d36564d4c7fbe9a091d3ea370a44')
 
 package() {
diff --git a/extra/xorg-xbacklight/PKGBUILD b/extra/xorg-xbacklight/PKGBUILD
index 412b91056..e34883770 100644
--- a/extra/xorg-xbacklight/PKGBUILD
+++ b/extra/xorg-xbacklight/PKGBUILD
@@ -1,8 +1,9 @@
-# $Id: PKGBUILD 166654 2012-09-14 14:36:40Z andyrtr $
+# $Id: PKGBUILD 211998 2014-05-04 08:34:39Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xbacklight
-pkgver=1.2.0
+pkgver=1.2.1
 pkgrel=1
 pkgdesc="RandR-based backlight control application"
 arch=('i686' 'x86_64')
@@ -12,16 +13,16 @@ depends=('xcb-util')
 makedepends=('xorg-util-macros')
 groups=('xorg-apps' 'xorg')
 source=(http://xorg.freedesktop.org/archive/individual/app/xbacklight-${pkgver}.tar.bz2)
-sha256sums=('5152d6134fa592c9c14060d7324a7db104da0184cc9b2f9715e847f9354e36a5')
+sha256sums=('17f6cf51a35eaa918abec36b7871d28b712c169312e22a0eaf1ffe8d6468362b')
 
 build() {
-  cd "${srcdir}/xbacklight-${pkgver}"
+  cd xbacklight-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/xbacklight-${pkgver}"
+  cd xbacklight-${pkgver}
   make DESTDIR="${pkgdir}" install
   install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD
index 9323bcac6..bcb4cdbe4 100644
--- a/extra/xterm/PKGBUILD
+++ b/extra/xterm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 207149 2014-03-07 19:55:00Z andyrtr $
+# $Id: PKGBUILD 212000 2014-05-04 08:39:18Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xterm
-pkgver=303
+pkgver=304
 pkgrel=1
 pkgdesc="X Terminal Emulator"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('custom')
 depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps' 'libutempter')
 source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz{,.asc}
         LICENSE)
-md5sums=('48f6d49b2b6b6933d501d767cbed9254'
+md5sums=('8a9460d848cf4ed244fcfc9b07d1c3d0'
          'SKIP'
          '10ecc3f8ee91e3189863a172f68282d2')