From 71dddcb8045d14a4565f5d105abc24e5a990e731 Mon Sep 17 00:00:00 2001
From: marino <marino>
Date: Mon, 28 Nov 2011 19:42:39 +0000
Subject: chat/zephyr: Add DragonFly and FreeBSD support

DragonFly and FreeBSD don't build libdes with Kerberos IV, and at least
DragonFly doesn't have heriod support.  Sed substition within the Makefile
was required due to requirements conflicts between platforms.
---
 chat/zephyr/Makefile         | 14 ++++++++++++--
 chat/zephyr/distinfo         |  4 ++--
 chat/zephyr/patches/patch-an | 28 +++++++++++++++++++++-------
 3 files changed, 35 insertions(+), 11 deletions(-)

(limited to 'chat/zephyr')

diff --git a/chat/zephyr/Makefile b/chat/zephyr/Makefile
index f5a05f48d9a..ea6be6c6222 100644
--- a/chat/zephyr/Makefile
+++ b/chat/zephyr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2010/08/16 09:48:00 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2011/11/28 19:42:39 marino Exp $
 #
 
 DISTNAME=	zephyr-20010518
@@ -21,7 +21,6 @@ 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
 CONFIGURE_ARGS+=	--with-ares
 
 ZEPHYR_DOCDIR=	${PREFIX}/share/doc/zephyr
@@ -45,6 +44,17 @@ SUBST_SED.mandir=	-e 's,$${prefix}/man,@mandir@,g'
 BUILDLINK_TRANSFORM+=	l:ss:ss:roken:crypt
 .endif
 
+.if ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD"
+CFLAGS+=		-DHAVE_STRERROR
+SUBST_CLASSES+=		FreeFly
+SUBST_STAGE.FreeFly=	post-patch
+SUBST_MESSAGE.FreeFly=	Replacing libdes with libcrypt + libcrypto
+SUBST_FILES.FreeFly=	aclocal.m4 configure
+SUBST_SED.FreeFly=	-e 's,-lkrb -ldes,-lkrb -lcrypt -lcrypto,g'
+.else
+CONFIGURE_ARGS+=	--with-hesiod
+.endif
+
 pre-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
 	${INSTALL_DATA_DIR} ${DESTDIR}${ZEPHYR_DOCDIR}
diff --git a/chat/zephyr/distinfo b/chat/zephyr/distinfo
index d02d5776bf2..55aba491c2a 100644
--- a/chat/zephyr/distinfo
+++ b/chat/zephyr/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2011/10/08 06:17:40 dholland Exp $
+$NetBSD: distinfo,v 1.9 2011/11/28 19:42:39 marino Exp $
 
 SHA1 (zephyr-20010518.tar.gz) = cd2fca9c2f0bfaa8e69c94813bedc87d66d3ac1c
 RMD160 (zephyr-20010518.tar.gz) = 1082db0df40e4ac1007e4b2b4f8adc15cf8a8ab0
@@ -17,6 +17,6 @@ SHA1 (patch-aj) = 3ec4b1624e2eecefe129ac53e870ce2fb2bce236
 SHA1 (patch-ak) = 7c2084aac1e4b30124c380fbc369cb6a6b41eb17
 SHA1 (patch-al) = d61151a84bb9a55c21b2d757650064390127f8c8
 SHA1 (patch-am) = 40fc00c67f78485b0d45a86ab97aa8ae662dda40
-SHA1 (patch-an) = b7e52657c77435fe7f263ecb36546dce55ca3504
+SHA1 (patch-an) = 72782e62a6b942b8aa537fd1d350505e11a2f87e
 SHA1 (patch-configure) = 92bd3d15eda54a0eea48af347acabf32bbb92564
 SHA1 (patch-configure_in) = 7080333e26de0ce0d7cf3fb802b0a42ffeece118
