- Update to 2.4.0.1

PR:		ports/142130
Submitted by:	Jacula Modyun <jacula(at)gmail.com>

6 files changed, 32 insertions, 38 deletions

diff --git a/x11-toolkits/hs-OpenGL/Makefile b/x11-toolkits/hs-OpenGL/Makefile
index 07235058d54b..1944b779dcbd 100644
--- a/x11-toolkits/hs-OpenGL/Makefile
+++ b/x11-toolkits/hs-OpenGL/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	opengl
-PORTVERSION=	2.2.3.0
-PORTREVISION=	1
+PORTVERSION=	2.4.0.1
 CATEGORIES=	x11-toolkits haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/OpenGL/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -16,11 +15,19 @@ DISTNAME=	OpenGL-${PORTVERSION}
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	OpenGL bindings for Haskell programs
 
-BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
-RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
+BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
+		hs-OpenGLRaw-ghc>=1.1.0.0:${PORTSDIR}/x11-toolkits/hs-OpenGLRaw-ghc \
+		hs-GLURaw-ghc>=1.1.0.0:${PORTSDIR}/x11-toolkits/hs-GLURaw-ghc \
+		hs-StateVar>=1.0.0.0:${PORTSDIR}/devel/hs-StateVar \
+		hs-Tensor>=1.0.0.1:${PORTSDIR}/devel/hs-Tensor \
+		hs-ObjectName>=1.0.0.0:${PORTSDIR}/devel/hs-ObjectName
 
-USE_GL=		yes
-USE_XORG=	x11 xt
+RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
+		hs-OpenGLRaw-ghc>=1.1.0.0:${PORTSDIR}/x11-toolkits/hs-OpenGLRaw-ghc \
+		hs-GLURaw-ghc>=1.1.0.0:${PORTSDIR}/x11-toolkits/hs-GLURaw-ghc \
+		hs-StateVar>=1.0.0.0:${PORTSDIR}/devel/hs-StateVar \
+		hs-Tensor>=1.0.0.1:${PORTSDIR}/devel/hs-Tensor \
+		hs-ObjectName>=1.0.0.0:${PORTSDIR}/devel/hs-ObjectName
 
 GHC_VERSION=		6.10.4
 HSOPENGL_VERSION=	${PORTVERSION}
@@ -57,10 +64,6 @@ PORTDOCS=	*
 
 .SILENT:
 
-post-patch:
-	@${REINPLACE_CMD} 's|/usr/local/include|${LOCALBASE}/include|g' \
-		${WRKSRC}/configure
-
 do-configure:
 	cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \
 		     && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX}
diff --git a/x11-toolkits/hs-OpenGL/distinfo b/x11-toolkits/hs-OpenGL/distinfo
index 547dab684f83..683422b17ea6 100644
--- a/x11-toolkits/hs-OpenGL/distinfo
+++ b/x11-toolkits/hs-OpenGL/distinfo
@@ -1,3 +1,3 @@
-MD5 (OpenGL-2.2.3.0.tar.gz) = f4e3ccb471034a6a74921d4dab9dd32d
-SHA256 (OpenGL-2.2.3.0.tar.gz) = a75c3277bb20fda9a4ac1eb0e838fe4b5baf92f5539466b92bd255626afb0502
-SIZE (OpenGL-2.2.3.0.tar.gz) = 189240
+MD5 (OpenGL-2.4.0.1.tar.gz) = 71b03fce1e3d64be1e874d7989f0272c
+SHA256 (OpenGL-2.4.0.1.tar.gz) = c59a718a3a992be4fc140f4c1563c4eef8bbbc5e6c14704a20b7e35381a3ac75
+SIZE (OpenGL-2.4.0.1.tar.gz) = 105262
diff --git a/x11-toolkits/hs-OpenGL/pkg-plist b/x11-toolkits/hs-OpenGL/pkg-plist
index f0adb0c495e5..3752f75bea31 100644
--- a/x11-toolkits/hs-OpenGL/pkg-plist
+++ b/x11-toolkits/hs-OpenGL/pkg-plist
@@ -2,7 +2,6 @@
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Antialiasing.hi
-%%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/BasicTypes.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/BeginEnd.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Bitmaps.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/BlendingFactor.hi
@@ -21,7 +20,6 @@
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/EdgeFlag.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Evaluators.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Exception.hi
-%%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Extensions.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Face.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Feedback.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/FlushFinish.hi
@@ -59,9 +57,7 @@
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/SavingState.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Selection.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Shaders.hi
-%%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/StateVar.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/StringQueries.hi
-%%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Tensor.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Texturing.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Texturing/Application.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Texturing/Environments.hi
@@ -86,12 +82,10 @@
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GLU/Quadrics.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GLU/Tessellation.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSOpenGL-%%HSOPENGL_VERSION%%.o
-%%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/HsOpenGL.h
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSOpenGL-%%HSOPENGL_VERSION%%.a
 %%HSOPENGL_LIBDIR_REL%%/register.sh
 %%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
 %%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include
 @dirrm %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GLU
 @dirrm %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Texturing
 @dirrm %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PixelRectangles
diff --git a/x11-toolkits/hs-opengl-ghc/Makefile b/x11-toolkits/hs-opengl-ghc/Makefile
index 07235058d54b..1944b779dcbd 100644
--- a/x11-toolkits/hs-opengl-ghc/Makefile
+++ b/x11-toolkits/hs-opengl-ghc/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	opengl
-PORTVERSION=	2.2.3.0
-PORTREVISION=	1
+PORTVERSION=	2.4.0.1
 CATEGORIES=	x11-toolkits haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/OpenGL/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -16,11 +15,19 @@ DISTNAME=	OpenGL-${PORTVERSION}
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	OpenGL bindings for Haskell programs
 
-BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
-RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
+BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
+		hs-OpenGLRaw-ghc>=1.1.0.0:${PORTSDIR}/x11-toolkits/hs-OpenGLRaw-ghc \
+		hs-GLURaw-ghc>=1.1.0.0:${PORTSDIR}/x11-toolkits/hs-GLURaw-ghc \
+		hs-StateVar>=1.0.0.0:${PORTSDIR}/devel/hs-StateVar \
+		hs-Tensor>=1.0.0.1:${PORTSDIR}/devel/hs-Tensor \
+		hs-ObjectName>=1.0.0.0:${PORTSDIR}/devel/hs-ObjectName
 
-USE_GL=		yes
-USE_XORG=	x11 xt
+RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
+		hs-OpenGLRaw-ghc>=1.1.0.0:${PORTSDIR}/x11-toolkits/hs-OpenGLRaw-ghc \
+		hs-GLURaw-ghc>=1.1.0.0:${PORTSDIR}/x11-toolkits/hs-GLURaw-ghc \
+		hs-StateVar>=1.0.0.0:${PORTSDIR}/devel/hs-StateVar \
+		hs-Tensor>=1.0.0.1:${PORTSDIR}/devel/hs-Tensor \
+		hs-ObjectName>=1.0.0.0:${PORTSDIR}/devel/hs-ObjectName
 
 GHC_VERSION=		6.10.4
 HSOPENGL_VERSION=	${PORTVERSION}
@@ -57,10 +64,6 @@ PORTDOCS=	*
 
 .SILENT:
 
-post-patch:
-	@${REINPLACE_CMD} 's|/usr/local/include|${LOCALBASE}/include|g' \
-		${WRKSRC}/configure
-
 do-configure:
 	cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \
 		     && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX}
diff --git a/x11-toolkits/hs-opengl-ghc/distinfo b/x11-toolkits/hs-opengl-ghc/distinfo
index 547dab684f83..683422b17ea6 100644
--- a/x11-toolkits/hs-opengl-ghc/distinfo
+++ b/x11-toolkits/hs-opengl-ghc/distinfo
@@ -1,3 +1,3 @@
-MD5 (OpenGL-2.2.3.0.tar.gz) = f4e3ccb471034a6a74921d4dab9dd32d
-SHA256 (OpenGL-2.2.3.0.tar.gz) = a75c3277bb20fda9a4ac1eb0e838fe4b5baf92f5539466b92bd255626afb0502
-SIZE (OpenGL-2.2.3.0.tar.gz) = 189240
+MD5 (OpenGL-2.4.0.1.tar.gz) = 71b03fce1e3d64be1e874d7989f0272c
+SHA256 (OpenGL-2.4.0.1.tar.gz) = c59a718a3a992be4fc140f4c1563c4eef8bbbc5e6c14704a20b7e35381a3ac75
+SIZE (OpenGL-2.4.0.1.tar.gz) = 105262
diff --git a/x11-toolkits/hs-opengl-ghc/pkg-plist b/x11-toolkits/hs-opengl-ghc/pkg-plist
index f0adb0c495e5..3752f75bea31 100644
--- a/x11-toolkits/hs-opengl-ghc/pkg-plist
+++ b/x11-toolkits/hs-opengl-ghc/pkg-plist
@@ -2,7 +2,6 @@
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Antialiasing.hi
-%%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/BasicTypes.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/BeginEnd.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Bitmaps.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/BlendingFactor.hi
@@ -21,7 +20,6 @@
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/EdgeFlag.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Evaluators.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Exception.hi
-%%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Extensions.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Face.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Feedback.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/FlushFinish.hi
@@ -59,9 +57,7 @@
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/SavingState.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Selection.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Shaders.hi
-%%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/StateVar.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/StringQueries.hi
-%%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Tensor.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Texturing.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Texturing/Application.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Texturing/Environments.hi
@@ -86,12 +82,10 @@
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GLU/Quadrics.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GLU/Tessellation.hi
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSOpenGL-%%HSOPENGL_VERSION%%.o
-%%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/HsOpenGL.h
 %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSOpenGL-%%HSOPENGL_VERSION%%.a
 %%HSOPENGL_LIBDIR_REL%%/register.sh
 %%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
 %%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include
 @dirrm %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GLU
 @dirrm %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Texturing
 @dirrm %%HSOPENGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PixelRectangles