git: 3f612bd5538a - main - devel/cvs: Fix 15-CURRENT build with MK_MITKRB5

The branch main has been updated by cy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3f612bd5538a6da4a99c5d54f2cce3a49690dae2

commit 3f612bd5538a6da4a99c5d54f2cce3a49690dae2
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2025-08-06 06:34:39 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
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