From owner-svn-ports-head@freebsd.org Fri Jul 26 16:52:50 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 988A3A4A89; Fri, 26 Jul 2019 16:52:50 +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 760A671268; Fri, 26 Jul 2019 16:52: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 504BC1A213; Fri, 26 Jul 2019 16:52: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 x6QGqo2X018197; Fri, 26 Jul 2019 16:52:50 GMT (envelope-from arrowd@FreeBSD.org) Received: (from arrowd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6QGqoxC018196; Fri, 26 Jul 2019 16:52:50 GMT (envelope-from arrowd@FreeBSD.org) Message-Id: <201907261652.x6QGqoxC018196@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arrowd set sender to arrowd@FreeBSD.org using -f From: Gleb Popov Date: Fri, 26 Jul 2019 16:52:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r507361 - head/Mk/Uses X-SVN-Group: ports-head X-SVN-Commit-Author: arrowd X-SVN-Commit-Paths: head/Mk/Uses X-SVN-Commit-Revision: 507361 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 760A671268 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.962,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jul 2019 16:52:50 -0000 Author: arrowd Date: Fri Jul 26 16:52:49 2019 New Revision: 507361 URL: https://svnweb.freebsd.org/changeset/ports/507361 Log: Add support for USES= cabal:hpack and document this option. Modified: head/Mk/Uses/cabal.mk Modified: head/Mk/Uses/cabal.mk ============================================================================== --- head/Mk/Uses/cabal.mk Fri Jul 26 16:46:46 2019 (r507360) +++ head/Mk/Uses/cabal.mk Fri Jul 26 16:52:49 2019 (r507361) @@ -2,9 +2,13 @@ # # Provide support for building Haskell packages using Cabal. # -# Feature: cabal -# Usage: USES=cabal +# Feature: cabal +# Usage: USES=cabal or USES=cabal:ARGS +# Valid ARGS: hpack # +# hpack: The port doesn't have a .cabal file and needs devel/hs-hpack to +# generate it from package.yaml file +# # Variables, which can be set by the port: # # USE_CABAL List of Haskell packages required to build a port. @@ -36,10 +40,6 @@ .if !defined(_INCLUDE_USES_CABAL_MK) _INCLUDE_USES_CABAL_MK= yes -.if !empty(cabal_ARGS) -IGNORE= Incorrect 'USES= cabal:${cabal_ARGS}' cabal takes no arguments -.endif - PKGNAMEPREFIX?= hs- EXECUTABLES?= ${PORTNAME} @@ -52,6 +52,10 @@ BUILD_DEPENDS+= cabal:devel/hs-cabal-install \ ghc:lang/ghc . endif +. if ${cabal_ARGS:Mhpack} +EXTRACT_DEPENDS+= hpack:devel/hs-hpack +. endif + # Inherited via lang/ghc we need to depend on iconv and libgmp.so (stage q/a) iconv_ARGS= translit .include "${USESDIR}/iconv.mk" @@ -92,6 +96,7 @@ DISTFILES+= ${package:C/_[0-9]+//}/revision/${package: # Fetches and unpacks package source from Hackage using only PORTNAME and PORTVERSION. cabal-extract: ${WRKDIR} + ${RM} -rf ${CABAL_HOME}/.cabal ${SETENV} HOME=${CABAL_HOME} cabal new-update cd ${WRKDIR} && \ ${SETENV} HOME=${CABAL_HOME} cabal get ${PORTNAME}-${PORTVERSION} @@ -99,6 +104,9 @@ cabal-extract: ${WRKDIR} # Fetches and unpacks dependencies sources for a cabal-extract'ed package. # Builds them as side-effect. cabal-extract-deps: +. if ${cabal_ARGS:Mhpack} + cd ${WRKSRC} && ${SETENV} HOME=${CABAL_HOME} hpack +. endif cd ${WRKSRC} && \ ${SETENV} HOME=${CABAL_HOME} cabal new-configure --flags="${CABAL_FLAGS}" ${CONFIGURE_ARGS} cd ${WRKSRC} && \ @@ -120,6 +128,9 @@ make-use-cabal-revs: . if !defined(CABAL_BOOTSTRAP) cabal-post-extract: +. if ${cabal_ARGS:Mhpack} + cd ${WRKSRC} && ${SETENV} HOME=${CABAL_HOME} hpack +. endif . for package in ${_use_cabal} . if ${package:C/[^_]*//:S/_//} != "" cp ${DISTDIR}/${DIST_SUBDIR}/${package:C/_[0-9]+//}/revision/${package:C/[^_]*//:S/_//}.cabal `find ${WRKDIR}/${package:C/_[0-9]+//} -name *.cabal -depth 1`