Attachment 98206 Details for Bug 137072 – patch-hs-digest-ghc.diff

[patch] patch-hs-digest-ghc.diff

patch-hs-digest-ghc.diff (text/plain), 5.52 KB, created by Jacula Modyun on 2009-07-24 18:30:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jacula Modyun

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

Size: 5.52 KB

patch

obsolete

>diff -uNr hs-digest-ghc.orig/Makefile hs-digest-ghc/Makefile
>--- hs-digest-ghc.orig/Makefile	2009-03-30 13:13:04.000000000 +0000
>+++ hs-digest-ghc/Makefile	2009-07-22 06:26:19.000000000 +0000
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	digest
>-PORTVERSION=	0.0.0.5
>+PORTVERSION=	0.0.0.6
> CATEGORIES=	security haskell
> MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
> PKGNAMEPREFIX=	hs-
>@@ -18,38 +18,59 @@
> BUILD_DEPENDS=	ghc>=6.8:${PORTSDIR}/lang/ghc
> RUN_DEPENDS=	ghc>=6.8:${PORTSDIR}/lang/ghc
> 
>-GHC_VERSION=	6.8.3
>-CABALCMD=	${LOCALBASE}/bin/runghc Setup.hs
>-CABALDIR=	lib/ghc-${GHC_VERSION}/cabal
>-
>-SUBDIR=		lib/${PORTNAME}-${PORTVERSION}
>-PLIST_SUB=	GHC_VERSION=${GHC_VERSION}		\
>-		PORTNAME=${PORTNAME}			\
>-		PORTVERSION=${PORTVERSION}		\
>-		SUBDIR=${CABALDIR}
>-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
>-PORTDOCS=	LICENSE html
>+GHC_VERSION=	6.10.4
>+DIGEST_VERSION=	${PORTVERSION}
> 
>-CONFIGURE_ARGS=	--ghc --prefix=${PREFIX} --libdir=${PREFIX}/${CABALDIR} --libsubdir='' --datasubdir=''
>+GHC_CMD=	${LOCALBASE}/bin/ghc
>+SETUP_CMD=	./setup
>+
>+DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
>+DIGEST_LIBDIR_REL=	lib/${DISTNAME}
>+
>+PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
>+		DIGEST_VERSION=${DIGEST_VERSION} \
>+		DIGEST_LIBDIR_REL=${DIGEST_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
>-PLIST_SUB+=	RMLIC="@comment "
>-.else
>-PLIST_SUB+=	RMLIC=""
> .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} && ${CABALCMD} configure ${CONFIGURE_ARGS}
>+	cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \
>+		     && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX}
> 
> do-build:
>-	cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} --gen-script register
>+	cd ${WRKSRC} && ${SETUP_CMD} build \
>+		     && ${SETUP_CMD} register --gen-script
>+
> .if !defined(NOPORTDOCS)
>-	cd ${WRKSRC} && ${CABALCMD} haddock
>+	cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \
>+					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
> .endif
> 
> do-install:
>-	cd ${WRKSRC} && ${CABALCMD} install
>-	${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${PREFIX}/${CABALDIR}/${PORTNAME}-register.sh
>+	cd ${WRKSRC} && ${SETUP_CMD} install \
>+		     && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${DIGEST_LIBDIR_REL}/register.sh
>+
>+post-install:
>+	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
> 
> .include <bsd.port.mk>
>diff -uNr hs-digest-ghc.orig/distinfo hs-digest-ghc/distinfo
>--- hs-digest-ghc.orig/distinfo	2009-03-30 13:13:04.000000000 +0000
>+++ hs-digest-ghc/distinfo	2009-07-14 08:14:31.000000000 +0000
>@@ -1,3 +1,3 @@
>-MD5 (digest-0.0.0.5.tar.gz) = ba60cc9d1ad6d0795ad84390976699d1
>-SHA256 (digest-0.0.0.5.tar.gz) = dddfcdd325dc7d4fb1ce4772c1f5618cb20504b28dba8a78682011cba1341efd
>-SIZE (digest-0.0.0.5.tar.gz) = 15487
>+MD5 (digest-0.0.0.6.tar.gz) = bc75fa0d90cf58973144f9af18b29214
>+SHA256 (digest-0.0.0.6.tar.gz) = a293da46aa874c5e75f28f4b100b766e42fbc7d6ebcb43c6351dbe3e1ec13752
>+SIZE (digest-0.0.0.6.tar.gz) = 15522
>diff -uNr hs-digest-ghc.orig/pkg-descr hs-digest-ghc/pkg-descr
>--- hs-digest-ghc.orig/pkg-descr	2009-01-23 23:47:58.000000000 +0000
>+++ hs-digest-ghc/pkg-descr	2009-07-14 08:17:20.000000000 +0000
>@@ -2,4 +2,10 @@
> strict and lazy bytestrings for the functional programming language
> Haskell.
> 
>-WWW: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/digest
>+Author:		Eugene Kirpichov <ekirpichov@gmail.com>
>+Maintainer:	Eugene Kirpichov <ekirpichov@gmail.com>
>+License:	BSD3
>+WWW:		http://hackage.haskell.org/cgi-bin/hackage-scripts/package/digest
>+
>+exposed-modules: Data.Digest.CRC32,
>+		 Data.Digest.Adler32
>diff -uNr hs-digest-ghc.orig/pkg-plist hs-digest-ghc/pkg-plist
>--- hs-digest-ghc.orig/pkg-plist	2009-03-06 19:50:25.000000000 +0000
>+++ hs-digest-ghc/pkg-plist	2009-07-20 19:51:51.000000000 +0000
>@@ -1,14 +1,15 @@
>-@comment $FreeBSD: ports/security/hs-digest-ghc/pkg-plist,v 1.2 2009/03/06 19:50:25 pgj Exp $
>-%%SUBDIR%%/Data/Digest/Adler32.hi
>-%%SUBDIR%%/Data/Digest/CRC32.hi
>-%%SUBDIR%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
>-%%SUBDIR%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
>-%%SUBDIR%%/%%PORTNAME%%-register.sh
>-%%RMLIC%%%%DOCSDIR%%/LICENSE
>-%%RMLIC%%@dirrm %%DOCSDIR%%
>-@dirrmtry %%SUBDIR%%/Data/Digest
>-@dirrmtry %%SUBDIR%%/Data
>-@exec sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh
>-@exec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
>-@unexec ghc-pkg unregister %%PORTNAME%%
>-@unexec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
>+%%DIGEST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Digest/Adler32.hi
>+%%DIGEST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Digest/CRC32.hi
>+%%DIGEST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSdigest-%%DIGEST_VERSION%%.o
>+%%DIGEST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSdigest-%%DIGEST_VERSION%%.a
>+%%DIGEST_LIBDIR_REL%%/register.sh
>+%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
>+%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
>+@dirrm %%DIGEST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Digest
>+@dirrm %%DIGEST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
>+@dirrm %%DIGEST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
>+@dirrm %%DIGEST_LIBDIR_REL%%
>+@exec /bin/sh %D/%%DIGEST_LIBDIR_REL%%/register.sh
>+@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
>+@unexec %D/bin/ghc-pkg unregister digest
>+@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old

Actions: View | Diff

Attachments on bug 137072: 98206