ports/142131: [patch]: update of x11-toolkits/hs-glut-ghc from the 2.1.2.1 version to the 2.2.2.0 version

Tue Dec 29 14:00:14 UTC 2009

>Number:         142131
>Category:       ports
>Synopsis:       [patch]: update of x11-toolkits/hs-glut-ghc from the 2.1.2.1 version to the 2.2.2.0 version
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 29 14:00:13 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Jacula Modyun
>Release:        FreeBSD 7.1-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD splork.wirewater.yow 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #0: Sat Oct 18 11:22:07 UTC 2008 root at splork.wirewater.yow:/usr/obj/usr/src/sys/JACULA i386


	
>Description:

x11-toolkits/hs-glut-ghc from the 2.1.2.1 version to the 2.2.2.0 version

http://www.haskell.org/haskellwiki/Opengl

>How-To-Repeat:
	
>Fix:

--- patch-hs-glut-ghc begins here ---
diff -uNr hs-glut-ghc.orig/Makefile hs-glut-ghc/Makefile
--- hs-glut-ghc.orig/Makefile	2009-12-06 20:56:55.000000000 +0000
+++ hs-glut-ghc/Makefile	2009-12-29 13:03:33.000000000 +0000
@@ -5,8 +5,7 @@
 # $FreeBSD: ports/x11-toolkits/hs-glut-ghc/Makefile,v 1.8 2009/12/06 20:56:55 pgj Exp $
 
 PORTNAME=	glut
-PORTVERSION=	2.1.2.1
-PORTREVISION=	1
+PORTVERSION=	2.2.2.0
 CATEGORIES=	x11-toolkits haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/GLUT/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -19,10 +18,13 @@
 USE_GL=		glut
 
 BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
-		hs-opengl-ghc>=2.2:${PORTSDIR}/x11-toolkits/hs-opengl-ghc
+		hs-opengl-ghc>=2.3:${PORTSDIR}/x11-toolkits/hs-opengl-ghc \
+		hs-StateVar>=1.0.0.0:${PORTSDIR}/devel/hs-StateVar \
+		hs-Tensor>=1.0.0.1:${PORTSDIR}/devel/hs-Tensor
 RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
-		hs-opengl-ghc>=2.2:${PORTSDIR}/x11-toolkits/hs-opengl-ghc
-LIB_DEPENDS+=	gmp.8:${PORTSDIR}/math/libgmp4
+		hs-opengl-ghc>=2.3:${PORTSDIR}/x11-toolkits/hs-opengl-ghc \
+		hs-StateVar>=1.0.0.0:${PORTSDIR}/devel/hs-StateVar \
+		hs-Tensor>=1.0.0.1:${PORTSDIR}/devel/hs-Tensor
 
 GHC_VERSION=	6.10.4
 HSGLUT_VERSION=	${PORTVERSION}
@@ -59,13 +61,11 @@
 
 .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}
+		     && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX} \
+		     				--extra-include-dirs=${LOCALBASE}/include \
+						--extra-lib-dirs=${LOCALBASE}/lib
 
 do-build:
 	cd ${WRKSRC} && ${SETUP_CMD} build \
diff -uNr hs-glut-ghc.orig/distinfo hs-glut-ghc/distinfo
--- hs-glut-ghc.orig/distinfo	2009-09-02 15:38:44.000000000 +0000
+++ hs-glut-ghc/distinfo	2009-12-29 12:57:10.000000000 +0000
@@ -1,3 +1,3 @@
-MD5 (GLUT-2.1.2.1.tar.gz) = b97f476a04098701e330e86c1f89ed52
-SHA256 (GLUT-2.1.2.1.tar.gz) = 0230bfacbfb85c126f1fba45fcd8d02f20da9ee19180b5ada698224362d17264
-SIZE (GLUT-2.1.2.1.tar.gz) = 720222
+MD5 (GLUT-2.2.2.0.tar.gz) = e11912f50b76950b0d9e27d25127e391
+SHA256 (GLUT-2.2.2.0.tar.gz) = 3d7febc48af4688b6b10a7356c25f33e54d4eb3643e10fbe26ff6e39b9bc3442
+SIZE (GLUT-2.2.2.0.tar.gz) = 650235
diff -uNr hs-glut-ghc.orig/pkg-plist hs-glut-ghc/pkg-plist
--- hs-glut-ghc.orig/pkg-plist	2009-09-02 15:38:44.000000000 +0000
+++ hs-glut-ghc/pkg-plist	2009-12-29 12:57:10.000000000 +0000
@@ -6,10 +6,8 @@
 %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Callbacks/Registration.hi
 %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Callbacks/Window.hi
 %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Colormap.hi
-%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Constants.hi
 %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Debugging.hi
 %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/DeviceControl.hi
-%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Extensions.hi
 %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Fonts.hi
 %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/GameMode.hi
 %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Initialization.hi
@@ -17,16 +15,21 @@
 %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Objects.hi
 %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Overlay.hi
 %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/QueryUtils.hi
+%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Raw.hi
+%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Raw/APIEntry.hi
+%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Raw/Callbacks.hi
+%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Raw/Fonts.hi
+%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Raw/Functions.hi
+%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Raw/Tokens.hi
 %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/State.hi
 %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Types.hi
 %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Window.hi
 %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSGLUT-%%HSGLUT_VERSION%%.o
-%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/HsGLUT.h
 %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSGLUT-%%HSGLUT_VERSION%%.a
 %%HSGLUT_LIBDIR_REL%%/register.sh
 %%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
 %%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
- at dirrm %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include
+ at dirrm %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Raw
 @dirrm %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Callbacks
 @dirrm %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT
 @dirrm %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI
--- patch-hs-glut-ghc ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

