6 files changed, 22 insertions, 24 deletions

diff --git a/x11-toolkits/hs-OpenGL/Makefile b/x11-toolkits/hs-OpenGL/Makefile
index cad274544082..9370e0e6bc70 100644
--- a/x11-toolkits/hs-OpenGL/Makefile
+++ b/x11-toolkits/hs-OpenGL/Makefile
@@ -5,15 +5,15 @@
 # $FreeBSD$
 
 PORTNAME=	opengl
-PORTVERSION=	2.2.1
+PORTVERSION=	2.2.1.1
 CATEGORIES=	x11-toolkits haskell
 MASTER_SITES=	http://www.haskell.org/ghc/dist/${GHC_VERSION}/
 PKGNAMEPREFIX=	hs-
 PKGNAMESUFFIX=	-ghc
 DISTNAME=	ghc-${GHC_VERSION}-src-extralibs
 
-PATCH_SITES=	http://lambda.foldr.org/~vs/FreeBSD/ghc-cabal-${GHC_VERSION}/
-PATCHFILES=	patch-cabal-${GHC_VERSION}-Setup.hs
+#PATCH_SITES=	http://lambda.foldr.org/~vs/FreeBSD/ghc-cabal-${GHC_VERSION}/
+#PATCHFILES=	patch-cabal-${GHC_VERSION}-Setup.hs
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	OpenGL bindings for Haskell programs
@@ -21,7 +21,7 @@ COMMENT=	OpenGL bindings for Haskell programs
 USE_BZIP2=	yes
 USE_GL=		yes
 
-GHC_VERSION=	6.6.1
+GHC_VERSION=	6.8.2
 PLIST_SUB+=	GHC_VERSION=${GHC_VERSION} \
 		PORTVERSION=${PORTVERSION} \
 		PORTNAME=${PORTNAME} \
diff --git a/x11-toolkits/hs-OpenGL/distinfo b/x11-toolkits/hs-OpenGL/distinfo
index e8ef1338aa34..4fe973fd93d7 100644
--- a/x11-toolkits/hs-OpenGL/distinfo
+++ b/x11-toolkits/hs-OpenGL/distinfo
@@ -1,6 +1,3 @@
-MD5 (ghc-6.6.1-src-extralibs.tar.bz2) = 43a26b81608b206c056adc3032f7da2a
-SHA256 (ghc-6.6.1-src-extralibs.tar.bz2) = d162a82fc388fdd48c327b09bb6d778f2313d12d5282f3b120ac08a5d4e78902
-SIZE (ghc-6.6.1-src-extralibs.tar.bz2) = 1928527
-MD5 (patch-cabal-6.6.1-Setup.hs) = 060eea0c5871bbe67a2b96e60a5b2e91
-SHA256 (patch-cabal-6.6.1-Setup.hs) = d88a54c1edda7a07d331a60d5c26335c1de1efce4a4433fff21f89ab3070e8ea
-SIZE (patch-cabal-6.6.1-Setup.hs) = 371
+MD5 (ghc-6.8.2-src-extralibs.tar.bz2) = d199c50814188fb77355d41058b8613c
+SHA256 (ghc-6.8.2-src-extralibs.tar.bz2) = 96cdd5694907b22d3ecd7988d04e0105e50a8096d5662b21b6acaf79ffba9510
+SIZE (ghc-6.8.2-src-extralibs.tar.bz2) = 1919843
diff --git a/x11-toolkits/hs-OpenGL/pkg-plist b/x11-toolkits/hs-OpenGL/pkg-plist
index fcd63ca117ca..06013cefd42f 100644
--- a/x11-toolkits/hs-OpenGL/pkg-plist
+++ b/x11-toolkits/hs-OpenGL/pkg-plist
@@ -82,10 +82,12 @@
 %%SUBDIR%%/Graphics/Rendering/OpenGL/GL.hi
 %%SUBDIR%%/Graphics/Rendering/OpenGL/GLU.hi
 %%SUBDIR%%/Graphics/Rendering/OpenGL.hi
-%%SUBDIR%%/libHSOpenGL-2.2.1.a
-%%SUBDIR%%/HSOpenGL-2.2.1.o
+%%SUBDIR%%/libHSOpenGL-%%PORTVERSION%%.a
+%%SUBDIR%%/HSOpenGL-%%PORTVERSION%%.o
 %%SUBDIR%%/include/HsOpenGL.h
 %%SUBDIR%%/%%PORTNAME%%-register.sh
+share/doc/OpenGL-%%PORTVERSION%%/LICENSE
+@dirrm share/doc/OpenGL-%%PORTVERSION%%
 @dirrm %%SUBDIR%%/include
 @dirrm %%SUBDIR%%/Graphics/Rendering/OpenGL/GLU
 @dirrm %%SUBDIR%%/Graphics/Rendering/OpenGL/GL/Texturing
