cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fix lang/ghc to not install unusable haddock when NOPORTDOCS is set

Browse Source 
- Fix lang/ghc/bsd.cabal.mk to depend on devel/hs-haddock for documentation
- Split textproc/hs-xhtml into a separate -docs port (required by haddock)
- Bump PORTREVISION of devel/hs-haskell-platform, depends on textproc/hs-xhtml

Obtained from:	FreeBSD Haskell
This commit is contained in:
Ashish SHUKLA 2011-05-25 18:57:25 +00:00
parent c7f1d2b639
commit 11ce310795
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=274647
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devel/hs-haskell-platform/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= haskell-platform
PORTVERSION= 2011.2.0.1
PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@ -32,7 +33,7 @@ USE_CABAL= cgi==3001.1.7.4,1 \
regex-posix==0.94.4 \
stm==2.2.0.1 \
syb==0.3 \
xhtml==3000.2.0.1 \
xhtml==3000.2.0.1_1 \
zlib==0.5.3.1 \
HTTP==4000.1.1 \
deepseq==1.1.0.2 \

3
lang/ghc/Makefile
View File

@ -6,6 +6,7 @@
PORTNAME= ghc
PORTVERSION= 7.0.3
PORTREVISION= 1
CATEGORIES= lang haskell
MASTER_SITES= http://haskell.org/ghc/dist/${PORTVERSION}/:source \
${MASTER_SITE_LOCAL:S/$/:boot/} \
@ -289,7 +290,9 @@ post-install:
cd ${DOCSDIR}/html/libraries && ./gen_contents_index
.endif
@${RM} -f ${PREFIX}/bin/haddock
.if !defined(NOPORTDOCS)
@${LN} -sf ${PREFIX}/bin/haddock-ghc-${GHC_VERSION} ${PREFIX}/bin/haddock
.endif
@${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
.include <bsd.port.post.mk>

4
lang/ghc/bsd.cabal.mk
View File

@ -29,7 +29,7 @@ FILE_LICENSE?= LICENSE
.if !defined(DOCUMENTATION) && \
(${PORTNAME} == haddock || ${PORTNAME} == ghc-paths || \
${PORTNAME} == hscolour || ${PORTNAME} == mtl || \
${PORTNAME} == transformers)
${PORTNAME} == transformers || ${PORTNAME} == xhtml)
NOPORTDOCS= yes
.endif
@ -60,7 +60,7 @@ HADDOCK_CMD?= ${LOCALBASE}/bin/haddock
GHC_HADDOCK_CMD=${LOCALBASE}/bin/haddock-ghc-${GHC_VERSION}
HADDOCK_PORT= ${PORTSDIR}/lang/ghc
HADDOCK_PORT= ${PORTSDIR}/devel/hs-haddock
CABAL_DOCSDIR= ${PREFIX}/share/doc/ghc-${GHC_VERSION}/cabal
CABAL_DOCSDIR_REL= ${CABAL_DOCSDIR:S,^${PREFIX}/,,}

1
textproc/hs-xhtml/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= xhtml
PORTVERSION= 3000.2.0.1
PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org