From nobody Wed Aug 06 06:36:15 2025 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 4bxgYC6mF8z63H5x; Wed, 06 Aug 2025 06:36:15 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bxgYC62JFz40D3; Wed, 06 Aug 2025 06:36:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754462175; 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=QyzA8OZapa0In9YouOy5Sxo6hxOpmkYx5+1SjyRSJlM=; b=bR+QvRMqMw451yfglrUuDGZ//HK4ESn857WiRAG7SRRddAZLgsnarsAimTlXuuVI3PxVq/ E/sZ5yOFrf4rzoJ6axWQDqe59yhrConlov3QLCL8ft42qw0/qObxq/nvEzJxFgg0WKm8JG rO5l8ZcKNwBn96aKhEK50m0eQ5vpJ64KAFfXd7awDO6gbgleQNsQUMQDas1Zs+YMdhCYfP NMuNELMTDuu6LhzdtzOqenv7WUgx8tJvu5145i0S1eDZQTUji8Cpiy8kIQHx1VZyFSTT1r m3Y1lcoLGu9STipW9J86vwJJ2KoIZSsXvOmdIrKg/618A24+7azKnCUbb7pjxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754462175; 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=QyzA8OZapa0In9YouOy5Sxo6hxOpmkYx5+1SjyRSJlM=; b=xwVLv+QFYu9MLIJvNkbwdEXmJO7DecezpMVbYJcle/OKQ3QkAVFJCjZy0YiE7EifO1S8LD cQ0jybAZHWHI7yA/BFjh5MYfsPh2NHcnW5SFzA1Ix8uy8sEiVIsdW7/UsU2ULZMkb01zJ9 xRLo4aCIXxoaMnaFEaWdzMvZ3cOwEqXULCUTfAnsnbE4mvrtUF+47WcyrbRyPuGcmPUQfC 3ZnoV6ERDieYMAtSrywU3hp+IIJpSeFIYF7JFbq2L3erVpZ8LMiRuOGIfR3rfFgmntrx21 wA4zF/58bM3afoJ5x9sRLUNdtuOTsXjBEiO8RPPv+xrsoGmrTFl3wN6JaOSKOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754462175; a=rsa-sha256; cv=none; b=A4Ypmb5mq0lYjq2LQr6gC3oNPaM8lKMzry/noZIwbd5NmYO+xK7GyytlUuxVToXrk+t6c6 ZBfHciqPHll6Ti8kn8I5E8V4lcXGJ5hPGLEzGY/2M38k06S7blytUdfOoo3NEVngwqOlB1 BYNIVeJosgopIiMLfBGtn0hE7eXpshyQVNZfakIPGssGtTVoFU7pO9B1qWZnK0FEuodfqr iaxRiKcv6FO4gGtybK0BzwgFD+ErN4dsNlb8H+nPy3vhsRVjXWYlpcWbB3qjva12A+a1C0 UG3K5+j1MPeCzkPPeVGOgkG9fyNSIm2qv2fJEHlR7j5Yae79gKQM6qrekIV7vA== 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 4bxgYC5Yt0z17kF; Wed, 06 Aug 2025 06:36:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5766aFVr034616; Wed, 6 Aug 2025 06:36:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5766aFNF034613; Wed, 6 Aug 2025 06:36:15 GMT (envelope-from git) Date: Wed, 6 Aug 2025 06:36:15 GMT Message-Id: <202508060636.5766aFNF034613@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 3f612bd5538a - main - devel/cvs: Fix 15-CURRENT build with MK_MITKRB5 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f612bd5538a6da4a99c5d54f2cce3a49690dae2 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=3f612bd5538a6da4a99c5d54f2cce3a49690dae2 commit 3f612bd5538a6da4a99c5d54f2cce3a49690dae2 Author: Cy Schubert AuthorDate: 2025-08-06 06:34:39 +0000 Commit: Cy Schubert CommitDate: 2025-08-06 06:36:07 +0000 devel/cvs: Fix 15-CURRENT build with MK_MITKRB5 FreeBSD 15-CURRENT has imported MIT KRB5 and made it default. Fix the build by referencing MIT KRB5 libraries instead. --- devel/cvs/Makefile | 2 +- devel/cvs/files/patch-cvs__Makefile | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile index 30c4715616e0..8889be753ab8 100644 --- a/devel/cvs/Makefile +++ b/devel/cvs/Makefile @@ -1,6 +1,6 @@ PORTNAME= cvs PORTVERSION= 1.20120905 -PORTREVISION?= 8 +PORTREVISION?= 9 CATEGORIES= devel MASTER_SITES= LOCAL/eadler diff --git a/devel/cvs/files/patch-cvs__Makefile b/devel/cvs/files/patch-cvs__Makefile index cf03aa11ab05..cf34e74906d3 100644 --- a/devel/cvs/files/patch-cvs__Makefile +++ b/devel/cvs/files/patch-cvs__Makefile @@ -1,6 +1,6 @@ --- ../cvs-build/cvs/Makefile.orig 2012-09-05 19:25:43.000000000 -0700 -+++ ../cvs-build/cvs/Makefile 2021-01-02 17:11:22.159883000 -0800 -@@ -29,10 +29,10 @@ ++++ ../cvs-build/cvs/Makefile 2025-08-05 23:33:37.681784000 -0700 +@@ -29,15 +29,22 @@ -I/usr/include/gnu \ -I${CVSDIR}/lib -I${CVSDIR}/diff -I. @@ -11,6 +11,18 @@ -.if ${MK_KERBEROS_SUPPORT} != "no" +.if defined(KERBEROS_SUPPORT) ++.if exists(/usr/libexec/krb5kdc) ++# MIT KRB5 ++LDADD+= -lgssapi_krb5 -lkrb5 -lkrb5support -lcrypto -lcrypt -lcom_err ++DPADD+= ${LIBGSSAPI_KRB5} ${LIBKRB5} ${LIBKRB5SUPPORT} ${LIBCRYPTO} ++DPADD+= ${LIBCRYPT} ${LIBCOM_ERR} ++.else CFLAGS+= -DHAVE_GSSAPI -DENCRYPTION LDADD+= -lgssapi -lkrb5 -lhx509 -lasn1 -lcrypto -lroken -lcrypt -lcom_err DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCRYPTO} ${LIBROKEN} + DPADD+= ${LIBCRYPT} ${LIBCOM_ERR} + .endif ++.endif + + # + # Regression test support