diff --git a/x11-toolkits/hs-opengl-ghc/Makefile b/x11-toolkits/hs-opengl-ghc/Makefile
index cad274544082..9370e0e6bc70 100644
--- a/x11-toolkits/hs-opengl-ghc/Makefile
+++ b/x11-toolkits/hs-opengl-ghc/Makefile
@@ -5,15 +5,15 @@
 # $FreeBSD$
 
 PORTNAME=	opengl
-PORTVERSION=	2.2.1
+PORTVERSION=	2.2.1.1
 CATEGORIES=	x11-toolkits haskell
 MASTER_SITES=	http://www.haskell.org/ghc/dist/${GHC_VERSION}/
 PKGNAMEPREFIX=	hs-
 PKGNAMESUFFIX=	-ghc
 DISTNAME=	ghc-${GHC_VERSION}-src-extralibs
 
-PATCH_SITES=	http://lambda.foldr.org/~vs/FreeBSD/ghc-cabal-${GHC_VERSION}/
-PATCHFILES=	patch-cabal-${GHC_VERSION}-Setup.hs
+#PATCH_SITES=	http://lambda.foldr.org/~vs/FreeBSD/ghc-cabal-${GHC_VERSION}/
+#PATCHFILES=	patch-cabal-${GHC_VERSION}-Setup.hs
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	OpenGL bindings for Haskell programs
@@ -21,7 +21,7 @@ COMMENT=	OpenGL bindings for Haskell programs
 USE_BZIP2=	yes
 USE_GL=		yes
 
-GHC_VERSION=	6.6.1
+GHC_VERSION=	6.8.2
 PLIST_SUB+=	GHC_VERSION=${GHC_VERSION} \
 		PORTVERSION=${PORTVERSION} \
 		PORTNAME=${PORTNAME} \
diff --git a/x11-toolkits/hs-opengl-ghc/distinfo b/x11-toolkits/hs-opengl-ghc/distinfo
index e8ef1338aa34..4fe973fd93d7 100644
--- a/x11-toolkits/hs-opengl-ghc/distinfo
+++ b/x11-toolkits/hs-opengl-ghc/distinfo
@@ -1,6 +1,3 @@
-MD5 (ghc-6.6.1-src-extralibs.tar.bz2) = 43a26b81608b206c056adc3032f7da2a
-SHA256 (ghc-6.6.1-src-extralibs.tar.bz2) = d162a82fc388fdd48c327b09bb6d778f2313d12d5282f3b120ac08a5d4e78902
-SIZE (ghc-6.6.1-src-extralibs.tar.bz2) = 1928527
-MD5 (patch-cabal-6.6.1-Setup.hs) = 060eea0c5871bbe67a2b96e60a5b2e91
-SHA256 (patch-cabal-6.6.1-Setup.hs) = d88a54c1edda7a07d331a60d5c26335c1de1efce4a4433fff21f89ab3070e8ea
-SIZE (patch-cabal-6.6.1-Setup.hs) = 371
+MD5 (ghc-6.8.2-src-extralibs.tar.bz2) = d199c50814188fb77355d41058b8613c
+SHA256 (ghc-6.8.2-src-extralibs.tar.bz2) = 96cdd5694907b22d3ecd7988d04e0105e50a8096d5662b21b6acaf79ffba9510
+SIZE (ghc-6.8.2-src-extralibs.tar.bz2) = 1919843
diff --git a/x11-toolkits/hs-opengl-ghc/pkg-plist b/x11-toolkits/hs-opengl-ghc/pkg-plist
index fcd63ca117ca..06013cefd42f 100644
--- a/x11-toolkits/hs-opengl-ghc/pkg-plist
+++ b/x11-toolkits/hs-opengl-ghc/pkg-plist
@@ -82,10 +82,12 @@
 %%SUBDIR%%/Graphics/Rendering/OpenGL/GL.hi
 %%SUBDIR%%/Graphics/Rendering/OpenGL/GLU.hi
 %%SUBDIR%%/Graphics/Rendering/OpenGL.hi
-%%SUBDIR%%/libHSOpenGL-2.2.1.a
-%%SUBDIR%%/HSOpenGL-2.2.1.o
+%%SUBDIR%%/libHSOpenGL-%%PORTVERSION%%.a
+%%SUBDIR%%/HSOpenGL-%%PORTVERSION%%.o
 %%SUBDIR%%/include/HsOpenGL.h
 %%SUBDIR%%/%%PORTNAME%%-register.sh
+share/doc/OpenGL-%%PORTVERSION%%/LICENSE
+@dirrm share/doc/OpenGL-%%PORTVERSION%%
 @dirrm %%SUBDIR%%/include
 @dirrm %%SUBDIR%%/Graphics/Rendering/OpenGL/GLU
 @dirrm %%SUBDIR%%/Graphics/Rendering/OpenGL/GL/Texturing