From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jul 24 17:10:07 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 2E1D110656A5 for ; Fri, 24 Jul 2009 17:10:07 +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 F400A8FC23 for ; Fri, 24 Jul 2009 17:10:06 +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 n6OHA6MS046536 for ; Fri, 24 Jul 2009 17:10:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n6OHA63D046535; Fri, 24 Jul 2009 17:10:06 GMT (envelope-from gnats) Resent-Date: Fri, 24 Jul 2009 17:10:06 GMT Resent-Message-Id: <200907241710.n6OHA63D046535@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 3EC81106566B for ; Fri, 24 Jul 2009 17:09:32 +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 ADFF78FC28 for ; Fri, 24 Jul 2009 17:09:31 +0000 (UTC) (envelope-from jacula@gmail.com) Received: by bwz19 with SMTP id 19so1519896bwz.43 for ; Fri, 24 Jul 2009 10:09:30 -0700 (PDT) Received: by 10.204.116.69 with SMTP id l5mr3422734bkq.102.1248455370074; Fri, 24 Jul 2009 10:09:30 -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 k29sm5413123fkk.56.2009.07.24.10.09.29 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 24 Jul 2009 10:09:29 -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 n6OH9Sgf088398 for ; Fri, 24 Jul 2009 17:09:28 GMT Received: by splork.wirewater.yow (Sendmail: 8.14.3/8.14.3/Submit) id n6OH9SIY088397 ; Fri, 24 Jul 2009 17:09:28 GMT Message-Id: <200907241709.n6OH9SIY088397@splork.wirewater.yow> Date: Fri, 24 Jul 2009 10:09:29 -0700 (PDT) From: Jacula Modyun To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/137069: [patch]: update of textproc/hs-bytestring-csv 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 17:10:07 -0000 >Number: 137069 >Category: ports >Synopsis: [patch]: update of textproc/hs-bytestring-csv 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 17:10:06 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-bytestring-csv.diff begins here --- diff -uNr hs-bytestring-csv.orig/Makefile hs-bytestring-csv/Makefile --- hs-bytestring-csv.orig/Makefile 2009-05-13 09:45:59.000000000 +0000 +++ hs-bytestring-csv/Makefile 2009-07-22 06:26:29.000000000 +0000 @@ -6,7 +6,7 @@ PORTNAME= bytestring-csv PORTVERSION= 0.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ \ http://carte.kerneled.org/mirror/ @@ -15,25 +15,64 @@ MAINTAINER= sbahra@kerneled.org COMMENT= Parse CSV formatted data efficiently with Haskell -BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ +BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ hs-dlist>=0.4.1:${PORTSDIR}/devel/hs-dlist -LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 +RUN_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ + hs-dlist>=0.4.1:${PORTSDIR}/devel/hs-dlist + +GHC_VERSION= 6.10.4 +BYTESTRINGCSV_VERSION= ${PORTVERSION} + +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup + +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +BYTESTRINGCSV_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + BYTESTRINGCSV_VERSION=${BYTESTRINGCSV_VERSION} \ + BYTESTRINGCSV_LIBDIR_REL=${BYTESTRINGCSV_LIBDIR_REL} + +.if defined(NOPORTDOCS) +PLIST_SUB+= NOPORTDOCS="" +.else +PLIST_SUB+= NOPORTDOCS="@comment " +.endif -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} +.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}/${BYTESTRINGCSV_LIBDIR_REL}/register.sh + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old .include diff -uNr hs-bytestring-csv.orig/pkg-descr hs-bytestring-csv/pkg-descr --- hs-bytestring-csv.orig/pkg-descr 2008-11-29 21:44:00.000000000 +0000 +++ hs-bytestring-csv/pkg-descr 2009-07-16 14:04:51.000000000 +0000 @@ -1,4 +1,10 @@ A small library that allows you to parse CSV formatted data efficiently with Haskell. -WWW: http://code.haskell.org/~dons/code/bytestring-csv +Author: Don Stewart +Maintainer: dons@galois.com +License: BSD3 +WWW: http://code.haskell.org/~dons/code/bytestring-csv + +exposed-modules: Text.CSV.ByteString, + Text.CSV.ByteString.Lex diff -uNr hs-bytestring-csv.orig/pkg-plist hs-bytestring-csv/pkg-plist --- hs-bytestring-csv.orig/pkg-plist 2008-11-29 21:44:00.000000000 +0000 +++ hs-bytestring-csv/pkg-plist 2009-07-16 14:03:38.000000000 +0000 @@ -1,16 +1,16 @@ -%%SUBDIR%%/ghc-%%GHC_VERSION%%/libHSbytestring-csv-%%PORTVERSION%%.a -%%SUBDIR%%/ghc-%%GHC_VERSION%%/HSbytestring-csv-%%PORTVERSION%%.o -%%SUBDIR%%/ghc-%%GHC_VERSION%%/Text/CSV/ByteString.hi -%%SUBDIR%%/ghc-%%GHC_VERSION%%/Text/CSV/ByteString/Lex.hi -%%SUBDIR%%/register.sh -share/doc/bytestring-csv-%%PORTVERSION%%/LICENSE -@dirrm share/doc/bytestring-csv-%%PORTVERSION%% -@dirrm lib/bytestring-csv-%%PORTVERSION%%/ghc-%%GHC_VERSION%%/Text/CSV/ByteString -@dirrm lib/bytestring-csv-%%PORTVERSION%%/ghc-%%GHC_VERSION%%/Text/CSV -@dirrm lib/bytestring-csv-%%PORTVERSION%%/ghc-%%GHC_VERSION%%/Text -@dirrm lib/bytestring-csv-%%PORTVERSION%%/ghc-%%GHC_VERSION%% -@dirrm lib/bytestring-csv-%%PORTVERSION%% -@exec /bin/sh %D/%%SUBDIR%%/register.sh +%%BYTESTRINGCSV_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSbytestring-csv-%%BYTESTRINGCSV_VERSION%%.o +%%BYTESTRINGCSV_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/CSV/ByteString.hi +%%BYTESTRINGCSV_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/CSV/ByteString/Lex.hi +%%BYTESTRINGCSV_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSbytestring-csv-%%BYTESTRINGCSV_VERSION%%.a +%%BYTESTRINGCSV_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%BYTESTRINGCSV_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/CSV/ByteString +@dirrm %%BYTESTRINGCSV_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/CSV +@dirrm %%BYTESTRINGCSV_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text +@dirrm %%BYTESTRINGCSV_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%BYTESTRINGCSV_LIBDIR_REL%% +@exec /bin/sh %D/%%BYTESTRINGCSV_LIBDIR_REL%%/register.sh @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old -@unexec %D/bin/ghc-pkg unregister bytestring-csv +@unexec %D/bin/ghc-pkg unregister bytestring-csv @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old --- patch-hs-bytestring-csv.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: