From owner-dev-commits-ports-all@freebsd.org Fri Oct 1 22:55:51 2021 Return-Path: Delivered-To: dev-commits-ports-all@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 6393B6B79FE; Fri, 1 Oct 2021 22:55:51 +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 4HLlnz2BTVz3QGf; Fri, 1 Oct 2021 22:55:51 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 27EE227D75; Fri, 1 Oct 2021 22:55:51 +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 191MtpHs084472; Fri, 1 Oct 2021 22:55:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 191MtpAW084471; Fri, 1 Oct 2021 22:55:51 GMT (envelope-from git) Date: Fri, 1 Oct 2021 22:55:51 GMT Message-Id: <202110012255.191MtpAW084471@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joseph Mingrone Subject: git: e303253cc55e - main - net/tramp: Work around plist issue on 13.0 with devel_full flavor MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e303253cc55ea9336eff3158a857d4a66c0da284 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Oct 2021 22:55:51 -0000 The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=e303253cc55ea9336eff3158a857d4a66c0da284 commit e303253cc55ea9336eff3158a857d4a66c0da284 Author: Joseph Mingrone AuthorDate: 2021-10-01 22:30:29 +0000 Commit: Joseph Mingrone CommitDate: 2021-10-01 22:55:39 +0000 net/tramp: Work around plist issue on 13.0 with devel_full flavor Detection of gvfs fails with this combination. --- net/tramp/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/tramp/Makefile b/net/tramp/Makefile index 1b0f60a4251c..df4c5b636dd3 100644 --- a/net/tramp/Makefile +++ b/net/tramp/Makefile @@ -30,7 +30,9 @@ post-patch: @${REINPLACE_CMD} 's/^make/${MAKE_CMD}/' ${WRKSRC}/configure .if ${FLAVOR:U} != nox && ${FLAVOR:U} != devel_nox +.if ! ( ${OSVERSION} >= 1300000 && ${FLAVOR:U} == devel_full ) PLIST_FILES+= ${TRAMP_LISPDIR}/tramp-gvfs.el ${TRAMP_LISPDIR}/tramp-gvfs.elc .endif +.endif .include