Date: Fri, 24 Jul 2009 10:04:13 -0700 (PDT) From: Jacula Modyun <jacula@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/137068: [patch]: update of devel/hs-binary-ghc to ghc-6.10.4 Message-ID: <200907241704.n6OH4Cxu086906@splork.wirewater.yow> Resent-Message-ID: <200907241710.n6OHA65Y046522@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 137068 >Category: ports >Synopsis: [patch]: update of devel/hs-binary-ghc 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@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-binary-ghc.diff begins here --- diff -uNr hs-binary-ghc.orig/Makefile hs-binary-ghc/Makefile --- hs-binary-ghc.orig/Makefile 2009-03-14 15:17:20.000000000 +0000 +++ hs-binary-ghc/Makefile 2009-07-22 06:21:30.000000000 +0000 @@ -7,6 +7,7 @@ PORTNAME= binary PORTVERSION= 0.5.0.1 +PORTREVISION= 1 CATEGORIES= devel haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ PKGNAMEPREFIX= hs- @@ -18,38 +19,60 @@ 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.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_VERSION= 6.10.4 -CONFIGURE_ARGS= --ghc --prefix=${PREFIX} --libdir=${PREFIX}/${CABALDIR} --libsubdir='' --datasubdir='' +BINARY_VERSION= ${PORTVERSION} + +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup + +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +BINARY_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + BINARY_VERSION=${BINARY_VERSION} \ + BINARY_LIBDIR_REL=${BINARY_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}/${BINARY_LIBDIR_REL}/register.sh + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old .include <bsd.port.mk> diff -uNr hs-binary-ghc.orig/pkg-descr hs-binary-ghc/pkg-descr --- hs-binary-ghc.orig/pkg-descr 2008-12-21 11:23:18.000000000 +0000 +++ hs-binary-ghc/pkg-descr 2009-07-15 12:05:53.000000000 +0000 @@ -4,4 +4,10 @@ have been observed, so this library should be suitable for high performance scenarios. +Maintainer: Lennart Kolmodin, Don Stewart <dons@galois.com> +license: BSD3 WWW: http://code.haskell.org/binary/ + +exposed-modules: Data.Binary + Data.Binary.Put Data.Binary.Get + Data.Binary.Builder diff -uNr hs-binary-ghc.orig/pkg-plist hs-binary-ghc/pkg-plist --- hs-binary-ghc.orig/pkg-plist 2009-03-06 19:43:48.000000000 +0000 +++ hs-binary-ghc/pkg-plist 2009-07-20 15:27:49.000000000 +0000 @@ -1,16 +1,17 @@ -@comment $FreeBSD: ports/devel/hs-binary-ghc/pkg-plist,v 1.3 2009/03/06 19:43:48 pgj Exp $ -%%SUBDIR%%/Data/Binary.hi -%%SUBDIR%%/Data/Binary/Builder.hi -%%SUBDIR%%/Data/Binary/Get.hi -%%SUBDIR%%/Data/Binary/Put.hi -%%SUBDIR%%/HS%%PORTNAME%%-%%PORTVERSION%%.o -%%SUBDIR%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a -%%SUBDIR%%/%%PORTNAME%%-register.sh -@dirrmtry %%SUBDIR%%/Data/Binary -@dirrmtry %%SUBDIR%%/Data -%%RMLIC%%%%DOCSDIR%%/LICENSE -%%RMLIC%%@dirrm %%DOCSDIR%% -@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 +%%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Binary.hi +%%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Binary/Builder.hi +%%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Binary/Get.hi +%%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Binary/Put.hi +%%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSbinary-%%BINARY_VERSION%%.o +%%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSbinary-%%BINARY_VERSION%%.a +%%BINARY_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Binary +@dirrm %%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data +@dirrm %%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%BINARY_LIBDIR_REL%% +@exec /bin/sh %D/%%BINARY_LIBDIR_REL%%/register.sh +@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +@unexec %D/bin/ghc-pkg unregister binary +@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old --- patch-hs-binary-ghc.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907241704.n6OH4Cxu086906>