Attachment 98237 Details for Bug 137104 – patch-hs-zip-archive-ghc.diff

[patch] patch-hs-zip-archive-ghc.diff

patch-hs-zip-archive-ghc.diff (text/plain), 5.44 KB, created by Jacula Modyun on 2009-07-24 22:10:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jacula Modyun

Created: 2009-07-24 22:10:02 UTC

Size: 5.44 KB

patch

obsolete

>diff -uNr hs-zip-archive-ghc.orig/Makefile hs-zip-archive-ghc/Makefile
>--- hs-zip-archive-ghc.orig/Makefile	2009-01-24 00:09:10.000000000 +0000
>+++ hs-zip-archive-ghc/Makefile	2009-07-22 06:20:06.000000000 +0000
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	zip-archive
> PORTVERSION=	0.1.1.3
>+PORTREVISION=	1
> CATEGORIES=	archivers haskell
> MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
> PKGNAMEPREFIX=	hs-
>@@ -18,46 +19,67 @@
> BUILD_DEPENDS=	ghc>=6.8:${PORTSDIR}/lang/ghc \
> 		hs-zlib>=0.5:${PORTSDIR}/archivers/hs-zlib \
> 		hs-binary-ghc>=0.4:${PORTSDIR}/devel/hs-binary-ghc \
>-		hs-utf8-string-ghc>=0.3:${PORTSDIR}/devel/hs-utf8-string-ghc \
>+		hs-utf8-string-ghc>=0.3.1:${PORTSDIR}/devel/hs-utf8-string-ghc \
> 		hs-digest-ghc>=0.0.0.1:${PORTSDIR}/security/hs-digest-ghc
> RUN_DEPENDS=	ghc>=6.8:${PORTSDIR}/lang/ghc \
> 		hs-zlib>=0.5:${PORTSDIR}/archivers/hs-zlib \
> 		hs-binary-ghc>=0.4:${PORTSDIR}/devel/hs-binary-ghc \
>-		hs-utf8-string-ghc>=0.3:${PORTSDIR}/devel/hs-utf8-string-ghc \
>-		hs-digest-ghc>=0.0.0.1:${PORTSDIR}/security/hs-digest-ghc		
>+		hs-utf8-string-ghc>=0.3.1:${PORTSDIR}/devel/hs-utf8-string-ghc \
>+		hs-digest-ghc>=0.0.0.1:${PORTSDIR}/security/hs-digest-ghc
>+
>+GHC_VERSION=	6.10.4
>+ZIPARCHIVE_VERSION=	${PORTVERSION}
> 
>-GHC_VERSION=	6.8.3
>-CABALCMD=	${LOCALBASE}/bin/runghc Setup.lhs
>-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_CMD=	${LOCALBASE}/bin/ghc
>+SETUP_CMD=	./setup
> 
>-CONFIGURE_ARGS=	--ghc --prefix=${PREFIX} --libdir=${PREFIX}/${CABALDIR} --libsubdir='' --datasubdir=''
>+DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
>+ZIPARCHIVE_LIBDIR_REL=	lib/${DISTNAME}
>+
>+PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
>+		ZIPARCHIVE_VERSION=${ZIPARCHIVE_VERSION} \
>+		ZIPARCHIVE_LIBDIR_REL=${ZIPARCHIVE_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.lhs -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}/${ZIPARCHIVE_LIBDIR_REL}/register.sh
>+
>+post-install:
>+	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
> 
> .include <bsd.port.mk>
>diff -uNr hs-zip-archive-ghc.orig/pkg-descr hs-zip-archive-ghc/pkg-descr
>--- hs-zip-archive-ghc.orig/pkg-descr	2008-12-21 11:28:15.000000000 +0000
>+++ hs-zip-archive-ghc/pkg-descr	2009-07-15 12:15:12.000000000 +0000
>@@ -1,4 +1,9 @@
> The zip-archive library provides functions for creating, modifying, and
> extracting files from zip archives.
> 
>-WWW: http://johnmacfarlane.net/zip-archive/
>+Author:		John MacFarlane
>+Maintainer:	jgm@berkeley.edu
>+License:	GPL
>+WWW:		http://johnmacfarlane.net/zip-archive/
>+
>+Exposed-modules: Codec.Archive.Zip
>diff -uNr hs-zip-archive-ghc.orig/pkg-plist hs-zip-archive-ghc/pkg-plist
>--- hs-zip-archive-ghc.orig/pkg-plist	2009-01-24 00:09:10.000000000 +0000
>+++ hs-zip-archive-ghc/pkg-plist	2009-07-20 14:59:31.000000000 +0000
>@@ -1,12 +1,14 @@
>-%%SUBDIR%%/Codec/Archive/Zip.hi
>-%%SUBDIR%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
>-%%SUBDIR%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
>-%%SUBDIR%%/%%PORTNAME%%-register.sh
>-%%RMLIC%%%%DOCSDIR%%/LICENSE
>-%%RMLIC%%@dirrm %%DOCSDIR%%
>-@dirrmtry %%SUBDIR%%/Codec/Archive
>-@dirrmtry %%SUBDIR%%/Codec
>-@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
>+%%ZIPARCHIVE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Archive/Zip.hi
>+%%ZIPARCHIVE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSzip-archive-%%ZIPARCHIVE_VERSION%%.o
>+%%ZIPARCHIVE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSzip-archive-%%ZIPARCHIVE_VERSION%%.a
>+%%ZIPARCHIVE_LIBDIR_REL%%/register.sh
>+%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
>+%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
>+@dirrm %%ZIPARCHIVE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Archive
>+@dirrm %%ZIPARCHIVE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec
>+@dirrm %%ZIPARCHIVE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
>+@dirrm %%ZIPARCHIVE_LIBDIR_REL%%
>+@exec /bin/sh %D/%%ZIPARCHIVE_LIBDIR_REL%%/register.sh
>+@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
>+@unexec %D/bin/ghc-pkg unregister zip-archive
>+@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old

Actions: View | Diff

Attachments on bug 137104: 98237