Attachment 98208 Details for Bug 137074 – patch-hs-dlist.diff

[patch] patch-hs-dlist.diff

patch-hs-dlist.diff (text/plain), 4.99 KB, created by Jacula Modyun on 2009-07-24 18:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jacula Modyun

Created: 2009-07-24 18:40:01 UTC

Size: 4.99 KB

patch

obsolete

>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 <bsd.port.mk>
>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

Actions: View | Diff

Attachments on bug 137074: 98208