From 1312f748e01ba87280b010e59b18460f69c3eeb9 Mon Sep 17 00:00:00 2001 From: Gabor Pali Date: Tue, 5 Jan 2010 19:55:23 +0000 Subject: - Update to 2.2.2.0 PR: ports/142131 Submitted by: Jacula Modyun --- x11-toolkits/hs-GLUT/Makefile | 21 +++++++++++---------- x11-toolkits/hs-GLUT/distinfo | 6 +++--- x11-toolkits/hs-GLUT/pkg-plist | 11 +++++++---- x11-toolkits/hs-glut-ghc/Makefile | 21 +++++++++++---------- x11-toolkits/hs-glut-ghc/distinfo | 6 +++--- x11-toolkits/hs-glut-ghc/pkg-plist | 11 +++++++---- 6 files changed, 42 insertions(+), 34 deletions(-) (limited to 'x11-toolkits') diff --git a/x11-toolkits/hs-GLUT/Makefile b/x11-toolkits/hs-GLUT/Makefile index 0a44ab7e41bd..cc9da831682d 100644 --- a/x11-toolkits/hs-GLUT/Makefile +++ b/x11-toolkits/hs-GLUT/Makefile @@ -5,8 +5,7 @@ # $FreeBSD$ 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,14 @@ COMMENT= A Haskell binding for the OpenGL Utility Toolkit 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 +62,11 @@ 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} + && ${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 --git a/x11-toolkits/hs-GLUT/distinfo b/x11-toolkits/hs-GLUT/distinfo index 06900d54f25c..c0e2734cf51a 100644 --- a/x11-toolkits/hs-GLUT/distinfo +++ b/x11-toolkits/hs-GLUT/distinfo @@ -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 --git a/x11-toolkits/hs-GLUT/pkg-plist b/x11-toolkits/hs-GLUT/pkg-plist index b2f9337ffce5..c68dab137090 100644 --- a/x11-toolkits/hs-GLUT/pkg-plist +++ b/x11-toolkits/hs-GLUT/pkg-plist @@ -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,17 +15,22 @@ %%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%% -@dirrm %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include @dirrm %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Callbacks +@dirrm %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Raw @dirrm %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT @dirrm %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI @dirrm %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics diff --git a/x11-toolkits/hs-glut-ghc/Makefile b/x11-toolkits/hs-glut-ghc/Makefile index 0a44ab7e41bd..cc9da831682d 100644 --- a/x11-toolkits/hs-glut-ghc/Makefile +++ b/x11-toolkits/hs-glut-ghc/Makefile @@ -5,8 +5,7 @@ # $FreeBSD$ 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,14 @@ COMMENT= A Haskell binding for the OpenGL Utility Toolkit 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 +62,11 @@ 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} + && ${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 --git a/x11-toolkits/hs-glut-ghc/distinfo b/x11-toolkits/hs-glut-ghc/distinfo index 06900d54f25c..c0e2734cf51a 100644 --- a/x11-toolkits/hs-glut-ghc/distinfo +++ b/x11-toolkits/hs-glut-ghc/distinfo @@ -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 --git a/x11-toolkits/hs-glut-ghc/pkg-plist b/x11-toolkits/hs-glut-ghc/pkg-plist index b2f9337ffce5..c68dab137090 100644 --- a/x11-toolkits/hs-glut-ghc/pkg-plist +++ b/x11-toolkits/hs-glut-ghc/pkg-plist @@ -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,17 +15,22 @@ %%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%% -@dirrm %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include @dirrm %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Callbacks +@dirrm %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Raw @dirrm %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT @dirrm %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI @dirrm %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics -- cgit v1.2.3