From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jul 24 19:10:04 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 596621065678 for ; Fri, 24 Jul 2009 19:10:04 +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 2A31B8FC29 for ; Fri, 24 Jul 2009 19:10: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 n6OJA47S040489 for ; Fri, 24 Jul 2009 19:10:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n6OJA4oe040488; Fri, 24 Jul 2009 19:10:04 GMT (envelope-from gnats) Resent-Date: Fri, 24 Jul 2009 19:10:04 GMT Resent-Message-Id: <200907241910.n6OJA4oe040488@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 5C0611065686 for ; Fri, 24 Jul 2009 19:02:04 +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 C85D28FC14 for ; Fri, 24 Jul 2009 19:02:03 +0000 (UTC) (envelope-from jacula@gmail.com) Received: by bwz19 with SMTP id 19so1569981bwz.43 for ; Fri, 24 Jul 2009 12:02:02 -0700 (PDT) Received: by 10.204.59.73 with SMTP id k9mr33424bkh.167.1248462122840; Fri, 24 Jul 2009 12:02:02 -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 21sm5631504fks.9.2009.07.24.12.01.58 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 24 Jul 2009 12:01:59 -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 n6OJ1wjm015164 for ; Fri, 24 Jul 2009 19:01:58 GMT Received: by splork.wirewater.yow (Sendmail: 8.14.3/8.14.3/Submit) id n6OJ1vVm015161 ; Fri, 24 Jul 2009 19:01:57 GMT Message-Id: <200907241901.n6OJ1vVm015161@splork.wirewater.yow> Date: Fri, 24 Jul 2009 12:01:59 -0700 (PDT) From: Jacula Modyun To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/137097: [patch]: update of devel/hs-lazysmallcheck-ghc to ghc-6.10.4 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 19:10:04 -0000 >Number: 137097 >Category: ports >Synopsis: [patch]: update of devel/hs-lazysmallcheck-ghc to ghc-6.10.4 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Jul 24 19:10:03 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-lazysmallcheck-ghc.diff begins here --- diff -uNr hs-lazysmallcheck-ghc.orig/Makefile hs-lazysmallcheck-ghc/Makefile --- hs-lazysmallcheck-ghc.orig/Makefile 2009-03-14 15:19:34.000000000 +0000 +++ hs-lazysmallcheck-ghc/Makefile 2009-07-22 06:24:19.000000000 +0000 @@ -7,6 +7,7 @@ PORTNAME= lazysmallcheck PORTVERSION= 0.3 +PORTREVISION= 1 CATEGORIES= devel haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ PKGNAMEPREFIX= hs- @@ -18,38 +19,59 @@ BUILD_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc RUN_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc -GHC_VERSION= 6.8.3 -CABALCMD= ${LOCALBASE}/bin/runghc Setup.hs -CABALDIR= lib/ghc-${GHC_VERSION}/cabal - -SUBDIR= lib/${PORTNAME}-${PORTVERSION} -PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ - PORTNAME=${PORTNAME} \ - PORTVERSION=${PORTVERSION} \ - SUBDIR=${CABALDIR} -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} -PORTDOCS= LICENSE html +GHC_VERSION= 6.10.4 +LAZYSMALLCHECK_VERSION= ${PORTVERSION} -CONFIGURE_ARGS= --ghc --prefix=${PREFIX} --libdir=${PREFIX}/${CABALDIR} --libsubdir='' --datasubdir='' +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup + +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +LAZYSMALLCHECK_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + LAZYSMALLCHECK_VERSION=${LAZYSMALLCHECK_VERSION} \ + LAZYSMALLCHECK_LIBDIR_REL=${LAZYSMALLCHECK_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 ${CONFIGURE_ARGS} + 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 ${PREFIX}/${CABALDIR}/${PORTNAME}-register.sh + cd ${WRKSRC} && ${SETUP_CMD} install \ + && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${LAZYSMALLCHECK_LIBDIR_REL}/register.sh + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old .include diff -uNr hs-lazysmallcheck-ghc.orig/files/patch-lazysmallcheck.cabal hs-lazysmallcheck-ghc/files/patch-lazysmallcheck.cabal --- hs-lazysmallcheck-ghc.orig/files/patch-lazysmallcheck.cabal 1970-01-01 00:00:00.000000000 +0000 +++ hs-lazysmallcheck-ghc/files/patch-lazysmallcheck.cabal 2009-07-15 09:46:00.000000000 +0000 @@ -0,0 +1,11 @@ +--- lazysmallcheck.cabal.orig 2009-07-15 09:45:12.000000000 +0000 ++++ lazysmallcheck.cabal 2009-07-15 09:45:44.000000000 +0000 +@@ -16,7 +16,7 @@ + significantly fewer test-cases to verify a property for all inputs up + to a given depth. + Category: Testing +-Build-Depends: base, haskell98 ++Build-Depends: base < 4, haskell98 + Build-Type: Simple + Extra-Source-Files: + examples/Catch.hs diff -uNr hs-lazysmallcheck-ghc.orig/pkg-descr hs-lazysmallcheck-ghc/pkg-descr --- hs-lazysmallcheck-ghc.orig/pkg-descr 2009-03-14 15:19:34.000000000 +0000 +++ hs-lazysmallcheck-ghc/pkg-descr 2009-07-20 19:26:25.000000000 +0000 @@ -5,4 +5,10 @@ in SmallCheck, Lazy SmallCheck may require significantly fewer test-cases to verify a property for all inputs up to a given depth. -WWW: http://www.cs.york.ac.uk/~mfn/lazysmallcheck/ +Author: Matthew Naylor and Fredrik Lindblad +Maintainer: Matthew Naylor +License: BSD3 +WWW: http://www.cs.york.ac.uk/~mfn/lazysmallcheck/ + +Exposed-modules: Test.LazySmallCheck, + Test.LazySmallCheck.Generic diff -uNr hs-lazysmallcheck-ghc.orig/pkg-plist hs-lazysmallcheck-ghc/pkg-plist --- hs-lazysmallcheck-ghc.orig/pkg-plist 2009-03-14 15:19:34.000000000 +0000 +++ hs-lazysmallcheck-ghc/pkg-plist 2009-07-22 06:32:21.000000000 +0000 @@ -1,14 +1,15 @@ -@comment $FreeBSD: ports/devel/hs-lazysmallcheck-ghc/pkg-plist,v 1.1 2009/03/14 15:19:34 pgj Exp $ -%%SUBDIR%%/Test/LazySmallCheck.hi -%%SUBDIR%%/Test/LazySmallCheck/Generic.hi -%%SUBDIR%%/HS%%PORTNAME%%-%%PORTVERSION%%.o -%%SUBDIR%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a -%%SUBDIR%%/%%PORTNAME%%-register.sh -@dirrm %%SUBDIR%%/Test/LazySmallCheck -@dirrmtry %%SUBDIR%%/Test -%%RMLIC%%%%DOCSDIR%%/LICENSE -%%RMLIC%%@dirrm %%DOCSDIR%% -@exec sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh -@exec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old -@unexec ghc-pkg unregister %%PORTNAME%% -@unexec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +%%LAZYSMALLCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSlazysmallcheck-%%LAZYSMALLCHECK_VERSION%%.o +%%LAZYSMALLCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/LazySmallCheck.hi +%%LAZYSMALLCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/LazySmallCheck/Generic.hi +%%LAZYSMALLCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSlazysmallcheck-%%LAZYSMALLCHECK_VERSION%%.a +%%LAZYSMALLCHECK_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%LAZYSMALLCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/LazySmallCheck +@dirrm %%LAZYSMALLCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test +@dirrm %%LAZYSMALLCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%LAZYSMALLCHECK_LIBDIR_REL%% +@exec /bin/sh %D/%%LAZYSMALLCHECK_LIBDIR_REL%%/register.sh +@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +@unexec %D/bin/ghc-pkg unregister lazysmallcheck +@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old --- patch-hs-lazysmallcheck-ghc.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: