From nobody Sat Aug 20 02:32:44 2022 X-Original-To: dev-commits-ports-all@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 4M8jMc2WLRz4YwBH; Sat, 20 Aug 2022 02:32:44 +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 4M8jMc21yXz3M05; Sat, 20 Aug 2022 02:32:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660962764; 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=mi23rg0szNdPXQcab3Fq0Fv47pyrhkv+5iB0eEBv+NM=; b=cqOZs8dfkJY7lNMEICMbh346yibGLcTHr4S0A/a8YqvegEq5BvE90u/M+E7B9b9xMLAMoe kyiM3FSOlZkemaYzBK3+foiDh2EbbIuNKbty8tPhEjPni2stdcRx6dErHHQVCcmYzIAjr9 k6H4XAWk1Q41cQGYDWO7wGx1MJSpy2QyJnOui+gnl5CXeW/MJ3q0VRTaw0fihXwivLThSe G+m7FMoKrPlN23OHwHOzbvSqR+8hyR1HmsgVdSj1CZ27YrPPjSehmTLtanaqKYE/Zx7x+0 9zpGubTPSu5at1xFrY0joyuMehAbya+zy2wryOd7u5uUg40sK/mBxg/qNFnvpw== 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 4M8jMc15m2zGL0; Sat, 20 Aug 2022 02:32:44 +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 27K2WimU021893; Sat, 20 Aug 2022 02:32:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27K2WiuM021892; Sat, 20 Aug 2022 02:32:44 GMT (envelope-from git) Date: Sat, 20 Aug 2022 02:32:44 GMT Message-Id: <202208200232.27K2WiuM021892@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Romain=20Tarti=C3=A8re?= Subject: git: f3fe6a35a16f - main - sysutils/rubygem-facter: Add soft-dependencies List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: romain X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f3fe6a35a16f4f1350e91c41f8a246ba4e442396 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660962764; 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=mi23rg0szNdPXQcab3Fq0Fv47pyrhkv+5iB0eEBv+NM=; b=S2TyXynFbEfEW+uiW/YIYn2uc9INtWzjwO3MPX4m6+RB2ZM+uVK/gYJDkdTVC96aDQ3j55 1tj8QZLkqDbWncTvaOOXYBagh4JELogwvkhWGU/eNX52TXHFU6huSwNJPH2/0xKHH4I1W6 QCqfJL47nPOBgEQyVQmL8I98A/2wnMmP9/8LD1hyGh2b9MXjDCUPyK2W9mxnAGqzymgNSB y32RXwcQwX76QnSyugiWFEh9IWDyUsfM96N+aE62+jtOAWYdzW9HMUB4lDrNBnp9qIojAh KuKI85UzzvwHg/zDyELA7xI0VcQfV+zj6FjB92Sq6AVgK8hLpkz3/avJhwGATg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660962764; a=rsa-sha256; cv=none; b=W1pbPcLnGMvTZqAI2cw3hBafc6JmmUYe6bLrS3budvWpPYbXExe4I3d28RIzgZzQ5S3gjO EJDHaZFdd779aXG5ICoI0aIWAoat0Se3pg/XXVpcUg+gfVactEsn845n+1gcjc1/8nfQJQ OPlVzJBcWEumBmEdtzE7WVDc2ZVj5DVMSSgs8j+GjMaMME821Vyh0K9GquFrZKtGp5a3GU MCQFNlwSlJPJydpgvEJoRpwftq4lT+GCxQ0+kzYlPkkLKzymHUZCpQy2QqBb3EbW7I3Vu2 apfBxFek0e4i1+JuDp0B6s2ttFWba2aa0+0rLn0AsJVLh/GQmT2xmX4hmJ4WJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by romain: URL: https://cgit.FreeBSD.org/ports/commit/?id=f3fe6a35a16f4f1350e91c41f8a246ba4e442396 commit f3fe6a35a16f4f1350e91c41f8a246ba4e442396 Author: Romain Tartière AuthorDate: 2022-08-20 00:33:20 +0000 Commit: Romain Tartière CommitDate: 2022-08-20 02:32:32 +0000 sysutils/rubygem-facter: Add soft-dependencies Some facts are only resolved when some extra gems are installed. Add them as dependecy so that we have all basic facts by default regardless of what is already installed on the system. While here, reorder the Makefile to make portlint happy. PR: 264277 Reported by: albert.shih@obspm.fr With hat: puppet --- sysutils/rubygem-facter/Makefile | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/sysutils/rubygem-facter/Makefile b/sysutils/rubygem-facter/Makefile index 4a2633c8d253..848dcec7ccb5 100644 --- a/sysutils/rubygem-facter/Makefile +++ b/sysutils/rubygem-facter/Makefile @@ -1,21 +1,25 @@ PORTNAME= facter PORTVERSION= 4.2.11 +PORTREVISION= 1 CATEGORIES= sysutils rubygems MASTER_SITES= RG +PATCH_SITES= https://patch-diff.githubusercontent.com/raw/puppetlabs/facter/pull/ +PATCHFILES= 2497.diff 2510.diff +PATCH_DIST_STRIP=-p1 + MAINTAINER= puppet@FreeBSD.org COMMENT= Cross-platform Ruby library for retrieving facts from OS LICENSE= APACHE20 -PATCH_SITES= https://patch-diff.githubusercontent.com/raw/puppetlabs/facter/pull/ -PATCHFILES= 2497.diff 2510.diff -PATCH_DIST_STRIP=-p1 - -# rubygem-ffi is a soft dependency, but is used on FreeBSD to resolve some facts -RUN_DEPENDS= rubygem-ffi>=1.0:devel/rubygem-ffi \ - rubygem-hocon>=1.3<2:devel/rubygem-hocon \ +RUN_DEPENDS= rubygem-hocon>=1.3<2:devel/rubygem-hocon \ rubygem-thor>=1.0.1<2.0:devel/rubygem-thor +# Soft dependencies that resolve more FreeBSD facts +RUN_DEPENDS+= rubygem-ruby-augeas>0:textproc/rubygem-ruby-augeas \ + rubygem-ffi>=1.0:devel/rubygem-ffi \ + rubygem-rexml>0:textproc/rubygem-rexml \ + rubygem-sys-filesystem>0:sysutils/rubygem-sys-filesystem USES= cpe gem CPE_VENDOR= puppet