From owner-svn-ports-all@freebsd.org Mon Dec 17 06:04:51 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 5A7FD132DC86; Mon, 17 Dec 2018 06:04:51 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EECF584900; Mon, 17 Dec 2018 06:04:50 +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 DE946ACC2; Mon, 17 Dec 2018 06:04:50 +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 wBH64ok2010308; Mon, 17 Dec 2018 06:04:50 GMT (envelope-from arrowd@FreeBSD.org) Received: (from arrowd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBH64okU010304; Mon, 17 Dec 2018 06:04:50 GMT (envelope-from arrowd@FreeBSD.org) Message-Id: <201812170604.wBH64okU010304@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arrowd set sender to arrowd@FreeBSD.org using -f From: Gleb Popov Date: Mon, 17 Dec 2018 06:04:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r487653 - in head/lang: ghc ghc843 ghc862 X-SVN-Group: ports-head X-SVN-Commit-Author: arrowd X-SVN-Commit-Paths: in head/lang: ghc ghc843 ghc862 X-SVN-Commit-Revision: 487653 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: EECF584900 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.84 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_LONG(-0.88)[-0.881,0]; NEURAL_HAM_SHORT(-0.96)[-0.963,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Mon, 17 Dec 2018 06:04:51 -0000 Author: arrowd Date: Mon Dec 17 06:04:49 2018 New Revision: 487653 URL: https://svnweb.freebsd.org/changeset/ports/487653 Log: GHC ports: use proper sorting for Makefile variables. Add `create-stack-bindist` target in bsd.ghc.mk. Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D18540 Modified: head/lang/ghc/Makefile head/lang/ghc/bsd.ghc.mk head/lang/ghc843/Makefile head/lang/ghc862/Makefile Modified: head/lang/ghc/Makefile ============================================================================== --- head/lang/ghc/Makefile Mon Dec 17 05:52:51 2018 (r487652) +++ head/lang/ghc/Makefile Mon Dec 17 06:04:49 2018 (r487653) @@ -8,9 +8,9 @@ MASTER_SITES= http://www.haskell.org/ghc/dist/${PORTVE 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 +EXTRACT_ONLY= ${_DISTFILES:C/hscolour.*$//g} MAINTAINER= haskell@FreeBSD.org COMMENT= Compiler for the functional language Haskell Modified: head/lang/ghc/bsd.ghc.mk ============================================================================== --- head/lang/ghc/bsd.ghc.mk Mon Dec 17 05:52:51 2018 (r487652) +++ head/lang/ghc/bsd.ghc.mk Mon Dec 17 06:04:49 2018 (r487653) @@ -297,3 +297,20 @@ create-bootstrap: && sha256 ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz \ && ${ECHO} -n "SIZE (ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz) = " \ && ${STAT} -f %z ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz + +# Much like create-bootstrap, just different naming and output format +.PHONY: create-stack-bindist +create-stack-bindist: + cd ${WRKSRC} \ + && gmake binary-dist TAR_COMP=xz \ + && ${MV} ${WRKSRC}/ghc-${GHC_VERSION}-${GHC_ARCH}-portbld-freebsd.tar.xz /tmp/ + + cd /tmp \ + && ${ECHO} "${GHC_VERSION}:" \ + && ${ECHO} "url: \"http://distcache.FreeBSD.org/local-distfiles/arrowd/stack-bindists/ghc-${GHC_VERSION}-${GHC_ARCH}-portbld-freebsd.tar.xz\"" \ + && ${ECHO} -n "content-length: " \ + && ${STAT} -f %z ghc-${GHC_VERSION}-${GHC_ARCH}-portbld-freebsd.tar.xz \ + && ${ECHO} -n "sha1: " \ + && sha1 -q ghc-${GHC_VERSION}-${GHC_ARCH}-portbld-freebsd.tar.xz \ + && ${ECHO} -n "sha256: " \ + && sha256 -q ghc-${GHC_VERSION}-${GHC_ARCH}-portbld-freebsd.tar.xz Modified: head/lang/ghc843/Makefile ============================================================================== --- head/lang/ghc843/Makefile Mon Dec 17 05:52:51 2018 (r487652) +++ head/lang/ghc843/Makefile Mon Dec 17 06:04:49 2018 (r487653) @@ -4,15 +4,15 @@ PORTNAME= ghc PORTVERSION= ${GHC_VERSION} PORTREVISION= 1 -PKGNAMESUFFIX= 843 CATEGORIES= lang haskell MASTER_SITES= http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \ LOCAL/arrowd/:boot \ ${HACKAGE_SITE}hscolour-${HSCOLOUR_VERSION}/:docs +PKGNAMESUFFIX= 843 -EXTRACT_ONLY= ${_DISTFILES:C/hscolour.*$//g} DISTFILES= ghc-${PORTVERSION}-src${EXTRACT_SUFX}:source \ hscolour-${HSCOLOUR_VERSION}.tar.gz:docs +EXTRACT_ONLY= ${_DISTFILES:C/hscolour.*$//g} MAINTAINER= haskell@FreeBSD.org COMMENT= Compiler for the functional language Haskell Modified: head/lang/ghc862/Makefile ============================================================================== --- head/lang/ghc862/Makefile Mon Dec 17 05:52:51 2018 (r487652) +++ head/lang/ghc862/Makefile Mon Dec 17 06:04:49 2018 (r487653) @@ -2,15 +2,15 @@ PORTNAME= ghc PORTVERSION= ${GHC_VERSION} -PKGNAMESUFFIX= 862 CATEGORIES= lang haskell MASTER_SITES= http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \ LOCAL/arrowd/:boot \ ${HACKAGE_SITE}hscolour-${HSCOLOUR_VERSION}/:docs +PKGNAMESUFFIX= 862 -EXTRACT_ONLY= ${_DISTFILES:C/hscolour.*$//g} DISTFILES= ghc-${PORTVERSION}-src${EXTRACT_SUFX}:source \ hscolour-${HSCOLOUR_VERSION}.tar.gz:docs +EXTRACT_ONLY= ${_DISTFILES:C/hscolour.*$//g} MAINTAINER= haskell@FreeBSD.org COMMENT= Compiler for the functional language Haskell