- Update The Glorious Glasgow Haskell Compiler to version 7.4.1

Please note that port revision for all the Haskell ports without version changes
are also bumped.  Other per-port updates are coming soon (in separate commits)!
In addition to that, separate -docs ports are no longer needed so they are
now removed.

Thanks ashish@ for the assistance.

Obtained from:	FreeBSD Haskell

7 files changed, 23 insertions, 7 deletions

diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index f9b1c7a22d6..70df44131ba 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -90,6 +90,7 @@
     SUBDIR += hs-pango
     SUBDIR += hs-vte
     SUBDIR += hs-wx
+    SUBDIR += hs-wxc
     SUBDIR += hs-wxcore
     SUBDIR += hs-wxdirect
     SUBDIR += irrlicht
diff --git a/x11-toolkits/hs-GLUT/Makefile b/x11-toolkits/hs-GLUT/Makefile
index 22a1c4ada89..7150c4b13dd 100644
--- a/x11-toolkits/hs-GLUT/Makefile
+++ b/x11-toolkits/hs-GLUT/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	GLUT
 PORTVERSION=	2.1.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits haskell
 
diff --git a/x11-toolkits/hs-GLUT/files/patch-Graphics__UI__GLUT__Types.hs b/x11-toolkits/hs-GLUT/files/patch-Graphics__UI__GLUT__Types.hs
new file mode 100644
index 00000000000..f25bc339120
--- /dev/null
+++ b/x11-toolkits/hs-GLUT/files/patch-Graphics__UI__GLUT__Types.hs
@@ -0,0 +1,16 @@
+--- ./Graphics/UI/GLUT/Types.hs.orig	2009-05-02 18:14:39.000000000 +0200
++++ ./Graphics/UI/GLUT/Types.hs	2012-05-17 00:04:47.000000000 +0200
+@@ -32,11 +32,10 @@
+ 
+ -- | An opaque identifier for a top-level window or a subwindow.
+ 
+-newtype Window = Window CInt
+-   deriving ( Eq, Ord, Show )
++type Window = CInt
+ 
+ makeWindow :: CInt -> Window
+-makeWindow = Window
++makeWindow = id
+ 
+ --------------------------------------------------------------------------------
+ 
diff --git a/x11-toolkits/hs-GLUT/pkg-descr b/x11-toolkits/hs-GLUT/pkg-descr
index 3038ec260e5..978adf6d08b 100644
--- a/x11-toolkits/hs-GLUT/pkg-descr
+++ b/x11-toolkits/hs-GLUT/pkg-descr
@@ -1,6 +1,4 @@
 The GLUT package contains a Haskell binding for the OpenGL Utility Toolkit, a
-window system independent toolkit for writing OpenGL programs. For more
-information about the C library on which this binding is based, please see:
-<http://www.opengl.org/resources/libraries/glut/>.
+window system independent toolkit for writing OpenGL programs.
 
-WWW: http://www.haskell.org/HOpenGL/
+WWW:	http://www.haskell.org/HOpenGL/
diff --git a/x11-toolkits/hs-gtk2hs/Makefile b/x11-toolkits/hs-gtk2hs/Makefile
index 4dbe59cf168..171055139f4 100644
--- a/x11-toolkits/hs-gtk2hs/Makefile
+++ b/x11-toolkits/hs-gtk2hs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtk2hs
 PORTVERSION=	0.12.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits haskell
 
diff --git a/x11-toolkits/hs-gtkglext/Makefile b/x11-toolkits/hs-gtkglext/Makefile
index ebdcea8e8f8..44650c0291f 100644
--- a/x11-toolkits/hs-gtkglext/Makefile
+++ b/x11-toolkits/hs-gtkglext/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkglext
 PORTVERSION=	0.12.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-vte/Makefile b/x11-toolkits/hs-vte/Makefile
index 4b65cc43d8c..d3f66087829 100644
--- a/x11-toolkits/hs-vte/Makefile
+++ b/x11-toolkits/hs-vte/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vte
 PORTVERSION=	0.12.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits haskell
 
 MAINTAINER=	haskell@FreeBSD.org