ports/137069: [patch]: update of textproc/hs-bytestring-csv to ghc-6.10.4
Jacula Modyun
jacula at gmail.com
Fri Jul 24 17:10:07 UTC 2009
>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 at 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 at 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 <bsd.port.mk>
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 at 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
- at dirrm share/doc/bytestring-csv-%%PORTVERSION%%
- at dirrm lib/bytestring-csv-%%PORTVERSION%%/ghc-%%GHC_VERSION%%/Text/CSV/ByteString
- at dirrm lib/bytestring-csv-%%PORTVERSION%%/ghc-%%GHC_VERSION%%/Text/CSV
- at dirrm lib/bytestring-csv-%%PORTVERSION%%/ghc-%%GHC_VERSION%%/Text
- at dirrm lib/bytestring-csv-%%PORTVERSION%%/ghc-%%GHC_VERSION%%
- at dirrm lib/bytestring-csv-%%PORTVERSION%%
- at 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%%
+ at dirrm %%BYTESTRINGCSV_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/CSV/ByteString
+ at dirrm %%BYTESTRINGCSV_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/CSV
+ at dirrm %%BYTESTRINGCSV_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text
+ at dirrm %%BYTESTRINGCSV_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+ at dirrm %%BYTESTRINGCSV_LIBDIR_REL%%
+ at exec /bin/sh %D/%%BYTESTRINGCSV_LIBDIR_REL%%/register.sh
@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
- at unexec %D/bin/ghc-pkg unregister bytestring-csv
+ at 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:
More information about the freebsd-ports-bugs
mailing list