From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jul 24 17:50:05 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 209D9106566C for ; Fri, 24 Jul 2009 17:50:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id E4C4D8FC24 for ; Fri, 24 Jul 2009 17:50:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n6OHo4oY078447 for ; Fri, 24 Jul 2009 17:50:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n6OHo4oi078446; Fri, 24 Jul 2009 17:50:04 GMT (envelope-from gnats) Resent-Date: Fri, 24 Jul 2009 17:50:04 GMT Resent-Message-Id: <200907241750.n6OHo4oi078446@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jacula Modyun Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CE0661065675 for ; Fri, 24 Jul 2009 17:49:41 +0000 (UTC) (envelope-from jacula@gmail.com) Received: from mail-bw0-f219.google.com (mail-bw0-f219.google.com [209.85.218.219]) by mx1.freebsd.org (Postfix) with ESMTP id 1BDCE8FC1C for ; Fri, 24 Jul 2009 17:49:40 +0000 (UTC) (envelope-from jacula@gmail.com) Received: by bwz19 with SMTP id 19so1537583bwz.43 for ; Fri, 24 Jul 2009 10:49:40 -0700 (PDT) Received: by 10.204.57.67 with SMTP id b3mr3494114bkh.99.1248457779835; Fri, 24 Jul 2009 10:49:39 -0700 (PDT) Received: from splork.wirewater.yow (host247-86-dynamic.55-79-r.retail.telecomitalia.it [79.55.86.247]) by mx.google.com with ESMTPS id p9sm5430603fkb.37.2009.07.24.10.49.38 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 24 Jul 2009 10:49:39 -0700 (PDT) Received: from localhost.wirewater.yow [127.0.0.1] by splork.wirewater.yow (Sendmail: 8.14.3/8.14.3) with ESMTP id n6OHncY2095981 for ; Fri, 24 Jul 2009 17:49:38 GMT Received: by splork.wirewater.yow (Sendmail: 8.14.3/8.14.3/Submit) id n6OHncAF095980 ; Fri, 24 Jul 2009 17:49:38 GMT Message-Id: <200907241749.n6OHncAF095980@splork.wirewater.yow> Date: Fri, 24 Jul 2009 10:49:39 -0700 (PDT) From: Jacula Modyun To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/137077: [patch]: update of x11-toolkits/hs-glut-ghc from the 2.1.1.2 version to the 2.1.2.1 version X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Jacula Modyun List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Jul 2009 17:50:05 -0000 >Number: 137077 >Category: ports >Synopsis: [patch]: update of x11-toolkits/hs-glut-ghc from the 2.1.1.2 version to the 2.1.2.1 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: Fri Jul 24 17:50:04 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@splork.wirewater.yow:/usr/obj/usr/src/sys/JACULA i386 >Description: See the PR: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/137055 >How-To-Repeat: >Fix: --- patch-hs-glut-ghc.diff begins here --- diff -uNr hs-glut-ghc.orig/Makefile hs-glut-ghc/Makefile --- hs-glut-ghc.orig/Makefile 2009-05-13 09:45:59.000000000 +0000 +++ hs-glut-ghc/Makefile 2009-07-22 06:27:08.000000000 +0000 @@ -5,8 +5,7 @@ # $FreeBSD: ports/x11-toolkits/hs-glut-ghc/Makefile,v 1.6 2009/05/13 09:45:59 ale Exp $ PORTNAME= glut -PORTVERSION= 2.1.1.2 -PORTREVISION= 1 +PORTVERSION= 2.1.2.1 CATEGORIES= x11-toolkits haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/GLUT/${PORTVERSION}/ PKGNAMEPREFIX= hs- @@ -18,46 +17,65 @@ 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 + hs-opengl-ghc>=2.2:${PORTSDIR}/x11-toolkits/hs-opengl-ghc +RUN_DEPENDS+= ghc:${PORTSDIR}/lang/ghc \ + hs-opengl-ghc>=2.2:${PORTSDIR}/x11-toolkits/hs-opengl-ghc LIB_DEPENDS+= gmp.8:${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} +GHC_VERSION= 6.10.4 +HSGLUT_VERSION= ${PORTVERSION} + +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup + +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +HSGLUT_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + HSGLUT_VERSION=${HSGLUT_VERSION} \ + HSGLUT_LIBDIR_REL=${HSGLUT_LIBDIR_REL} + +.if defined(NOPORTDOCS) +PLIST_SUB+= NOPORTDOCS="" +.else +PLIST_SUB+= NOPORTDOCS="@comment " +.endif .if !defined(NOPORTDOCS) + +PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK) +.if !empty(PORT_HADDOCK:M?0) BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock -PLIST_SUB+= RMLIC="@comment " -.else -PLIST_SUB+= RMLIC="" .endif +BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour + +HSCOLOUR_VERSION= 1.13 +HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION} + +PORTDOCS= * +.endif + +.SILENT: do-configure: - cd ${WRKSRC} && ${CABALCMD} configure --ghc --prefix=${PREFIX} --libdir=${CABALDIR} \ - --libsubdir='' --datasubdir='' + cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \ + && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX} do-build: - cd ${WRKSRC} && ${CABALCMD} build \ - && ${CABALCMD} --gen-script register + cd ${WRKSRC} && ${SETUP_CMD} build \ + && ${SETUP_CMD} register --gen-script + .if !defined(NOPORTDOCS) - cd ${WRKSRC} && ${CABALCMD} haddock + cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \ + --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css .endif do-install: - cd ${WRKSRC} && ${CABALCMD} install \ - && ${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${CABALDIR}/${PORTNAME}-register.sh + cd ${WRKSRC} && ${SETUP_CMD} install \ + && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${HSGLUT_LIBDIR_REL}/register.sh + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old -.include +.include diff -uNr hs-glut-ghc.orig/distinfo hs-glut-ghc/distinfo --- hs-glut-ghc.orig/distinfo 2009-01-26 21:07:08.000000000 +0000 +++ hs-glut-ghc/distinfo 2009-07-15 07:30:42.000000000 +0000 @@ -1,3 +1,3 @@ -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 +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 diff -uNr hs-glut-ghc.orig/pkg-descr hs-glut-ghc/pkg-descr --- hs-glut-ghc.orig/pkg-descr 2008-01-05 06:53:51.000000000 +0000 +++ hs-glut-ghc/pkg-descr 2009-07-15 09:07:58.000000000 +0000 @@ -3,4 +3,15 @@ information about the C library on which this binding is based, please see: . -WWW: http://www.haskell.org/HOpenGL/ +Maintainer: Sven Panne +License: BSD3 +WWW: http://www.haskell.org/HOpenGL/ + +exposed-modules: Graphics.UI.GLUT Graphics.UI.GLUT.Begin + Graphics.UI.GLUT.Callbacks Graphics.UI.GLUT.Callbacks.Global + Graphics.UI.GLUT.Callbacks.Window Graphics.UI.GLUT.Colormap + Graphics.UI.GLUT.Debugging Graphics.UI.GLUT.DeviceControl + Graphics.UI.GLUT.Fonts Graphics.UI.GLUT.GameMode + Graphics.UI.GLUT.Initialization Graphics.UI.GLUT.Menu + Graphics.UI.GLUT.Objects Graphics.UI.GLUT.Overlay + Graphics.UI.GLUT.State Graphics.UI.GLUT.Window diff -uNr hs-glut-ghc.orig/pkg-plist hs-glut-ghc/pkg-plist --- hs-glut-ghc.orig/pkg-plist 2009-01-26 21:07:08.000000000 +0000 +++ hs-glut-ghc/pkg-plist 2009-07-20 20:17:10.000000000 +0000 @@ -1,36 +1,38 @@ -%%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 -%%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 +%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT.hi +%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Begin.hi +%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Callbacks.hi +%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Callbacks/Global.hi +%%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 +%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Menu.hi +%%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/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 +@dirrm %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI +@dirrm %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics +@dirrm %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%HSGLUT_LIBDIR_REL%% +@exec /bin/sh %D/%%HSGLUT_LIBDIR_REL%%/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 --- patch-hs-glut-ghc.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: