aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2014-08-21 00:13:53 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2014-08-21 00:13:53 +0000
commitc664a5d6acaddfc5ddb9d7753293f44ba33197b3 (patch)
tree6f688d6c087547b11f69aa63dae67cae4b85410b
parent1a04611f01efc17cb6fbbc6cce6f7989eaa5fb46 (diff)
downloadports-c664a5d6acaddfc5ddb9d7753293f44ba33197b3.tar.gz
ports-c664a5d6acaddfc5ddb9d7753293f44ba33197b3.zip
Fix devel/hs-haddock losing the HSCOLOUR option in the package it creates. This
was causing poudriere to rebuild the package on every run even if the port was not updated. Direct commit as head did a major release to the Haskell ports in r364579 which covered this. With hat: portmgr Obtained from: https://github.com/freebsd-haskell/ports/commit/8a17f83af2b4793103f5ef6ffced95dfd6d831fe.patch
Notes
Notes: svn path=/branches/2014Q3/; revision=365526
-rw-r--r--lang/ghc/bsd.cabal.options.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/lang/ghc/bsd.cabal.options.mk b/lang/ghc/bsd.cabal.options.mk
index 087ae340b477..24b335355629 100644
--- a/lang/ghc/bsd.cabal.options.mk
+++ b/lang/ghc/bsd.cabal.options.mk
@@ -37,7 +37,7 @@ OPTIONS_DEFINE+= PROFILE
OPTIONS_DEFINE+= LLVM
.endif
-.if (!exists(${GHC_CMD}) || (exists(${HADDOCK_CMD}) && exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/html))) && !defined(NOPORTDOCS)
+.if ((!exists(${GHC_CMD}) || exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/html)) || exists(${HADDOCK_CMD})) && !defined(NOPORTDOCS)
OPTIONS_DEFINE+= DOCS
OPTIONS_DEFAULT+= DOCS
HADDOCK_AVAILABLE= yes