Index: head/x11-toolkits/hs-GLUT/Makefile =================================================================== --- head/x11-toolkits/hs-GLUT/Makefile (revision 226920) +++ head/x11-toolkits/hs-GLUT/Makefile (revision 226921) @@ -1,51 +1,62 @@ # New ports collection makefile for: hs-glut-ghc # Date created: 2007-09-04 # Whom: Volker Stolz # # $FreeBSD$ PORTNAME= glut -PORTVERSION= 2.1.1.1 -PORTREVISION= 3 +PORTVERSION= 2.1.1.2 CATEGORIES= x11-toolkits haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/GLUT/${PORTVERSION}/ PKGNAMEPREFIX= hs- PKGNAMESUFFIX= -ghc DISTNAME= GLUT-${PORTVERSION} MAINTAINER= haskell@FreeBSD.org -COMMENT= A Compiler for the functional language Haskell +COMMENT= A Haskell binding for the OpenGL Utility Toolkit USE_GL= glut GHC_VERSION= 6.8.3 PLIST_SUB+= GHC_VERSION=${GHC_VERSION} \ PORTVERSION=${PORTVERSION} \ PORTNAME=${PORTNAME} \ SUBDIR=lib/ghc-${GHC_VERSION}/cabal +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +PORTDOCS= LICENSE html .include BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc \ ${LOCALBASE}/lib/ghc-${GHC_VERSION}/cabal/opengl-register.sh:${PORTSDIR}/x11-toolkits/hs-opengl-ghc LIB_DEPENDS+= gmp.7:${PORTSDIR}/math/libgmp4 RUN_DEPENDS+= ${LOCALBASE}/lib/ghc-${GHC_VERSION}/cabal/opengl-register.sh:${PORTSDIR}/x11-toolkits/hs-opengl-ghc # 'owned' by lang/ghc: CABALDIR= ${PREFIX}/lib/ghc-${GHC_VERSION}/cabal CABALCMD= ${LOCALBASE}/bin/runghc Setup.hs SUBDIR= ${PORTNAME}${PKGNAMESUFFIX} +.if !defined(NOPORTDOCS) +BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock +PLIST_SUB+= RMLIC="@comment " +.else +PLIST_SUB+= RMLIC="" +.endif + do-configure: cd ${WRKSRC} && ${CABALCMD} configure --ghc --prefix=${PREFIX} --libdir=${CABALDIR} \ --libsubdir='' --datasubdir='' do-build: cd ${WRKSRC} && ${CABALCMD} build \ && ${CABALCMD} --gen-script register +.if !defined(NOPORTDOCS) + cd ${WRKSRC} && ${CABALCMD} haddock +.endif do-install: cd ${WRKSRC} && ${CABALCMD} install \ && ${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${CABALDIR}/${PORTNAME}-register.sh .include Property changes on: head/x11-toolkits/hs-GLUT/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/x11-toolkits/hs-GLUT/distinfo =================================================================== --- head/x11-toolkits/hs-GLUT/distinfo (revision 226920) +++ head/x11-toolkits/hs-GLUT/distinfo (revision 226921) @@ -1,3 +1,3 @@ -MD5 (GLUT-2.1.1.1.tar.gz) = 0af5df3ede4db67a1efa03bc55e08c01 -SHA256 (GLUT-2.1.1.1.tar.gz) = 09631322c78c1d5d2733fb5324344db68e99015162445c3364b844308c1e027e -SIZE (GLUT-2.1.1.1.tar.gz) = 121577 +MD5 (GLUT-2.1.1.2.tar.gz) = 67e5996a7fe56af764393f1cf80b9a43 +SHA256 (GLUT-2.1.1.2.tar.gz) = d5ecf4b6bacc5e68ade00710df04fa158c6ed322c74362954716a0baba6bd3fb +SIZE (GLUT-2.1.1.2.tar.gz) = 121228 Property changes on: head/x11-toolkits/hs-GLUT/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/x11-toolkits/hs-GLUT/pkg-plist =================================================================== --- head/x11-toolkits/hs-GLUT/pkg-plist (revision 226920) +++ head/x11-toolkits/hs-GLUT/pkg-plist (revision 226921) @@ -1,36 +1,36 @@ %%SUBDIR%%/Graphics/UI/GLUT/Callbacks/Global.hi %%SUBDIR%%/Graphics/UI/GLUT/Callbacks/Window.hi %%SUBDIR%%/Graphics/UI/GLUT/Callbacks/Registration.hi %%SUBDIR%%/Graphics/UI/GLUT/Begin.hi %%SUBDIR%%/Graphics/UI/GLUT/Callbacks.hi %%SUBDIR%%/Graphics/UI/GLUT/Colormap.hi %%SUBDIR%%/Graphics/UI/GLUT/Debugging.hi %%SUBDIR%%/Graphics/UI/GLUT/DeviceControl.hi %%SUBDIR%%/Graphics/UI/GLUT/Fonts.hi %%SUBDIR%%/Graphics/UI/GLUT/GameMode.hi %%SUBDIR%%/Graphics/UI/GLUT/Initialization.hi %%SUBDIR%%/Graphics/UI/GLUT/Menu.hi %%SUBDIR%%/Graphics/UI/GLUT/Objects.hi %%SUBDIR%%/Graphics/UI/GLUT/Overlay.hi %%SUBDIR%%/Graphics/UI/GLUT/State.hi %%SUBDIR%%/Graphics/UI/GLUT/Window.hi %%SUBDIR%%/Graphics/UI/GLUT/Constants.hi %%SUBDIR%%/Graphics/UI/GLUT/Extensions.hi %%SUBDIR%%/Graphics/UI/GLUT/QueryUtils.hi %%SUBDIR%%/Graphics/UI/GLUT/Types.hi %%SUBDIR%%/Graphics/UI/GLUT.hi %%SUBDIR%%/libHSGLUT-%%PORTVERSION%%.a %%SUBDIR%%/HSGLUT-%%PORTVERSION%%.o %%SUBDIR%%/include/HsGLUT.h %%SUBDIR%%/%%PORTNAME%%-register.sh -share/doc/GLUT-%%PORTVERSION%%/LICENSE -@dirrm share/doc/GLUT-%%PORTVERSION%% +%%RMLIC%%%%DOCSDIR%%/LICENSE +%%RMLIC%%@dirrm %%DOCSDIR%% @dirrm %%SUBDIR%%/Graphics/UI/GLUT/Callbacks @dirrm %%SUBDIR%%/Graphics/UI/GLUT @dirrmtry %%SUBDIR%%/Graphics/UI @dirrmtry %%SUBDIR%%/Graphics @dirrmtry %%SUBDIR%%/include @exec /bin/sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old @unexec %D/bin/ghc-pkg unregister GLUT @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old Property changes on: head/x11-toolkits/hs-GLUT/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/x11-toolkits/hs-glut-ghc/Makefile =================================================================== --- head/x11-toolkits/hs-glut-ghc/Makefile (revision 226920) +++ head/x11-toolkits/hs-glut-ghc/Makefile (revision 226921) @@ -1,51 +1,62 @@ # New ports collection makefile for: hs-glut-ghc # Date created: 2007-09-04 # Whom: Volker Stolz # # $FreeBSD$ PORTNAME= glut -PORTVERSION= 2.1.1.1 -PORTREVISION= 3 +PORTVERSION= 2.1.1.2 CATEGORIES= x11-toolkits haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/GLUT/${PORTVERSION}/ PKGNAMEPREFIX= hs- PKGNAMESUFFIX= -ghc DISTNAME= GLUT-${PORTVERSION} MAINTAINER= haskell@FreeBSD.org -COMMENT= A Compiler for the functional language Haskell +COMMENT= A Haskell binding for the OpenGL Utility Toolkit USE_GL= glut GHC_VERSION= 6.8.3 PLIST_SUB+= GHC_VERSION=${GHC_VERSION} \ PORTVERSION=${PORTVERSION} \ PORTNAME=${PORTNAME} \ SUBDIR=lib/ghc-${GHC_VERSION}/cabal +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +PORTDOCS= LICENSE html .include BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc \ ${LOCALBASE}/lib/ghc-${GHC_VERSION}/cabal/opengl-register.sh:${PORTSDIR}/x11-toolkits/hs-opengl-ghc LIB_DEPENDS+= gmp.7:${PORTSDIR}/math/libgmp4 RUN_DEPENDS+= ${LOCALBASE}/lib/ghc-${GHC_VERSION}/cabal/opengl-register.sh:${PORTSDIR}/x11-toolkits/hs-opengl-ghc # 'owned' by lang/ghc: CABALDIR= ${PREFIX}/lib/ghc-${GHC_VERSION}/cabal CABALCMD= ${LOCALBASE}/bin/runghc Setup.hs SUBDIR= ${PORTNAME}${PKGNAMESUFFIX} +.if !defined(NOPORTDOCS) +BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock +PLIST_SUB+= RMLIC="@comment " +.else +PLIST_SUB+= RMLIC="" +.endif + do-configure: cd ${WRKSRC} && ${CABALCMD} configure --ghc --prefix=${PREFIX} --libdir=${CABALDIR} \ --libsubdir='' --datasubdir='' do-build: cd ${WRKSRC} && ${CABALCMD} build \ && ${CABALCMD} --gen-script register +.if !defined(NOPORTDOCS) + cd ${WRKSRC} && ${CABALCMD} haddock +.endif do-install: cd ${WRKSRC} && ${CABALCMD} install \ && ${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${CABALDIR}/${PORTNAME}-register.sh .include Property changes on: head/x11-toolkits/hs-glut-ghc/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/x11-toolkits/hs-glut-ghc/distinfo =================================================================== --- head/x11-toolkits/hs-glut-ghc/distinfo (revision 226920) +++ head/x11-toolkits/hs-glut-ghc/distinfo (revision 226921) @@ -1,3 +1,3 @@ -MD5 (GLUT-2.1.1.1.tar.gz) = 0af5df3ede4db67a1efa03bc55e08c01 -SHA256 (GLUT-2.1.1.1.tar.gz) = 09631322c78c1d5d2733fb5324344db68e99015162445c3364b844308c1e027e -SIZE (GLUT-2.1.1.1.tar.gz) = 121577 +MD5 (GLUT-2.1.1.2.tar.gz) = 67e5996a7fe56af764393f1cf80b9a43 +SHA256 (GLUT-2.1.1.2.tar.gz) = d5ecf4b6bacc5e68ade00710df04fa158c6ed322c74362954716a0baba6bd3fb +SIZE (GLUT-2.1.1.2.tar.gz) = 121228 Property changes on: head/x11-toolkits/hs-glut-ghc/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/x11-toolkits/hs-glut-ghc/pkg-plist =================================================================== --- head/x11-toolkits/hs-glut-ghc/pkg-plist (revision 226920) +++ head/x11-toolkits/hs-glut-ghc/pkg-plist (revision 226921) @@ -1,36 +1,36 @@ %%SUBDIR%%/Graphics/UI/GLUT/Callbacks/Global.hi %%SUBDIR%%/Graphics/UI/GLUT/Callbacks/Window.hi %%SUBDIR%%/Graphics/UI/GLUT/Callbacks/Registration.hi %%SUBDIR%%/Graphics/UI/GLUT/Begin.hi %%SUBDIR%%/Graphics/UI/GLUT/Callbacks.hi %%SUBDIR%%/Graphics/UI/GLUT/Colormap.hi %%SUBDIR%%/Graphics/UI/GLUT/Debugging.hi %%SUBDIR%%/Graphics/UI/GLUT/DeviceControl.hi %%SUBDIR%%/Graphics/UI/GLUT/Fonts.hi %%SUBDIR%%/Graphics/UI/GLUT/GameMode.hi %%SUBDIR%%/Graphics/UI/GLUT/Initialization.hi %%SUBDIR%%/Graphics/UI/GLUT/Menu.hi %%SUBDIR%%/Graphics/UI/GLUT/Objects.hi %%SUBDIR%%/Graphics/UI/GLUT/Overlay.hi %%SUBDIR%%/Graphics/UI/GLUT/State.hi %%SUBDIR%%/Graphics/UI/GLUT/Window.hi %%SUBDIR%%/Graphics/UI/GLUT/Constants.hi %%SUBDIR%%/Graphics/UI/GLUT/Extensions.hi %%SUBDIR%%/Graphics/UI/GLUT/QueryUtils.hi %%SUBDIR%%/Graphics/UI/GLUT/Types.hi %%SUBDIR%%/Graphics/UI/GLUT.hi %%SUBDIR%%/libHSGLUT-%%PORTVERSION%%.a %%SUBDIR%%/HSGLUT-%%PORTVERSION%%.o %%SUBDIR%%/include/HsGLUT.h %%SUBDIR%%/%%PORTNAME%%-register.sh -share/doc/GLUT-%%PORTVERSION%%/LICENSE -@dirrm share/doc/GLUT-%%PORTVERSION%% +%%RMLIC%%%%DOCSDIR%%/LICENSE +%%RMLIC%%@dirrm %%DOCSDIR%% @dirrm %%SUBDIR%%/Graphics/UI/GLUT/Callbacks @dirrm %%SUBDIR%%/Graphics/UI/GLUT @dirrmtry %%SUBDIR%%/Graphics/UI @dirrmtry %%SUBDIR%%/Graphics @dirrmtry %%SUBDIR%%/include @exec /bin/sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old @unexec %D/bin/ghc-pkg unregister GLUT @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old Property changes on: head/x11-toolkits/hs-glut-ghc/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property