From owner-svn-ports-all@FreeBSD.ORG  Thu Aug 21 00:13:53 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9F1A8415;
 Thu, 21 Aug 2014 00:13:53 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8AEE0378B;
 Thu, 21 Aug 2014 00:13:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7L0DrWi011160;
 Thu, 21 Aug 2014 00:13:53 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7L0DrMr011159;
 Thu, 21 Aug 2014 00:13:53 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201408210013.s7L0DrMr011159@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 21 Aug 2014 00:13:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r365526 - branches/2014Q3/lang/ghc
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Aug 2014 00:13:53 -0000

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