From owner-svn-ports-head@freebsd.org  Mon Aug 31 05:39:42 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id BAE6D9C6899;
 Mon, 31 Aug 2015 05:39:42 +0000 (UTC) (envelope-from pgj@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 AC0D69B3;
 Mon, 31 Aug 2015 05:39:42 +0000 (UTC) (envelope-from pgj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7V5dg6e058972;
 Mon, 31 Aug 2015 05:39:42 GMT (envelope-from pgj@FreeBSD.org)
Received: (from pgj@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7V5dgc0058970;
 Mon, 31 Aug 2015 05:39:42 GMT (envelope-from pgj@FreeBSD.org)
Message-Id: <201508310539.t7V5dgc0058970@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pgj set sender to pgj@FreeBSD.org
 using -f
From: Gabor Pali <pgj@FreeBSD.org>
Date: Mon, 31 Aug 2015 05:39:42 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r395649 - head/lang/ghc
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 31 Aug 2015 05:39:42 -0000

Author: pgj
Date: Mon Aug 31 05:39:41 2015
New Revision: 395649
URL: https://svnweb.freebsd.org/changeset/ports/395649

Log:
  - Remove the deprecated USE_AUTOTOOLS variable
  - Improve interaction with USE_GITHUB in bsd.cabal.mk that fixes the build of
    math/hs-Agda-stdlib
  
  Obtained from:	FreeBSD Haskell

Modified:
  head/lang/ghc/Makefile
  head/lang/ghc/bsd.cabal.mk

Modified: head/lang/ghc/Makefile
==============================================================================
--- head/lang/ghc/Makefile	Mon Aug 31 04:42:58 2015	(r395648)
+++ head/lang/ghc/Makefile	Mon Aug 31 05:39:41 2015	(r395649)
@@ -29,9 +29,8 @@ CONFLICTS=	ghc-7.4.* ghc-7.6.* ghc-7.8.*
 
 LIB_DEPENDS+=	libgmp.so:${PORTSDIR}/math/gmp
 
-USE_AUTOTOOLS=		autoconf autoheader
 USE_PERL5=		build
-USES=			gmake iconv:translit ncurses perl5 tar:xz
+USES=			autoreconf gmake iconv:translit ncurses perl5 tar:xz
 
 MAKE_ENV+=	LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8
 # This is needed on FreeBSD 9.x due to the bootstrap tarball.

Modified: head/lang/ghc/bsd.cabal.mk
==============================================================================
--- head/lang/ghc/bsd.cabal.mk	Mon Aug 31 04:42:58 2015	(r395648)
+++ head/lang/ghc/bsd.cabal.mk	Mon Aug 31 05:39:41 2015	(r395649)
@@ -9,13 +9,16 @@
 # Maintained by: haskell@FreeBSD.org
 #
 
-.if !defined(METAPORT)
+.if !defined(METAPORT) && !defined(USE_GITHUB)
 MASTER_SITES?=	http://hackage.haskell.org/package/${PORTNAME}-${PORTVERSION}/:hackage
 DISTFILES?=	${DISTNAME}${EXTRACT_SUFX}:hackage
-DIST_SUBDIR?=	cabal
 EXTRACT_ONLY?=	${DISTNAME}${EXTRACT_SUFX}
-.else
+.endif
+
+.if defined(METAPORT)
 USES+=		metaport
+.else
+DIST_SUBDIR?=	cabal
 .endif # !METAPORT
 
 MAKE_ENV+=	LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 DESTDIR=${STAGEDIR} \