Attachment 98199 Details for Bug 137065 – patch-hs-Stream.diff

[patch] patch-hs-Stream.diff

patch-hs-Stream.diff (text/plain), 5.28 KB, created by Jacula Modyun on 2009-07-24 18:00:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jacula Modyun

Created: 2009-07-24 18:00:09 UTC

Size: 5.28 KB

patch

obsolete

>diff -uNr hs-Stream.orig/Makefile hs-Stream/Makefile
>--- hs-Stream.orig/Makefile	2009-05-13 09:45:48.000000000 +0000
>+++ hs-Stream/Makefile	2009-07-22 06:21:11.000000000 +0000
>@@ -5,8 +5,7 @@
> # $FreeBSD: ports/devel/hs-Stream/Makefile,v 1.2 2009/05/13 09:45:48 ale Exp $
> 
> PORTNAME=	Stream
>-PORTVERSION=	0.2.6
>-PORTREVISION=	1
>+PORTVERSION=	0.3.2
> CATEGORIES=	devel haskell
> MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ \
> 		http://carte.kerneled.org/mirror/
>@@ -15,24 +14,67 @@
> MAINTAINER=	sbahra@kerneled.org
> COMMENT=	A Haskell library for manipulating infinite lists
> 
>-BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc
>+BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
>+		hs-QuickCheck>=2.0:${PORTSDIR}/devel/hs-QuickCheck \
>+		hs-lazysmallcheck-ghc>=0.3:${PORTSDIR}/devel/hs-lazysmallcheck-ghc
>+RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
>+		hs-QuickCheck>=2.0:${PORTSDIR}/devel/hs-QuickCheck \
>+		hs-lazysmallcheck-ghc>=0.3:${PORTSDIR}/devel/hs-lazysmallcheck-ghc
> LIB_DEPENDS=	gmp.8:${PORTSDIR}/math/libgmp4
> 
>-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
>+STREAM_VERSION=	${PORTVERSION}
>+
>+GHC_CMD=	${LOCALBASE}/bin/ghc
>+SETUP_CMD=	./setup
>+
>+DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
>+STREAM_LIBDIR_REL=	lib/${DISTNAME}
>+
>+PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
>+		STREAM_VERSION=${STREAM_VERSION} \
>+		STREAM_LIBDIR_REL=${STREAM_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}/${STREAM_LIBDIR_REL}/register.sh
>+
>+post-install:
>+	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
> 
> .include <bsd.port.mk>
>diff -uNr hs-Stream.orig/distinfo hs-Stream/distinfo
>--- hs-Stream.orig/distinfo	2008-11-29 21:02:00.000000000 +0000
>+++ hs-Stream/distinfo	2009-07-14 09:32:50.000000000 +0000
>@@ -1,3 +1,3 @@
>-MD5 (Stream-0.2.6.tar.gz) = 04a52fe84381c60c8830dac83915ae83
>-SHA256 (Stream-0.2.6.tar.gz) = ce2b94a81a91497d024177654521d219aaab4462a381eb70c8199fefbb52edde
>-SIZE (Stream-0.2.6.tar.gz) = 4885
>+MD5 (Stream-0.3.2.tar.gz) = ff6546da67f3e7e024e69ba31c427460
>+SHA256 (Stream-0.3.2.tar.gz) = 2a9a394ffd8f0172c4491181c4b5977804b33d6465faad0cd5684bbf99721f4b
>+SIZE (Stream-0.3.2.tar.gz) = 5899
>diff -uNr hs-Stream.orig/pkg-descr hs-Stream/pkg-descr
>--- hs-Stream.orig/pkg-descr	2008-11-29 21:02:00.000000000 +0000
>+++ hs-Stream/pkg-descr	2009-07-15 09:57:46.000000000 +0000
>@@ -3,4 +3,8 @@
> It provides alternative definitions for those Prelude functions that make
> sense on such streams.
> 
>-WWW: http://www.cs.nott.ac.uk/~wss/repos/Stream/dist/doc/html/
>+Maintainer:	Wouter Swierstra <wss@cs.nott.ac.uk>
>+license:	BSD3
>+WWW:		http://www.cs.nott.ac.uk/~wss/repos/Stream/dist/doc/html/
>+
>+exposed-modules: Data.Stream
>diff -uNr hs-Stream.orig/pkg-plist hs-Stream/pkg-plist
>--- hs-Stream.orig/pkg-plist	2008-11-29 21:02:00.000000000 +0000
>+++ hs-Stream/pkg-plist	2009-07-20 15:23:45.000000000 +0000
>@@ -1,13 +1,13 @@
>-%%SUBDIR%%/ghc-%%GHC_VERSION%%/libHSStream-%%PORTVERSION%%.a
>-%%SUBDIR%%/ghc-%%GHC_VERSION%%/HSStream-%%PORTVERSION%%.o
>-%%SUBDIR%%/ghc-%%GHC_VERSION%%/Data/Stream.hi
>-%%SUBDIR%%/register.sh
>-share/doc/Stream-%%PORTVERSION%%/LICENSE
>-@dirrm share/doc/Stream-%%PORTVERSION%%
>-@dirrm lib/Stream-%%PORTVERSION%%/ghc-%%GHC_VERSION%%/Data
>-@dirrm lib/Stream-%%PORTVERSION%%/ghc-%%GHC_VERSION%%
>-@dirrm lib/Stream-%%PORTVERSION%%
>-@exec /bin/sh %D/%%SUBDIR%%/register.sh
>+%%STREAM_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Stream.hi
>+%%STREAM_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSStream-%%STREAM_VERSION%%.o
>+%%STREAM_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSStream-%%STREAM_VERSION%%.a
>+%%STREAM_LIBDIR_REL%%/register.sh
>+%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
>+%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
>+@dirrm %%STREAM_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
>+@dirrm %%STREAM_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
>+@dirrm %%STREAM_LIBDIR_REL%%
>+@exec /bin/sh %D/%%STREAM_LIBDIR_REL%%/register.sh
> @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
> @unexec %D/bin/ghc-pkg unregister Stream
> @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old

Actions: View | Diff

Attachments on bug 137065: 98199