Make this compile with KERBEROS=5.

4 files changed, 28 insertions, 11 deletions

diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
index 71a087d0a6a..eff4a1bbf76 100644
--- a/devel/cvs/Makefile
+++ b/devel/cvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2000/02/04 21:29:14 tron Exp $
+# $NetBSD: Makefile,v 1.26 2000/02/11 00:06:35 jlam Exp $
 #
 
 DISTNAME=       cvs-1.10
@@ -30,6 +30,7 @@ CONFIGURE_ARGS+=	--with-krb4=no
 .if defined(KERBEROS) && ${KERBEROS} == 5
 USE_KERBEROS=	yes
 CONFIGURE_ARGS+=	--with-gssapi
+CFLAGS+=		-I/usr/include/krb5		# krb5.h
 .else
 CONFIGURE_ARGS+=	--with-gssapi=no
 .endif
diff --git a/devel/cvs/files/patch-sum b/devel/cvs/files/patch-sum
index 76e0e506f8b..daba086a229 100644
--- a/devel/cvs/files/patch-sum
+++ b/devel/cvs/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.3 1999/11/03 22:42:46 jwise Exp $
+$NetBSD: patch-sum,v 1.4 2000/02/11 00:06:36 jlam Exp $
 
 MD5 (patch-aa) = 5849cf99985eeb67db5f9f69e69e8fd5
 MD5 (patch-ab) = 152906e7f3605dabf55aeedd9af72cce
@@ -17,6 +17,6 @@ MD5 (patch-ar) = 9aec2a8b76d7590845ee0253e2fa34d9
 MD5 (patch-as) = a1ee9d85ca2a060240d8d75f1d41f1a2
 MD5 (patch-at) = 0891e77ee194454422e366555abc157d
 MD5 (patch-au) = c29d29e86268d86449cb445a8ad909c5
-MD5 (patch-av) = aa1e487ab05bbd1731fbe130a207c262
-MD5 (patch-aw) = 416b5efeebb6064d5c85ac161452a12d
+MD5 (patch-av) = 9916350cec2ba23d36d5c4b9ccca9a91
+MD5 (patch-aw) = c30d4e920fd58e24628ade29c762a2e9
 MD5 (patch-ax) = 1f5eccc22dcd87fa5617fd03bc7f9260
diff --git a/devel/cvs/patches/patch-av b/devel/cvs/patches/patch-av
index 86f613e8c29..4b2fa2fac06 100644
--- a/devel/cvs/patches/patch-av
+++ b/devel/cvs/patches/patch-av
@@ -1,7 +1,7 @@
-$NetBSD: patch-av,v 1.1 1999/08/18 21:58:58 thorpej Exp $
+$NetBSD: patch-av,v 1.2 2000/02/11 00:06:36 jlam Exp $
 
---- configure.in.orig	Tue Jun  2 10:29:56 1998
-+++ configure.in	Wed Aug 18 14:14:36 1999
+--- configure.in.orig	Tue Jun  2 13:29:56 1998
++++ configure.in	Thu Feb 10 18:53:22 2000
 @@ -168,6 +168,9 @@
    AC_DEFINE(HAVE_CONNECT)
  fi])
@@ -72,6 +72,15 @@ $NetBSD: patch-av,v 1.1 1999/08/18 21:58:58 thorpej Exp $
  hold_cppflags=$CPPFLAGS
  CPPFLAGS="$CPPFLAGS -I$GSSAPI/include "
  AC_CHECK_HEADERS(gssapi.h gssapi/gssapi.h gssapi/gssapi_generic.h)
+@@ -272,7 +280,7 @@
+   if test "$ac_cv_header_gssapi_h" = "yes"; then
+     LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkrb5 -lasn1 -ldes -lroken"
+   else
+-    LIBS="$LIBS -L$GSSAPI/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err"
++    LIBS="$LIBS -L$GSSAPI/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
+   fi
+   save_CPPFLAGS=$CPPFLAGS
+   CPPFLAGS="-I$GSSAPI/include $CPPFLAGS"
 @@ -286,6 +294,7 @@
    # there, an_to_ln.o refers to things defined only in -lgen.
    AC_CHECK_LIB(gen, compile)
diff --git a/devel/cvs/patches/patch-aw b/devel/cvs/patches/patch-aw
index be2eb0018e0..70ec9d88943 100644
--- a/devel/cvs/patches/patch-aw
+++ b/devel/cvs/patches/patch-aw
@@ -1,7 +1,7 @@
-$NetBSD: patch-aw,v 1.1 1999/08/18 21:58:58 thorpej Exp $
+$NetBSD: patch-aw,v 1.2 2000/02/11 00:06:36 jlam Exp $
 
---- configure.orig	Tue Jun  2 10:29:52 1998
-+++ configure	Wed Aug 18 14:18:44 1999
+--- configure.orig	Tue Jun  2 13:29:52 1998
++++ configure	Thu Feb 10 18:53:39 2000
 @@ -1,7 +1,7 @@
  #! /bin/sh
  
@@ -2290,7 +2290,14 @@ $NetBSD: patch-aw,v 1.1 1999/08/18 21:58:58 thorpej Exp $
    cat >> confdefs.h <<EOF
  #define $ac_tr_hdr 1
  EOF
-@@ -2994,7 +3249,7 @@
+@@ -2988,13 +3243,13 @@
+   if test "$ac_cv_header_gssapi_h" = "yes"; then
+     LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkrb5 -lasn1 -ldes -lroken"
+   else
+-    LIBS="$LIBS -L$GSSAPI/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err"
++    LIBS="$LIBS -L$GSSAPI/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
+   fi
+   save_CPPFLAGS=$CPPFLAGS
    CPPFLAGS="-I$GSSAPI/include $CPPFLAGS"
    if test "$ac_cv_header_gssapi_h" = "yes"; then
      cat > conftest.$ac_ext <<EOF