From owner-svn-ports-all@freebsd.org Thu Oct 4 08:34:10 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DB08110C4720; Thu, 4 Oct 2018 08:34:09 +0000 (UTC) (envelope-from arrowd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8D2DA8A37F; Thu, 4 Oct 2018 08:34:09 +0000 (UTC) (envelope-from arrowd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6E06423BB7; Thu, 4 Oct 2018 08:34:09 +0000 (UTC) (envelope-from arrowd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w948Y9Rb084352; Thu, 4 Oct 2018 08:34:09 GMT (envelope-from arrowd@FreeBSD.org) Received: (from arrowd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w948Y9SE084351; Thu, 4 Oct 2018 08:34:09 GMT (envelope-from arrowd@FreeBSD.org) Message-Id: <201810040834.w948Y9SE084351@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arrowd set sender to arrowd@FreeBSD.org using -f From: Gleb Popov Date: Thu, 4 Oct 2018 08:34:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r481210 - head/lang/ghc X-SVN-Group: ports-head X-SVN-Commit-Author: arrowd X-SVN-Commit-Paths: head/lang/ghc X-SVN-Commit-Revision: 481210 X-SVN-Commit-Repository: ports 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.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Oct 2018 08:34:10 -0000 Author: arrowd Date: Thu Oct 4 08:34:09 2018 New Revision: 481210 URL: https://svnweb.freebsd.org/changeset/ports/481210 Log: lang/ghc: Remove BOOTH option. Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D17372 Modified: head/lang/ghc/Makefile Modified: head/lang/ghc/Makefile ============================================================================== --- head/lang/ghc/Makefile Thu Oct 4 08:33:37 2018 (r481209) +++ head/lang/ghc/Makefile Thu Oct 4 08:34:09 2018 (r481210) @@ -6,9 +6,13 @@ PORTVERSION= ${GHC_VERSION} PORTREVISION= 1 CATEGORIES= lang haskell MASTER_SITES= http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \ - LOCAL/arrowd/:boot -DISTFILES= ghc-${PORTVERSION}-src${EXTRACT_SUFX}:source + LOCAL/arrowd/:boot \ + ${HACKAGE_SITE}hscolour-${HSCOLOUR_VERSION}/:docs +EXTRACT_ONLY= ${_DISTFILES:C/hscolour.*$//g} +DISTFILES= ghc-${PORTVERSION}-src${EXTRACT_SUFX}:source \ + hscolour-${HSCOLOUR_VERSION}.tar.gz:docs + MAINTAINER= haskell@FreeBSD.org COMMENT= Compiler for the functional language Haskell @@ -53,7 +57,7 @@ SUB_LIST= GHC_VERSION=${GHC_VERSION} \ OPTIONS_GROUP= BOOTSTRAP BOOTSTRAP_DESC= Bootsrap using installed ghc -OPTIONS_GROUP_BOOTSTRAP=BOOT BOOTH +OPTIONS_GROUP_BOOTSTRAP=BOOT OPTIONS_DEFINE= DYNAMIC PROFILE DOCS OPTIONS_SUB= yes @@ -64,7 +68,6 @@ OPTIONS_EXCLUDE_armv7= DYNAMIC OPTIONS_EXCLUDE_aarch64= DYNAMIC BOOT_DESC= Use installed GHC for bootstrapping -BOOTH_DESC= Use installed HsColour for bootstrapping PROFILE_DESC= Add support for performance profiling DYNAMIC_DESC= Add support for dynamic linking DOCS_DESC= Install HTML documentation @@ -161,29 +164,12 @@ TMPDIR= ${WRKSRC}/tmp # the build tree, without needing to install it. At the end # you could view the output of: ${BOOT_GHC} describe hscolour -.if ${PORT_OPTIONS:MDOCS} - -. if empty(PORT_OPTIONS:MBOOTH) - -MASTER_SITES+= ${HACKAGE_SITE}hscolour-${HSCOLOUR_VERSION}/:docs -DISTFILES+= hscolour-${HSCOLOUR_VERSION}.tar.gz:docs - -EXTRACT_ONLY= ${_DISTFILES:C/hscolour.*$//g} - -. endif # MBOOTH - -. if empty(PORT_OPTIONS:MBOOTH) - SLAVES_PREFIX= ${WRKDIR}/slaves_prefix SLAVES_WRKDIRPREFIX= ${WRKDIR}/slaves_wrkdirprefix MAKE_ENV+= PATH=${SLAVES_PREFIX}/bin:${PATH} CONFIGURE_ENV+= PATH=${SLAVES_PREFIX}/bin:${PATH} -. endif # MBOOTH - -.endif # MDOCS - post-extract: # don't use the "wrap" trick on arches that use post-ino64 bootstrap binaries (arm*) .if empty(PORT_OPTIONS:MBOOT) && ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200031 && \ @@ -252,7 +238,7 @@ pre-configure: apply-slist @(cd ${BOOT_DIR} && PACKAGES='' ${MAKE_CMD} install) .endif -.if ${PORT_OPTIONS:MDOCS} && empty(PORT_OPTIONS:MBOOTH) +.if ${PORT_OPTIONS:MDOCS} @${ECHO_MSG} -e "\a" @${ECHO_MSG} "======================================================================" @${ECHO_MSG} " WARNING: Now HsColour will be built, the respective port will not "