Use kth-krb4 as dependency. It should work with the system krb4 on

NetBSD, when someone adds a builtin.mk for security/kth-krb4.
Fix errno. Bump revision.

5 files changed, 47 insertions, 19 deletions

diff --git a/chat/zephyr/Makefile b/chat/zephyr/Makefile
index 1bce502579b..ef27e29701f 100644
--- a/chat/zephyr/Makefile
+++ b/chat/zephyr/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:08:26 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/06/04 13:42:10 joerg Exp $
 #
 
 DISTNAME=	zephyr-20010518
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	chat net
 MASTER_SITES=	ftp://athena-dist.mit.edu/pub/ATHENA/zephyr/
 
@@ -13,8 +13,10 @@ COMMENT=	Project Athena's original Instant Messaging system
 WRKSRC=		${WRKDIR}/zephyr
 GNU_CONFIGURE=	YES
 
-CPPFLAGS.NetBSD+=	-I/usr/include/kerberosIV -I/usr/include/krb5
-LDFLAGS.NetBSD+=	-lroken -lcrypto -lcom_err -ledit -lcurses
+.include "../../mk/bsd.prefs.mk"
+
+CPPFLAGS+=		-I${BUILDLINK_PREFIX.kth-krb4}/include/kerberosIV
+CPPFLAGS.NetBSD+=	-I${BUILDLINK_PREFIX.kth-krb4}/include/kerberosIV/ss
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--with-krb4
 CONFIGURE_ARGS+=	--with-hesiod
@@ -41,5 +43,6 @@ pre-install:
 .include "../../devel/readline/buildlink3.mk"
 .include "../../net/hesiod/buildlink3.mk"
 .include "../../net/libares/buildlink3.mk"
+.include "../../security/kth-krb4/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/zephyr/distinfo b/chat/zephyr/distinfo
index dcea501df51..fa3c6026aa8 100644
--- a/chat/zephyr/distinfo
+++ b/chat/zephyr/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 15:59:14 agc Exp $
+$NetBSD: distinfo,v 1.3 2006/06/04 13:42:10 joerg Exp $
 
 SHA1 (zephyr-20010518.tar.gz) = cd2fca9c2f0bfaa8e69c94813bedc87d66d3ac1c
 RMD160 (zephyr-20010518.tar.gz) = 1082db0df40e4ac1007e4b2b4f8adc15cf8a8ab0
 Size (zephyr-20010518.tar.gz) = 342259 bytes
 SHA1 (patch-aa) = f4338f0da9085e1780c52c9b2be2366b7a0f22c2
 SHA1 (patch-ab) = 61cbadf511806c1c16e489ac6d14de347b09277a
-SHA1 (patch-ac) = db350fc16d88818d4cce287fad220a2c3e84dabe
 SHA1 (patch-ad) = b0f8c408afc2e7fe9a673a5f2ec562a3e34e225c
 SHA1 (patch-ae) = 76b4a43282f3d8d8d42d72f66c677a652ff33e22
 SHA1 (patch-af) = 4ebb22fa3c1b2ed351ee267be737d34d8292129c
@@ -14,3 +13,5 @@ SHA1 (patch-ah) = 8282d416d24eafcb40ead93d4c376f1e8e80b207
 SHA1 (patch-ai) = bfa2d01d20884d31e58bd12a171938504d929e28
 SHA1 (patch-aj) = 3ec4b1624e2eecefe129ac53e870ce2fb2bce236
 SHA1 (patch-ak) = 7c2084aac1e4b30124c380fbc369cb6a6b41eb17
+SHA1 (patch-al) = d61151a84bb9a55c21b2d757650064390127f8c8
+SHA1 (patch-am) = 40fc00c67f78485b0d45a86ab97aa8ae662dda40
diff --git a/chat/zephyr/patches/patch-ac b/chat/zephyr/patches/patch-ac
deleted file mode 100644
index 4746b9e1805..00000000000
--- a/chat/zephyr/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2003/09/16 19:41:50 seb Exp $
-
---- clients/zctl/zctl.c.orig	Thu Aug 12 20:19:38 1999
-+++ clients/zctl/zctl.c
-@@ -12,7 +12,7 @@
- 
- #include <sysdep.h>
- #include <zephyr/zephyr.h>
--#include <ss/ss.h>
-+#include <ss.h>
- #include <com_err.h>
- #include <pwd.h>
- #include <netdb.h>
diff --git a/chat/zephyr/patches/patch-al b/chat/zephyr/patches/patch-al
new file mode 100644
index 00000000000..f46735ba025
--- /dev/null
+++ b/chat/zephyr/patches/patch-al
@@ -0,0 +1,21 @@
+$NetBSD: patch-al,v 1.1 2006/06/04 13:42:10 joerg Exp $
+
+--- server/acl_files.c.orig	2006-04-25 15:28:36.000000000 +0000
++++ server/acl_files.c
+@@ -18,6 +18,7 @@
+  * declared and not statically declared.
+  */
+ 
++#include <errno.h>
+ #include <zephyr/mit-copyright.h>
+ #include "zserver.h"
+ 
+@@ -48,8 +49,6 @@ static const char rcsid_acl_files_c[] = 
+ 
+ #define COR(a,b) ((a!=NULL)?(a):(b))
+ 
+-extern int errno;
+-
+ extern time_t time();
+ 
+ /* Canonicalize a principal name */
diff --git a/chat/zephyr/patches/patch-am b/chat/zephyr/patches/patch-am
new file mode 100644
index 00000000000..32ce4298da7
--- /dev/null
+++ b/chat/zephyr/patches/patch-am
@@ -0,0 +1,16 @@
+$NetBSD: patch-am,v 1.1 2006/06/04 13:42:10 joerg Exp $
+
+--- zwgc/main.c.orig	2006-04-25 15:31:09.000000000 +0000
++++ zwgc/main.c
+@@ -21,4 +21,5 @@ static const char rcsid_main_c[] = "$Id:
+ #endif
+ 
++#include <errno.h>
+ #include <netdb.h>
+ #include <sys/socket.h>
+@@ -449,5 +450,4 @@ static RETSIGTYPE signal_child()
+   union wait status;
+ #endif
+-  extern int errno;
+   int pid, old_errno = errno;
+