diff options
| author | ashish <ashish@FreeBSD.org> | 2011-05-26 02:57:25 +0800 |
|---|---|---|
| committer | ashish <ashish@FreeBSD.org> | 2011-05-26 02:57:25 +0800 |
| commit | c860b50c640032c5b8a10c25f4bedac5df64b266 (patch) | |
| tree | 128b25f971564eacb2efe59e447b79cd4db89d6f /lang | |
| parent | 06a605c3df95ba381d0f172f5aa6ce65bb4d2589 (diff) | |
| download | freebsd-ports-gnome-c860b50c640032c5b8a10c25f4bedac5df64b266.tar.gz freebsd-ports-gnome-c860b50c640032c5b8a10c25f4bedac5df64b266.tar.zst freebsd-ports-gnome-c860b50c640032c5b8a10c25f4bedac5df64b266.zip | |
- Fix lang/ghc to not install unusable haddock when NOPORTDOCS is set
- 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
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/ghc/Makefile | 3 | ||||
| -rw-r--r-- | lang/ghc/bsd.cabal.mk | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile index 2bb59dc301a3..74434ec1be6f 100644 --- a/lang/ghc/Makefile +++ b/lang/ghc/Makefile @@ -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> diff --git a/lang/ghc/bsd.cabal.mk b/lang/ghc/bsd.cabal.mk index 58424a5cbba1..a173c8162733 100644 --- a/lang/ghc/bsd.cabal.mk +++ b/lang/ghc/bsd.cabal.mk @@ -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}/,,} |