Date: Fri, 24 Jul 2009 09:21:43 -0700 (PDT) From: Jacula Modyun <jacula@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/137060: [patch]: update of devel/hs-haddock from the 2.1.0 version to the 2.4.2 version Message-ID: <200907241621.n6OGLfx5080497@splork.wirewater.yow> Resent-Message-ID: <200907241630.n6OGU2Xd014594@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 137060 >Category: ports >Synopsis: [patch]: update of devel/hs-haddock from the 2.1.0 version to the 2.4.2 version >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Jul 24 16:30:02 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-haddock.diff begins here --- diff -uNr hs-haddock.orig/Makefile hs-haddock/Makefile --- hs-haddock.orig/Makefile 2009-05-12 11:28:15.000000000 +0000 +++ hs-haddock/Makefile 2009-07-23 08:27:11.000000000 +0000 @@ -2,32 +2,31 @@ # Date created: 09 May 2002 # Whom: Oliver Braun <obraun@informatik.unibw-muenchen.de> # -# $FreeBSD: ports/devel/hs-haddock/Makefile,v 1.34 2009/05/12 11:28:15 itetcu Exp $ +# $FreeBSD: ports/devel/hs-haddock/Makefile,v 1.33 2008/07/18 20:05:14 obraun Exp $ PORTNAME= haddock -PORTVERSION= 2.1.0 -PORTREVISION= 2 +PORTVERSION= 2.4.2 CATEGORIES= devel haskell -MASTER_SITES= http://hackage.haskell.org/packages/archive/haddock/${PORTVERSION}/ +MASTER_SITES= http://www.haskell.org/haddock/dist/ \ + http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ PKGNAMEPREFIX= hs- MAINTAINER= haskell@FreeBSD.org COMMENT= A documentation tool for Haskell .if !defined(SLAVE) -BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc - -.if exists(${LOCALBASE}/lib/libreadline.so.6) -LIB_DEPENDS+= readline.6:${PORTSDIR}/devel/readline -.endif - +BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ + hs-ghc-paths>=0.1.0.5:${PORTSDIR}/devel/hs-ghc-paths +RUN_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ + hs-ghc-paths>=0.1.0.5:${PORTSDIR}/devel/hs-ghc-paths +LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 .else NO_PKG_REGISTER= .endif WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//g} -GHC_VERSION= 6.8.3 +GHC_VERSION= 6.10.4 HADDOCK_VERSION= ${PORTVERSION} CABAL_CMD= runghc Setup.lhs @@ -42,13 +41,32 @@ HADDOCK_VERSION=${HADDOCK_VERSION} \ DOCSDIR_REL=${DOCSDIR_REL} +.include <bsd.port.pre.mk> + +.if !defined(SLAVE) +PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK) +.if ${PORT_HADDOCK} == 11 +ECHO_MSG= ${PRINTF} "%b" +IGNORE+= \n\t The ${LOCALBASE}/bin/haddock executable was already installed\n +IGNORE+= \t by the lang/ghc port, setting the option WITH_HADDOCK.\n +IGNORE+= \t You have to reinstall this last one with the right option\n +IGNORE+= \t WITHOUT_HADDOCK.\n\c +.elif ${PORT_HADDOCK} == 01 +ECHO_MSG= ${PRINTF} "%b" +IGNORE+= \n\t This port depends on the lang/ghc port, which will install\n +IGNORE+= \t the ${LOCALBASE}/bin/haddock executable, for the WITH_HADDOCK\n +IGNORE+= \t option was set in it. You have to set the WITHOUT_HADDOCK\n +IGNORE+= \t options in lang/ghc before to install devel/hs-haddock.\n\c +.endif +.endif + .SILENT: do-configure: cd ${WRKSRC} && ${CABAL_CMD} configure --ghc --prefix=${PREFIX} do-build: - cd ${WRKSRC} && ${CABAL_CMD} build --ghc-option="-package process-1.0.0.1" + cd ${WRKSRC} && ${CABAL_CMD} build .if !defined(SLAVE) cd ${WRKSRC} && ${CABAL_CMD} register --gen-script .endif @@ -63,4 +81,4 @@ .endif @${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff -uNr hs-haddock.orig/distinfo hs-haddock/distinfo --- hs-haddock.orig/distinfo 2008-05-04 19:25:21.000000000 +0000 +++ hs-haddock/distinfo 2009-07-09 10:23:25.000000000 +0000 @@ -1,3 +1,3 @@ -MD5 (haddock-2.1.0.tar.gz) = 8971b42827758aa06519aeeecbfa30e6 -SHA256 (haddock-2.1.0.tar.gz) = 1b67869e493e56366207a128949998851f975d821e0952c2c717840d2eadaca7 -SIZE (haddock-2.1.0.tar.gz) = 95531 +MD5 (haddock-2.4.2.tar.gz) = c1d5238faac72727921130eb792041a2 +SHA256 (haddock-2.4.2.tar.gz) = dbf0a7d0103a3ce6a91b2a3b96148c1b9c13ea7f8bd74260c21fe98df7839547 +SIZE (haddock-2.4.2.tar.gz) = 103033 diff -uNr hs-haddock.orig/files/patch-src-Haddock-GHC-Typecheck.hs hs-haddock/files/patch-src-Haddock-GHC-Typecheck.hs --- hs-haddock.orig/files/patch-src-Haddock-GHC-Typecheck.hs 2008-07-18 20:05:14.000000000 +0000 +++ hs-haddock/files/patch-src-Haddock-GHC-Typecheck.hs 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ ---- src/Haddock/GHC/Typecheck.hs.orig 2008-05-01 15:13:13.000000000 +0200 -+++ src/Haddock/GHC/Typecheck.hs 2008-06-22 16:52:52.000000000 +0200 -@@ -23,6 +23,7 @@ - - import Data.List - -+import FastString - - type CheckedMod = (Module, FilePath, FullyCheckedMod) - -@@ -69,7 +70,7 @@ - mkGhcModule (mod, file, checkedMod) dynflags = GhcModule { - ghcModule = mod, - ghcFilename = file, -- ghcMbDocOpts = mbOpts, -+ ghcMbDocOpts = fmap unpackFS mbOpts, - ghcHaddockModInfo = info, - ghcMbDoc = mbDoc, - ghcGroup = group, -@@ -79,6 +80,6 @@ - ghcInstances = modInfoInstances modInfo - } - where -- HsModule _ _ _ _ _ mbOpts _ _ = unLoc parsed -+ HsModule _ _ _ _ mbOpts _ _ = unLoc parsed - (group, _, mbExports, mbDoc, info) = renamed - (parsed, renamed, _, modInfo) = checkedMod diff -uNr hs-haddock.orig/pkg-plist hs-haddock/pkg-plist --- hs-haddock.orig/pkg-plist 2008-02-29 21:08:51.000000000 +0000 +++ hs-haddock/pkg-plist 2009-07-22 14:42:15.000000000 +0000 @@ -1,12 +1,16 @@ bin/haddock %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Distribution/Haddock.hi %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HShaddock-%%HADDOCK_VERSION%%.o +%%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/DocName.hi %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/Exception.hi +%%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/GHC/Utils.hi %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/InterfaceFile.hi %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/Types.hi +%%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/Utils.hi %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHShaddock-%%HADDOCK_VERSION%%.a %%HADDOCK_LIBDIR_REL%%/register.sh %%DOCSDIR%%/LICENSE +%%DATADIR_REL%%/html/frames.html %%DATADIR_REL%%/html/haddock-DEBUG.css %%DATADIR_REL%%/html/haddock-util.js %%DATADIR_REL%%/html/haddock.css @@ -15,12 +19,13 @@ %%DATADIR_REL%%/html/plus.gif @dirrm %%DATADIR_REL%%/html @dirrm %%DATADIR_REL%% -@dirrm %%DOCSDIR%% +@dirrmtry %%DOCSDIR%% +@dirrm %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/GHC @dirrm %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock @dirrm %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Distribution @dirrm %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%% @dirrm %%HADDOCK_LIBDIR_REL%% -@exec /bin/sh %D/%%HADDOCK_LIBDIR_REL%%/register.sh -@exec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old -@unexec if [ -x %D/bin/ghc-pkg ]; then %D/bin/ghc-pkg unregister haddock || /usr/bin/true; fi -@unexec if [ -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old ]; then rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old || /usr/bin/true; fi +@exec /bin/sh %%LOCALBASE%%/%%HADDOCK_LIBDIR_REL%%/register.sh +@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +@unexec %%LOCALBASE%%/bin/ghc-pkg unregister haddock +@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old --- patch-hs-haddock.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?200907241621.n6OGLfx5080497>