Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 17 Dec 2018 06:04:50 +0000 (UTC)
From:      Gleb Popov <arrowd@FreeBSD.org>
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
Message-ID:  <201812170604.wBH64okU010304@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812170604.wBH64okU010304>