svn commit: r365526 - branches/2014Q3/lang/ghc

[Bryan Drewery]

Author: bdrewery
Date: Thu Aug 21 00:13:53 2014
New Revision: 365526
URL: http://svnweb.freebsd.org/changeset/ports/365526
QAT: https://qat.redports.org/buildarchive/r365526/

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

Modified:
  branches/2014Q3/lang/ghc/bsd.cabal.options.mk

Modified: branches/2014Q3/lang/ghc/bsd.cabal.options.mk
==============================================================================
--- branches/2014Q3/lang/ghc/bsd.cabal.options.mk	Thu Aug 21 00:05:58 2014	(r365525)
+++ branches/2014Q3/lang/ghc/bsd.cabal.options.mk	Thu Aug 21 00:13:53 2014	(r365526)
@@ -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