Attachment #98194 for bug #137060

View | Details | Raw Unified | Return to bug 137060
Collapse All | Expand All




# Date created:				09 May 2002
# Whom:					Oliver Braun <obraun@informatik.unibw-muenchen.de>
#
# $FreeBSD: ports/devel/hs-haddock/Makefile,v 1.33 2008/07/18 20:05:14 obraun Exp $

PORTNAME=	haddock
PORTVERSION=	2.4.2
PORTREVISION=	2
CATEGORIES=	devel haskell
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 \
       		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.10.4
HADDOCK_VERSION=	${PORTVERSION}

CABAL_CMD=	runghc Setup.lhs

		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
.if !defined(SLAVE)
	cd ${WRKSRC} && ${CABAL_CMD} register --gen-script
.endif

.endif
	@${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)hs-haddock/distinfo (-3 / +3 lines)
1	MD5 (haddock-2.1.0.tar.gz) = 8971b42827758aa06519aeeecbfa30e6	1	MD5 (haddock-2.4.2.tar.gz) = c1d5238faac72727921130eb792041a2
2	SHA256 (haddock-2.1.0.tar.gz) = 1b67869e493e56366207a128949998851f975d821e0952c2c717840d2eadaca7	2	SHA256 (haddock-2.4.2.tar.gz) = dbf0a7d0103a3ce6a91b2a3b96148c1b9c13ea7f8bd74260c21fe98df7839547
3	SIZE (haddock-2.1.0.tar.gz) = 95531	3	SIZE (haddock-2.4.2.tar.gz) = 103033




--- 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




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

%%DATADIR_REL%%/html/plus.gif
@dirrm %%DATADIR_REL%%/html
@dirrm %%DATADIR_REL%%
@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 %%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

Return to bug 137060

Lines 2-33 Link Here

(-)hs-haddock/Makefile (-13 / +31 lines)
2	# Date created: 09 May 2002	2	# Date created: 09 May 2002
3	# Whom: Oliver Braun <obraun@informatik.unibw-muenchen.de>	3	# Whom: Oliver Braun <obraun@informatik.unibw-muenchen.de>
4	#	4	#
5	# $FreeBSD: ports/devel/hs-haddock/Makefile,v 1.34 2009/05/12 11:28:15 itetcu Exp $	5	# $FreeBSD: ports/devel/hs-haddock/Makefile,v 1.33 2008/07/18 20:05:14 obraun Exp $
6		6
7	PORTNAME= haddock	7	PORTNAME= haddock
8	PORTVERSION= 2.1.0	8	PORTVERSION= 2.4.2
9	PORTREVISION= 2
10	CATEGORIES= devel haskell	9	CATEGORIES= devel haskell
11	MASTER_SITES= http://hackage.haskell.org/packages/archive/haddock/${PORTVERSION}/	10	MASTER_SITES= http://www.haskell.org/haddock/dist/ \
		11	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
12	PKGNAMEPREFIX= hs-	12	PKGNAMEPREFIX= hs-
13		13
14	MAINTAINER= haskell@FreeBSD.org	14	MAINTAINER= haskell@FreeBSD.org
15	COMMENT= A documentation tool for Haskell	15	COMMENT= A documentation tool for Haskell
16		16
17	.if !defined(SLAVE)	17	.if !defined(SLAVE)
18	BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc	18	BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \
19		19	hs-ghc-paths>=0.1.0.5:${PORTSDIR}/devel/hs-ghc-paths
20	.if exists(${LOCALBASE}/lib/libreadline.so.6)	20	RUN_DEPENDS= ghc:${PORTSDIR}/lang/ghc \
21	LIB_DEPENDS+= readline.6:${PORTSDIR}/devel/readline	21	hs-ghc-paths>=0.1.0.5:${PORTSDIR}/devel/hs-ghc-paths
22	.endif	22	LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4
23
24	.else	23	.else
25	NO_PKG_REGISTER=	24	NO_PKG_REGISTER=
26	.endif	25	.endif
27		26
28	WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//g}	27	WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//g}
29		28
30	GHC_VERSION= 6.8.3	29	GHC_VERSION= 6.10.4
31	HADDOCK_VERSION= ${PORTVERSION}	30	HADDOCK_VERSION= ${PORTVERSION}
32		31
33	CABAL_CMD= runghc Setup.lhs	32	CABAL_CMD= runghc Setup.lhs
Lines 42-54 Link Here
42	HADDOCK_VERSION=${HADDOCK_VERSION} \	41	HADDOCK_VERSION=${HADDOCK_VERSION} \
43	DOCSDIR_REL=${DOCSDIR_REL}	42	DOCSDIR_REL=${DOCSDIR_REL}
44		43
		44	.include <bsd.port.pre.mk>
		45
		46	.if !defined(SLAVE)
		47	PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK)
		48	.if ${PORT_HADDOCK} == 11
		49	ECHO_MSG= ${PRINTF} "%b"
		50	IGNORE+= \n\t The ${LOCALBASE}/bin/haddock executable was already installed\n
		51	IGNORE+= \t by the lang/ghc port, setting the option WITH_HADDOCK.\n
		52	IGNORE+= \t You have to reinstall this last one with the right option\n
		53	IGNORE+= \t WITHOUT_HADDOCK.\n\c
		54	.elif ${PORT_HADDOCK} == 01
		55	ECHO_MSG= ${PRINTF} "%b"
		56	IGNORE+= \n\t This port depends on the lang/ghc port, which will install\n
		57	IGNORE+= \t the ${LOCALBASE}/bin/haddock executable, for the WITH_HADDOCK\n
		58	IGNORE+= \t option was set in it. You have to set the WITHOUT_HADDOCK\n
		59	IGNORE+= \t options in lang/ghc before to install devel/hs-haddock.\n\c
		60	.endif
		61	.endif
		62
