From nobody Wed Jul 27 14:56:48 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4LtH1D3nm4z4XlyD; Wed, 27 Jul 2022 14:56:48 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LtH1D3C0Gz3lmQ; Wed, 27 Jul 2022 14:56:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658933808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UFJZFP7A8eb07p9WKIXheb34xneTlv/1lWX+TKV3ZmA=; b=VnSk7K/wpL9Gb/dNBMvt4iEd+5M67mTgrtNdbL2LhIB2N+6u8XtaQyEjj3Aj0KN/p38wdv 1QMlv6YGcAD7jadXIvTcKS1Itef0jtc8OFQ9xgzsTWHviJS6b5Qy7RBX4VQQwzx2P9/ezS uJ1GchiS7YM3Vdib1E+t9LPKtwgcrNWMlYL+Fn86Bat09Qv8LvX6/3A6U68Ja0YP3LFR/y 3d84sTbDS5b8Cqls1F2wr3D2ZWrq9jzrLhhuZKy8vx448QmxnoCJ1vcbNiWZjQdBjbZ/bI bT4dfxNsAET9fS0uJ99MCOO/Lp7TeobMUPyYP5gtRjpiewtZPFOBvHpDA3drdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4LtH1D2Hp8zKwM; Wed, 27 Jul 2022 14:56:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26REumFN005113; Wed, 27 Jul 2022 14:56:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26REum3Q005112; Wed, 27 Jul 2022 14:56:48 GMT (envelope-from git) Date: Wed, 27 Jul 2022 14:56:48 GMT Message-Id: <202207271456.26REum3Q005112@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 22d118e2620c - main - Uses/cabal.mk: Simplify EXTRACT_ONLY setting. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 22d118e2620c44b6273ea00be51a5fcdfcf1c604 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658933808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UFJZFP7A8eb07p9WKIXheb34xneTlv/1lWX+TKV3ZmA=; b=uLfNqTz4/TLtH4XGFR9dy3Ub2n9WOKIXhzwsSxRBOgff7W8jetURIE6EKvCYKjDM4059J/ oXzDrKAHul9sTJ1rpxsYX6neuJbVznAl/1cT54MorOjRlonQD4CyhTAlkAlUh8SFi4OZEF INeA0jnpzlUaY5af0d8MjNudCOiJcRnBSEJ9wUp/4Ms/3555Z2/9o7Ykk5XlAyLtx7Ki8l e7zvUPeZJzOxbrgERFjnbJFPzBrIUZd3UCSNxuid27aHIUxzM1ioTxWW2ZNJlGqbbD05Zm +3afPMCqFO7eZN/62ywc0ewa4hUp271Ge/IZq9f5qubUFMdsSFNtlht08x0aTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658933808; a=rsa-sha256; cv=none; b=LUeF7R8zEncJSvcvAn14xcrINs0afN3fw+nBNCxspZO/Uympj7R4l8du4JU8QeQny8aJTZ EubHOZ1JfQSnaRUmVLuCD95qe56u08G4w8dtV0a0rPiAzmWK9Rr63ccE6m02hFOGVg05va ORVXT50Lrzy+iOCQDP4rcCJu6VtyQNMSUujrGpbL5yXJOpr/tcOsMz3QGUlFoWEY5jffQo GMalbrHitmHsaZxa9xzAi1dbJqSoKQmu7TmCDP/HDqUiSnxPeWQW+1Rb+lqrRYISzIIJfk dUBHta3hQyRajg/Ifm2WrnBYVCOhUYdkPMnKJTPfc33HrcPH0iKTPPcfIrwsuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=22d118e2620c44b6273ea00be51a5fcdfcf1c604 commit 22d118e2620c44b6273ea00be51a5fcdfcf1c604 Author: Gleb Popov AuthorDate: 2022-07-21 07:24:02 +0000 Commit: Gleb Popov CommitDate: 2022-07-27 14:55:50 +0000 Uses/cabal.mk: Simplify EXTRACT_ONLY setting. Adapt ports that were using hacks to set EXTRACT_ONLY. --- Mk/Uses/cabal.mk | 18 ++++++------------ games/hedgewars-server/Makefile | 1 - lang/elm/Makefile | 2 -- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk index dd7f0d917dbe..2037696ab369 100644 --- a/Mk/Uses/cabal.mk +++ b/Mk/Uses/cabal.mk @@ -109,14 +109,6 @@ _hackage_is_default= no MASTER_SITES= https://hackage.haskell.org/package/${PORTNAME}-${PORTVERSION}/ \ http://hackage.haskell.org/package/${PORTNAME}-${PORTVERSION}/ DISTFILES+= ${PORTNAME}-${PORTVERSION}${CABAL_EXTRACT_SUFX} -EXTRACT_ONLY+= ${PORTNAME}-${PORTVERSION}${CABAL_EXTRACT_SUFX} -. else -. if defined(USE_GITHUB) && !defined(DISTFILES) && !${USE_GITHUB:Mnodefault} -EXTRACT_ONLY+= ${DISTNAME_DEFAULT}${_GITHUB_EXTRACT_SUFX} -. endif -. if defined(USE_GITLAB) && !defined(DISTFILES) && !${USE_GITLAB:Mnodefault} -EXTRACT_ONLY+= ${DISTNAME}${_GITLAB_EXTRACT_SUFX} -. endif . endif _USES_extract= 701:cabal-post-extract @@ -141,16 +133,18 @@ MASTER_SITES+= https://hackage.haskell.org/package/:${package:C/[\.-]//g} \ http://hackage.haskell.org/package/:${package:C/[\.-]//g} DISTFILES+= ${package:C/_[0-9]+//}/${package:C/_[0-9]+//}${CABAL_EXTRACT_SUFX}:${package:C/[\.-]//g} -. if !defined(CABAL_BOOTSTRAP) -EXTRACT_ONLY+= ${package:C/_[0-9]+//}/${package:C/_[0-9]+//}${CABAL_EXTRACT_SUFX} -. endif - . if ${package:C/[^_]*//:S/_//} != "" DISTFILES+= ${package:C/_[0-9]+//}/revision/${package:C/[^_]*//:S/_//}.cabal:${package:C/[\.-]//g} . endif +_CABAL_EXTRACT_ONLY+= ${package:C/_[0-9]+//}/${package:C/_[0-9]+//}${CABAL_EXTRACT_SUFX} . endfor +. if !defined(EXTRACT_ONLY) +EXTRACT_ONLY= ${_DISTFILES:N*\.cabal} +. else +EXTRACT_ONLY+= ${_CABAL_EXTRACT_ONLY} +. endif # Auxiliary targets used during port creation/updating. diff --git a/games/hedgewars-server/Makefile b/games/hedgewars-server/Makefile index 86a5a83dc99e..f9c5c608cc9b 100644 --- a/games/hedgewars-server/Makefile +++ b/games/hedgewars-server/Makefile @@ -7,7 +7,6 @@ MASTER_SITES= http://www.hedgewars.org/download/releases/ \ PKGNAMESUFFIX= -server DISTNAME= ${PORTNAME}-src-${DISTVERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= haskell@FreeBSD.org COMMENT= Server part of free Worms-like turn based strategy game diff --git a/lang/elm/Makefile b/lang/elm/Makefile index f85550b0cf6f..3bc4abd39bac 100644 --- a/lang/elm/Makefile +++ b/lang/elm/Makefile @@ -4,8 +4,6 @@ PORTREVISION= 5 CATEGORIES= lang MASTER_SITES= LOCAL/arrowd/:package_list DISTFILES= elm-compiler-bootstrap-${PORTVERSION}${EXTRACT_SUFX}:package_list -EXTRACT_ONLY= ${DISTNAME_DEFAULT}${EXTRACT_SUFX} \ - elm-compiler-bootstrap-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= haskell@FreeBSD.org COMMENT= Delightful language for reliable webapps