Attachment 98195 Details for Bug 137061 – patch-hs-haddock-docs.diff

[patch] patch-hs-haddock-docs.diff

patch-hs-haddock-docs.diff (text/plain), 9.52 KB, created by Jacula Modyun on 2009-07-24 17:30:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jacula Modyun

Created: 2009-07-24 17:30:02 UTC

Size: 9.52 KB

patch

obsolete

>diff -uNr hs-haddock-docs.orig/Makefile hs-haddock-docs/Makefile
>--- hs-haddock-docs.orig/Makefile	2009-06-05 12:15:11.000000000 +0000
>+++ hs-haddock-docs/Makefile	2009-07-23 08:24:24.000000000 +0000
>@@ -5,13 +5,13 @@
> # $FreeBSD: ports/devel/hs-haddock-docs/Makefile,v 1.7 2009/06/05 12:15:11 pgj Exp $
> #
> 
>-PORTNAME=	haddock-docs
>-PORTVERSION=	2.1.0
>-PORTREVISION=	4
>+PORTNAME=	haddock
>+PORTVERSION=	2.4.2
> CATEGORIES=	devel haskell
>-MASTER_SITES=	http://www.haskell.org/haddock/dist/
>+MASTER_SITES=	http://www.haskell.org/haddock/dist/ \
>+		http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
> PKGNAMEPREFIX=	hs-
>-DISTNAME=	haddock-${PORTVERSION}
>+PKGNAMESUFFIX=	-doc
> 
> MAINTAINER=	haskell@FreeBSD.org
> COMMENT=	Documentation for Haddock
>@@ -19,22 +19,29 @@
> USE_GMAKE=	yes
> USE_AUTOTOOLS=	autoconf:262:env
> 
>-BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
>-		haddock:${PORTSDIR}/devel/hs-haddock \
>-		HsColour:${PORTSDIR}/print/hs-hscolour
>-
>-BUILD_DEPENDS+=	${LOCALBASE}/share/sgml/docbook/dsssl/modular:${PORTSDIR}/textproc/dsssl-docbook-modular \
>-		docbook<2:${PORTSDIR}/textproc/docbook \
>-		${LOCALBASE}/share/sgml/iso8879:${PORTSDIR}/textproc/iso8879 \
>-		${LOCALBASE}/share/sgml/docbook/3.1:${PORTSDIR}/textproc/docbook-310 \
>-		${LOCALBASE}/share/xsl/docbook/catalog:${PORTSDIR}/textproc/docbook-xsl \
>-		jade:${PORTSDIR}/textproc/jade \
>-		xsltproc:${PORTSDIR}/textproc/libxslt
>+BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
>+		HsColour:${PORTSDIR}/print/hs-hscolour \
>+		hs-ghc-paths>=0.1.0.5:${PORTSDIR}/devel/hs-ghc-paths
>+
>+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
>+.else
>+BUILD_DEPENDS+=	hs-haddock=${PORTVERSION}:${PORTSDIR}/devel/hs-haddock
>+RUN_DEPENDS=	hs-haddock=${PORTVERSION}:${PORTSDIR}/devel/hs-haddock
>+.endif
>+
>+BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/html:${PORTSDIR}/textproc/docbook-xsl \
>+		${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt
> 
> WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//g}
> CONFIGURE_ARGS=	--prefix=${PREFIX}
> 
>-HSCOLOUR_VERSION=	1.12
>+HSCOLOUR_VERSION=	1.13
> HSCOLOUR_DATADIR=	${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
> 
> CABAL_CMD=	runghc Setup.lhs
>@@ -43,17 +50,12 @@
> 
> .SILENT:
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|/usr/local/share/sgml/catalog|| ; \
>-		s|/usr/local/share/xsl/docbook|${LOCALBASE}/share/xsl/docbook|' \
>-		${WRKSRC}/doc/configure.ac
>-
> do-configure:
> 	cd ${WRKSRC} && ${CABAL_CMD} configure --ghc --haddock-options=-w ${CONFIGURE_ARGS}
> 	cd ${WRKSRC}/doc && ${AUTOCONF} && ./configure ${CONFIGURE_ARGS}
> 
> do-build:
>-	cd ${WRKSRC} && ${CABAL_CMD} haddock --executables --hyperlink-source \
>+	cd ${WRKSRC} && ${CABAL_CMD} haddock --executables --hyperlink-source --executables \
> 					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
> 	cd ${WRKSRC}/doc && \
> 		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} html
>diff -uNr hs-haddock-docs.orig/distinfo hs-haddock-docs/distinfo
>--- hs-haddock-docs.orig/distinfo	2008-05-24 09:15:24.000000000 +0000
>+++ hs-haddock-docs/distinfo	2009-07-13 08:33:42.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-docs.orig/files/patch-src-Haddock-GHC-Typecheck.hs hs-haddock-docs/files/patch-src-Haddock-GHC-Typecheck.hs
>--- hs-haddock-docs.orig/files/patch-src-Haddock-GHC-Typecheck.hs	2008-07-23 04:59:29.000000000 +0000
>+++ hs-haddock-docs/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-docs.orig/pkg-message hs-haddock-docs/pkg-message
>--- hs-haddock-docs.orig/pkg-message	2008-02-29 20:35:17.000000000 +0000
>+++ hs-haddock-docs/pkg-message	2009-07-19 15:45:50.000000000 +0000
>@@ -3,9 +3,7 @@
>   WARNING: if the lang/ghc port doesn't install the hyperlinkable
>   documentation for its libraries, then haddock can't know about
>   these. But also in this case haddock can't handle recursive
>-  modules currently, so the lang/ghc port can't install the
>-  hyperlinkable documentation of the HSghc libraries, and then
>-  haddock can't know about these last.
>+  modules currently.
>   In general haddock detects and reports as an error recursive
>   modules and emits chatting warnings listing all the identifiers
>   it couldn't resolve.
>diff -uNr hs-haddock-docs.orig/pkg-plist hs-haddock-docs/pkg-plist
>--- hs-haddock-docs.orig/pkg-plist	2008-08-15 04:43:51.000000000 +0000
>+++ hs-haddock-docs/pkg-plist	2009-07-13 09:41:55.000000000 +0000
>@@ -1,7 +1,6 @@
> %%DOCSDIR%%/html/Distribution-Haddock.html
>-%%DOCSDIR%%/html/Haddock-DocName.html
>-%%DOCSDIR%%/html/Haddock-GHC-Utils.html
> %%DOCSDIR%%/html/doc-index.html
>+%%DOCSDIR%%/html/frames.html
> %%DOCSDIR%%/html/haddock-util.js
> %%DOCSDIR%%/html/haddock.css
> %%DOCSDIR%%/html/haddock.haddock
>@@ -11,10 +10,8 @@
> %%DOCSDIR%%/html/haddock/Haddock-Backends-HaddockDB.html
> %%DOCSDIR%%/html/haddock/Haddock-Backends-Hoogle.html
> %%DOCSDIR%%/html/haddock/Haddock-Backends-Html.html
>-%%DOCSDIR%%/html/haddock/Haddock-DocName.html
> %%DOCSDIR%%/html/haddock/Haddock-Exception.html
> %%DOCSDIR%%/html/haddock/Haddock-GHC-Typecheck.html
>-%%DOCSDIR%%/html/haddock/Haddock-GHC-Utils.html
> %%DOCSDIR%%/html/haddock/Haddock-GHC.html
> %%DOCSDIR%%/html/haddock/Haddock-Interface-AttachInstances.html
> %%DOCSDIR%%/html/haddock/Haddock-Interface-Create.html
>@@ -23,7 +20,6 @@
> %%DOCSDIR%%/html/haddock/Haddock-InterfaceFile.html
> %%DOCSDIR%%/html/haddock/Haddock-ModuleTree.html
> %%DOCSDIR%%/html/haddock/Haddock-Options.html
>-%%DOCSDIR%%/html/haddock/Haddock-Types.html
> %%DOCSDIR%%/html/haddock/Haddock-Utils-BlockTable.html
> %%DOCSDIR%%/html/haddock/Haddock-Utils-FastMutInt2.html
> %%DOCSDIR%%/html/haddock/Haddock-Utils-Html.html
>@@ -32,10 +28,35 @@
> %%DOCSDIR%%/html/haddock/Main.html
> %%DOCSDIR%%/html/haddock/Paths_haddock.html
> %%DOCSDIR%%/html/haddock/doc-index.html
>+%%DOCSDIR%%/html/haddock/frames.html
> %%DOCSDIR%%/html/haddock/haddock-util.js
> %%DOCSDIR%%/html/haddock/haddock.css
> %%DOCSDIR%%/html/haddock/haskell_icon.gif
>+%%DOCSDIR%%/html/haddock/index-frames.html
> %%DOCSDIR%%/html/haddock/index.html
>+%%DOCSDIR%%/html/haddock/mini_Haddock-Backends-DevHelp.html
>+%%DOCSDIR%%/html/haddock/mini_Haddock-Backends-HH.html
>+%%DOCSDIR%%/html/haddock/mini_Haddock-Backends-HH2.html
>+%%DOCSDIR%%/html/haddock/mini_Haddock-Backends-HaddockDB.html
>+%%DOCSDIR%%/html/haddock/mini_Haddock-Backends-Hoogle.html
>+%%DOCSDIR%%/html/haddock/mini_Haddock-Backends-Html.html
>+%%DOCSDIR%%/html/haddock/mini_Haddock-Exception.html
>+%%DOCSDIR%%/html/haddock/mini_Haddock-GHC-Typecheck.html
>+%%DOCSDIR%%/html/haddock/mini_Haddock-GHC.html
>+%%DOCSDIR%%/html/haddock/mini_Haddock-Interface-AttachInstances.html
>+%%DOCSDIR%%/html/haddock/mini_Haddock-Interface-Create.html
>+%%DOCSDIR%%/html/haddock/mini_Haddock-Interface-Rename.html
>+%%DOCSDIR%%/html/haddock/mini_Haddock-Interface.html
>+%%DOCSDIR%%/html/haddock/mini_Haddock-InterfaceFile.html
>+%%DOCSDIR%%/html/haddock/mini_Haddock-ModuleTree.html
>+%%DOCSDIR%%/html/haddock/mini_Haddock-Options.html
>+%%DOCSDIR%%/html/haddock/mini_Haddock-Utils-BlockTable.html
>+%%DOCSDIR%%/html/haddock/mini_Haddock-Utils-FastMutInt2.html
>+%%DOCSDIR%%/html/haddock/mini_Haddock-Utils-Html.html
>+%%DOCSDIR%%/html/haddock/mini_Haddock-Utils.html
>+%%DOCSDIR%%/html/haddock/mini_Haddock-Version.html
>+%%DOCSDIR%%/html/haddock/mini_Main.html
>+%%DOCSDIR%%/html/haddock/mini_Paths_haddock.html
> %%DOCSDIR%%/html/haddock/minus.gif
> %%DOCSDIR%%/html/haddock/plus.gif
> %%DOCSDIR%%/html/haddock/src/Haddock-Backends-DevHelp.html
>@@ -65,13 +86,18 @@
> %%DOCSDIR%%/html/haddock/src/Main.html
> %%DOCSDIR%%/html/haddock/src/hscolour.css
> %%DOCSDIR%%/html/haskell_icon.gif
>+%%DOCSDIR%%/html/index-frames.html
> %%DOCSDIR%%/html/index.html
>+%%DOCSDIR%%/html/mini_Distribution-Haddock.html
> %%DOCSDIR%%/html/minus.gif
> %%DOCSDIR%%/html/plus.gif
> %%DOCSDIR%%/html/src/Distribution-Haddock.html
>+%%DOCSDIR%%/html/src/Haddock-DocName.html
> %%DOCSDIR%%/html/src/Haddock-Exception.html
>+%%DOCSDIR%%/html/src/Haddock-GHC-Utils.html
> %%DOCSDIR%%/html/src/Haddock-InterfaceFile.html
> %%DOCSDIR%%/html/src/Haddock-Types.html
>+%%DOCSDIR%%/html/src/Haddock-Utils.html
> %%DOCSDIR%%/html/src/hscolour.css
> %%DOCSDIR%%/users_guide/ch01s03.html
> %%DOCSDIR%%/users_guide/ch03s02.html

Actions: View | Diff

Attachments on bug 137061: 98195