45	.SILENT:	63	.SILENT:
46		64
47	do-configure:	65	do-configure:
48	cd ${WRKSRC} && ${CABAL_CMD} configure --ghc --prefix=${PREFIX}	66	cd ${WRKSRC} && ${CABAL_CMD} configure --ghc --prefix=${PREFIX}
49		67
50	do-build:	68	do-build:
51	cd ${WRKSRC} && ${CABAL_CMD} build --ghc-option="-package process-1.0.0.1"	69	cd ${WRKSRC} && ${CABAL_CMD} build
52	.if !defined(SLAVE)	70	.if !defined(SLAVE)
53	cd ${WRKSRC} && ${CABAL_CMD} register --gen-script	71	cd ${WRKSRC} && ${CABAL_CMD} register --gen-script
54	.endif	72	.endif
Lines 63-66 Link Here
63	.endif	81	.endif
64	@${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old	82	@${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
65		83
66	.include <bsd.port.mk>	84	.include <bsd.port.post.mk>

Lines 1-27 Link Here

(-)hs-haddock/files/patch-src-Haddock-GHC-Typecheck.hs (-27 lines)
1	--- src/Haddock/GHC/Typecheck.hs.orig 2008-05-01 15:13:13.000000000 +0200
2	+++ src/Haddock/GHC/Typecheck.hs 2008-06-22 16:52:52.000000000 +0200
3	@@ -23,6 +23,7 @@
4
5	import Data.List
6
7	+import FastString
8
9	type CheckedMod = (Module, FilePath, FullyCheckedMod)
10
11	@@ -69,7 +70,7 @@
12	mkGhcModule (mod, file, checkedMod) dynflags = GhcModule {
13	ghcModule = mod,
14	ghcFilename = file,
15	- ghcMbDocOpts = mbOpts,
16	+ ghcMbDocOpts = fmap unpackFS mbOpts,
17	ghcHaddockModInfo = info,
18	ghcMbDoc = mbDoc,
19	ghcGroup = group,
20	@@ -79,6 +80,6 @@
21	ghcInstances = modInfoInstances modInfo
22	}
23	where
24	- HsModule _ _ _ _ _ mbOpts _ _ = unLoc parsed
25	+ HsModule _ _ _ _ mbOpts _ _ = unLoc parsed
26	(group, _, mbExports, mbDoc, info) = renamed
27	(parsed, renamed, _, modInfo) = checkedMod

Lines 1-12 Link Here

(-)hs-haddock/pkg-plist (-5 / +10 lines)
1	bin/haddock	1	bin/haddock
2	%%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Distribution/Haddock.hi	2	%%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Distribution/Haddock.hi
3	%%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HShaddock-%%HADDOCK_VERSION%%.o	3	%%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HShaddock-%%HADDOCK_VERSION%%.o
		4	%%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/DocName.hi
4	%%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/Exception.hi	5	%%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/Exception.hi
		6	%%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/GHC/Utils.hi
5	%%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/InterfaceFile.hi	7	%%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/InterfaceFile.hi
6	%%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/Types.hi	8	%%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/Types.hi
		9	%%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/Utils.hi
7	%%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHShaddock-%%HADDOCK_VERSION%%.a	10	%%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHShaddock-%%HADDOCK_VERSION%%.a
8	%%HADDOCK_LIBDIR_REL%%/register.sh	11	%%HADDOCK_LIBDIR_REL%%/register.sh
9	%%DOCSDIR%%/LICENSE	12	%%DOCSDIR%%/LICENSE
		13	%%DATADIR_REL%%/html/frames.html
10	%%DATADIR_REL%%/html/haddock-DEBUG.css	14	%%DATADIR_REL%%/html/haddock-DEBUG.css
11	%%DATADIR_REL%%/html/haddock-util.js	15	%%DATADIR_REL%%/html/haddock-util.js
12	%%DATADIR_REL%%/html/haddock.css	16	%%DATADIR_REL%%/html/haddock.css
Lines 15-26 Link Here
15	%%DATADIR_REL%%/html/plus.gif	19	%%DATADIR_REL%%/html/plus.gif
16	@dirrm %%DATADIR_REL%%/html	20	@dirrm %%DATADIR_REL%%/html
17	@dirrm %%DATADIR_REL%%	21	@dirrm %%DATADIR_REL%%
18	@dirrm %%DOCSDIR%%	22	@dirrmtry %%DOCSDIR%%
		23	@dirrm %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/GHC
19	@dirrm %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock	24	@dirrm %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock
20	@dirrm %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Distribution	25	@dirrm %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Distribution
21	@dirrm %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%	26	@dirrm %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
22	@dirrm %%HADDOCK_LIBDIR_REL%%	27	@dirrm %%HADDOCK_LIBDIR_REL%%
23	@exec /bin/sh %D/%%HADDOCK_LIBDIR_REL%%/register.sh	28	@exec /bin/sh %%LOCALBASE%%/%%HADDOCK_LIBDIR_REL%%/register.sh
24	@exec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old	29	@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
25	@unexec if [ -x %D/bin/ghc-pkg ]; then %D/bin/ghc-pkg unregister haddock \|\| /usr/bin/true; fi	30	@unexec %%LOCALBASE%%/bin/ghc-pkg unregister haddock
26	@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	31	@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old