diff --git a/chat/zephyr/patches/patch-an b/chat/zephyr/patches/patch-an
index 7f3098cf7f2..de08c2a9ec0 100644
--- a/chat/zephyr/patches/patch-an
+++ b/chat/zephyr/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.2 2011/10/08 06:17:40 dholland Exp $
+$NetBSD: patch-an,v 1.3 2011/11/28 19:42:39 marino Exp $
 
 - check for hes_getmailhost before using it
 - avoid conflict with POSIX getline
@@ -32,7 +32,21 @@ $NetBSD: patch-an,v 1.2 2011/10/08 06:17:40 dholland Exp $
  	(*response != '+')) {
  	fprintf(stderr,"%s: %s\n",prog,response);
  	exit(1);
-@@ -498,7 +498,7 @@ pop_command(fmt, va_alist)
+@@ -460,7 +460,12 @@ char *host;
+     strcpy(host_save, hp->h_name);
+     rem = krb_sendauth(authopts, s, ticket, "pop", host_save, (char *)0,
+ 		       0, (MSG_DAT *) 0, (CREDENTIALS *) 0,
+-		       (bit_64 *) 0, (struct sockaddr_in *)0,
++#if defined(__DragonFly__) || defined (__FreeBSD__)
++		       (DES_key_schedule) {0},
++#else
++		       (bit_64 *) 0,
++#endif
++		       (struct sockaddr_in *)0,
+ 		       (struct sockaddr_in *)0,"ZMAIL0.0");
+     free(host_save);
+     free(ticket);
+@@ -498,7 +503,7 @@ pop_command(fmt, va_alist)
  
      if (putline(buf, Errmsg, sfo) == NOTOK) return(NOTOK);
  
@@ -41,7 +55,7 @@ $NetBSD: patch-an,v 1.2 2011/10/08 06:17:40 dholland Exp $
  	(void) strcpy(Errmsg, buf);
  	return(NOTOK);
      }
-@@ -519,7 +519,7 @@ int *nmsgs, *nbytes;
+@@ -519,7 +524,7 @@ int *nmsgs, *nbytes;
  
      if (putline("STAT", Errmsg, sfo) == NOTOK) return(NOTOK);
  
@@ -50,7 +64,7 @@ $NetBSD: patch-an,v 1.2 2011/10/08 06:17:40 dholland Exp $
  	(void) strcpy(Errmsg, buf);
  	return(NOTOK);
      }
-@@ -546,7 +546,7 @@ int (*action)();
+@@ -546,7 +551,7 @@ int (*action)();
  #endif
      if (putline(buf, Errmsg, sfo) == NOTOK) return(NOTOK);
  
@@ -59,7 +73,7 @@ $NetBSD: patch-an,v 1.2 2011/10/08 06:17:40 dholland Exp $
  	(void) strcpy(Errmsg, buf);
  	return(NOTOK);
      }
-@@ -565,7 +565,7 @@ int (*action)();
+@@ -565,7 +570,7 @@ int (*action)();
      }
  }
  
@@ -68,7 +82,7 @@ $NetBSD: patch-an,v 1.2 2011/10/08 06:17:40 dholland Exp $
  char *buf;
  register int n;
  FILE *f;
-@@ -595,7 +595,7 @@ char *buf;
+@@ -595,7 +600,7 @@ char *buf;
  register int n;
  FILE *f;
  {
@@ -77,7 +91,7 @@ $NetBSD: patch-an,v 1.2 2011/10/08 06:17:40 dholland Exp $
      if (*buf == '.') {
  	if (*(buf+1) == '\0') {
  	    return (DONE);
-@@ -605,7 +605,7 @@ FILE *f;
+@@ -605,7 +610,7 @@ FILE *f;
      } else if (*buf == '\0') {
        /* suck up all future lines, since this is after all only for headers */
  	while(! ((buf[0]=='.') && (buf[1] == '\0')) ) {
-- 
cgit v1.2.3