From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jul 24 17:40:01 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 AD4531065674 for ; Fri, 24 Jul 2009 17:40:01 +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 7E1978FC25 for ; Fri, 24 Jul 2009 17:40:01 +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 n6OHe1kR071203 for ; Fri, 24 Jul 2009 17:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n6OHe157071202; Fri, 24 Jul 2009 17:40:01 GMT (envelope-from gnats) Resent-Date: Fri, 24 Jul 2009 17:40:01 GMT Resent-Message-Id: <200907241740.n6OHe157071202@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 E15161065676 for ; Fri, 24 Jul 2009 17:30:53 +0000 (UTC) (envelope-from jacula@gmail.com) Received: from mail-fx0-f219.google.com (mail-fx0-f219.google.com [209.85.220.219]) by mx1.freebsd.org (Postfix) with ESMTP id 64A5C8FC15 for ; Fri, 24 Jul 2009 17:30:53 +0000 (UTC) (envelope-from jacula@gmail.com) Received: by fxm19 with SMTP id 19so26439fxm.43 for ; Fri, 24 Jul 2009 10:30:52 -0700 (PDT) Received: by 10.204.116.8 with SMTP id k8mr3458600bkq.110.1248456650095; Fri, 24 Jul 2009 10:30:50 -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 2sm5462087fks.3.2009.07.24.10.30.46 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 24 Jul 2009 10:30:47 -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 n6OHUkif093107 for ; Fri, 24 Jul 2009 17:30:46 GMT Received: by splork.wirewater.yow (Sendmail: 8.14.3/8.14.3/Submit) id n6OHUkOR093106 ; Fri, 24 Jul 2009 17:30:46 GMT Message-Id: <200907241730.n6OHUkOR093106@splork.wirewater.yow> Date: Fri, 24 Jul 2009 10:30:47 -0700 (PDT) From: Jacula Modyun To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/137074: [patch]: update of devel/hs-dlist from the 0.4.1 version to the 0.5 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:40:01 -0000 >Number: 137074 >Category: ports >Synopsis: [patch]: update of devel/hs-dlist from the 0.4.1 version to the 0.5 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:40:01 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-dlist.diff begins here --- diff -uNr hs-dlist.orig/Makefile hs-dlist/Makefile --- hs-dlist.orig/Makefile 2009-05-13 09:45:49.000000000 +0000 +++ hs-dlist/Makefile 2009-07-22 06:21:49.000000000 +0000 @@ -5,8 +5,7 @@ # $FreeBSD: ports/devel/hs-dlist/Makefile,v 1.2 2009/05/13 09:45:49 ale Exp $ PORTNAME= dlist -PORTVERSION= 0.4.1 -PORTREVISION= 1 +PORTVERSION= 0.5 CATEGORIES= devel haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ \ http://carte.kerneled.org/mirror/ @@ -15,24 +14,62 @@ MAINTAINER= sbahra@kerneled.org COMMENT= A list-like type supporting O(1) append for Haskell -BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc -LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 +BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc +RUN_DEPENDS+= ghc:${PORTSDIR}/lang/ghc -CABAL= ${LOCALBASE}/bin/runghc Setup.lhs -GHC_VERSION= `${LOCALBASE}/bin/ghc --numeric-version` -SUBDIR= lib/${PORTNAME}-${PORTVERSION} -PLIST_SUB= GHC_VERSION="${GHC_VERSION}" \ - PORTVERSION=${PORTVERSION} \ - SUBDIR=${SUBDIR} +GHC_VERSION= 6.10.4 +DLIST_VERSION= ${PORTVERSION} + +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup + +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +DLIST_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + DLIST_VERSION=${DLIST_VERSION} \ + DLIST_LIBDIR_REL=${DLIST_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 +.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} && ${CABAL} configure --prefix=${PREFIX} --ghc + cd ${WRKSRC} && ${GHC_CMD} --make Setup.lhs -o setup -package Cabal \ + && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX} do-build: - cd ${WRKSRC} && ${CABAL} build && ${CABAL} register --gen-script + cd ${WRKSRC} && ${SETUP_CMD} build \ + && ${SETUP_CMD} register --gen-script + +.if !defined(NOPORTDOCS) + cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \ + --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css +.endif do-install: - cd ${WRKSRC} && ${CABAL} install - ${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${PREFIX}/${SUBDIR}/register.sh + cd ${WRKSRC} && ${SETUP_CMD} install \ + && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${DLIST_LIBDIR_REL}/register.sh + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old .include diff -uNr hs-dlist.orig/distinfo hs-dlist/distinfo --- hs-dlist.orig/distinfo 2008-11-15 19:51:57.000000000 +0000 +++ hs-dlist/distinfo 2009-07-14 07:55:34.000000000 +0000 @@ -1,3 +1,3 @@ -MD5 (dlist-0.4.1.tar.gz) = c1d0bcebbb62a60f56a42cfdc1b32758 -SHA256 (dlist-0.4.1.tar.gz) = 5e3271b7962e002a86c62cd13aa27960ef643cdf87908324a781e9a437898b10 -SIZE (dlist-0.4.1.tar.gz) = 5841 +MD5 (dlist-0.5.tar.gz) = 54f6c18ff689b7ef54e3229dc4a94107 +SHA256 (dlist-0.5.tar.gz) = 4780e5409eff55bbfdd7470ef802a087a04048c9cd5efe0482c82878292f19ea +SIZE (dlist-0.5.tar.gz) = 5962 diff -uNr hs-dlist.orig/pkg-descr hs-dlist/pkg-descr --- hs-dlist.orig/pkg-descr 2008-11-15 19:51:57.000000000 +0000 +++ hs-dlist/pkg-descr 2009-07-14 07:58:27.000000000 +0000 @@ -2,4 +2,9 @@ particularly useful for efficient logging and pretty printing, (e.g. with the Writer monad), where list append quickly becomes too expensive. -WWW: http://code.haskell.org/~dons/code/dlist/ +Author: Don Stewart +Maintainer: dons@galois.com +License: BSD3 +WWW: http://code.haskell.org/~dons/code/dlist/ + +Exposed-modules: Data.DList diff -uNr hs-dlist.orig/pkg-plist hs-dlist/pkg-plist --- hs-dlist.orig/pkg-plist 2008-11-15 19:51:57.000000000 +0000 +++ hs-dlist/pkg-plist 2009-07-20 19:06:44.000000000 +0000 @@ -1,13 +1,13 @@ -%%SUBDIR%%/ghc-%%GHC_VERSION%%/libHSdlist-%%PORTVERSION%%.a -%%SUBDIR%%/ghc-%%GHC_VERSION%%/HSdlist-%%PORTVERSION%%.o -%%SUBDIR%%/ghc-%%GHC_VERSION%%/Data/DList.hi -%%SUBDIR%%/register.sh -share/doc/dlist-%%PORTVERSION%%/LICENSE -@dirrm share/doc/dlist-%%PORTVERSION%% -@dirrm lib/dlist-%%PORTVERSION%%/ghc-%%GHC_VERSION%%/Data -@dirrm lib/dlist-%%PORTVERSION%%/ghc-%%GHC_VERSION%% -@dirrm lib/dlist-%%PORTVERSION%% -@exec /bin/sh %D/%%SUBDIR%%/register.sh +%%DLIST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/DList.hi +%%DLIST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSdlist-%%DLIST_VERSION%%.o +%%DLIST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSdlist-%%DLIST_VERSION%%.a +%%DLIST_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%DLIST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data +@dirrm %%DLIST_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%DLIST_LIBDIR_REL%% +@exec /bin/sh %D/%%DLIST_LIBDIR_REL%%/register.sh @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old @unexec %D/bin/ghc-pkg unregister dlist @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old --- patch-hs-dlist.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: