3 files changed, 7 insertions, 106 deletions

diff --git a/x11-toolkits/hs-OpenGL/Makefile b/x11-toolkits/hs-OpenGL/Makefile
index 7f993d12cd51..6660432b0466 100644
--- a/x11-toolkits/hs-OpenGL/Makefile
+++ b/x11-toolkits/hs-OpenGL/Makefile
@@ -5,14 +5,17 @@
 # $FreeBSD$
 
 PORTNAME=	OpenGL
-PORTVERSION=	2.4.0.1
+PORTVERSION=	2.2.3.0
+PORTEPOCH=	1
 CATEGORIES=	x11-toolkits haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	OpenGL bindings for Haskell programs
 
+LICENSE=	BSD
+
 CABAL_SETUP=	Setup.hs
-USE_HACKAGE=	GLURaw>=1.1.0.0 ObjectName OpenGLRaw>=1.1.0.0 StateVar Tensor
+USE_GL=		gl glut
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/x11-toolkits/hs-OpenGL/distinfo b/x11-toolkits/hs-OpenGL/distinfo
index 85b1a7e82dc7..3ab10bce68c6 100644
--- a/x11-toolkits/hs-OpenGL/distinfo
+++ b/x11-toolkits/hs-OpenGL/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/OpenGL-2.4.0.1.tar.gz) = 71b03fce1e3d64be1e874d7989f0272c
-SHA256 (cabal/OpenGL-2.4.0.1.tar.gz) = c59a718a3a992be4fc140f4c1563c4eef8bbbc5e6c14704a20b7e35381a3ac75
-SIZE (cabal/OpenGL-2.4.0.1.tar.gz) = 105262
+SHA256 (cabal/OpenGL-2.2.3.0.tar.gz) = a75c3277bb20fda9a4ac1eb0e838fe4b5baf92f5539466b92bd255626afb0502
+SIZE (cabal/OpenGL-2.2.3.0.tar.gz) = 189240
diff --git a/x11-toolkits/hs-OpenGL/pkg-plist b/x11-toolkits/hs-OpenGL/pkg-plist
deleted file mode 100644
index 439d11f6d034..000000000000
--- a/x11-toolkits/hs-OpenGL/pkg-plist
+++ /dev/null
@@ -1,101 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Antialiasing.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/BeginEnd.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Bitmaps.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/BlendingFactor.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/BufferMode.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/BufferObjects.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Capability.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Clipping.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/ColorSum.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Colors.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/ComparisonFunction.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/ControlPoint.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/CoordTrans.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/DataType.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/DisplayLists.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Domain.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/EdgeFlag.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Evaluators.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Exception.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Face.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Feedback.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/FlushFinish.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Fog.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Framebuffer.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/GLboolean.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Hints.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/IOState.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/LineSegments.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PeekPoke.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PerFragment.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PixelData.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PixelFormat.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PixelRectangles.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PixelRectangles/ColorTable.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PixelRectangles/Convolution.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PixelRectangles/Histogram.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PixelRectangles/Minmax.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PixelRectangles/PixelMap.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PixelRectangles/PixelStorage.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PixelRectangles/PixelTransfer.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PixelRectangles/Rasterization.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PixelRectangles/Reset.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PixelRectangles/Sink.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PointParameter.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Points.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PolygonMode.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Polygons.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PrimitiveMode.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/QueryUtils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/RasterPos.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/ReadCopyPixels.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Rectangles.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/RenderMode.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/SavingState.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Selection.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Shaders.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/StringQueries.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Texturing.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Texturing/Application.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Texturing/Environments.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Texturing/Objects.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Texturing/Parameters.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Texturing/PixelInternalFormat.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Texturing/Queries.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Texturing/Specification.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Texturing/TexParameter.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Texturing/TextureTarget.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Texturing/TextureUnit.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/VertexArrays.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/VertexAttributes.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/VertexSpec.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GLU.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GLU/Errors.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GLU/ErrorsInternal.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GLU/Initialization.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GLU/Matrix.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GLU/Mipmapping.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GLU/NURBS.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GLU/Quadrics.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GLU/Tessellation.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GLU
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Texturing
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PixelRectangles
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old