From 0526575dd0c09390b08d5273176c6e3f0d7a6b0d Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Fri, 23 Dec 2011 01:12:35 +0000
Subject: Workaround brain damage from configure (non-)test by not defining
 macros from Heimdal.

---
 devel/gcvs/distinfo                           |  4 +++-
 devel/gcvs/patches/patch-cvsunix_src_client.c | 15 +++++++++++++++
 devel/gcvs/patches/patch-cvsunix_src_server.c | 15 +++++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 devel/gcvs/patches/patch-cvsunix_src_client.c
 create mode 100644 devel/gcvs/patches/patch-cvsunix_src_server.c

(limited to 'devel')

diff --git a/devel/gcvs/distinfo b/devel/gcvs/distinfo
index b857f4864a3..c8d34df03b0 100644
--- a/devel/gcvs/distinfo
+++ b/devel/gcvs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2011/11/25 21:42:44 joerg Exp $
+$NetBSD: distinfo,v 1.11 2011/12/23 01:12:35 joerg Exp $
 
 SHA1 (gcvs-1.0.tar.gz) = 42b2469d0a9acc0e69a127b44000cd1b11bb895e
 RMD160 (gcvs-1.0.tar.gz) = 195698283848cd1f22d00eb37df7dd0f6b52cffc
@@ -36,3 +36,5 @@ SHA1 (patch-cvstree_CvsLog.h) = 4f6dae8bb52b0f6b0e226dac985bbc098177acb6
 SHA1 (patch-cvstree_main.cpp) = 0b45151fe355dc3b2fa50013389511c10ed30740
 SHA1 (patch-cvsunix_lib_getline_c) = 502b5967beb579bbbd5ebab7ee8824136e24f3fd
 SHA1 (patch-cvsunix_lib_getline_h) = c717385903f2f36e992213cbc8f010d683858d5a
+SHA1 (patch-cvsunix_src_client.c) = 7f07bf41740470f3c6123a20dba9b005b5dca329
+SHA1 (patch-cvsunix_src_server.c) = dce0f6cd59df4dda7f5baf3222f222e1bd1d8deb
diff --git a/devel/gcvs/patches/patch-cvsunix_src_client.c b/devel/gcvs/patches/patch-cvsunix_src_client.c
new file mode 100644
index 00000000000..07014e18811
--- /dev/null
+++ b/devel/gcvs/patches/patch-cvsunix_src_client.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-cvsunix_src_client.c,v 1.1 2011/12/23 01:12:35 joerg Exp $
+
+--- cvsunix/src/client.c.orig	2011-12-22 23:37:10.000000000 +0000
++++ cvsunix/src/client.c
+@@ -87,10 +87,6 @@ static Key_schedule sched;
+ #include <gssapi/gssapi_generic.h>
+ #endif
+ 
+-#ifndef HAVE_GSS_C_NT_HOSTBASED_SERVICE
+-#define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name
+-#endif
+-
+ /* This is needed for GSSAPI encryption.  */
+ static gss_ctx_id_t gcontext;
+ 
diff --git a/devel/gcvs/patches/patch-cvsunix_src_server.c b/devel/gcvs/patches/patch-cvsunix_src_server.c
new file mode 100644
index 00000000000..25250ebac8b
--- /dev/null
+++ b/devel/gcvs/patches/patch-cvsunix_src_server.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-cvsunix_src_server.c,v 1.1 2011/12/23 01:12:35 joerg Exp $
+
+--- cvsunix/src/server.c.orig	2011-12-22 23:36:59.000000000 +0000
++++ cvsunix/src/server.c
+@@ -57,10 +57,6 @@ static Key_schedule sched;
+ #include <gssapi/gssapi_generic.h>
+ #endif
+ 
+-#ifndef HAVE_GSS_C_NT_HOSTBASED_SERVICE
+-#define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name
+-#endif
+-
+ /* We use Kerberos 5 routines to map the GSSAPI credential to a user
+    name.  */
+ #include <krb5.h>
-- 
cgit v1.2.3