From ef8673e0e16fb9141aca813963874f1151012272 Mon Sep 17 00:00:00 2001
From: fredb <fredb>
Date: Thu, 10 Apr 2003 14:56:21 +0000
Subject: Add "-ldes" for ${USE_KERBEROS}==YES case, on NetBSD-1.5* only. This
 should close PR pkg/19430 and PR pkg/20491.

---
 mail/imap-uw/Makefile         | 10 +++++++---
 mail/imap-uw/distinfo         |  4 ++--
 mail/imap-uw/patches/patch-aj |  4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'mail/imap-uw')

diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 84450024cdc..942af1ab943 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2003/03/31 16:18:04 bouyer Exp $
+# $NetBSD: Makefile,v 1.56 2003/04/10 14:56:21 fredb Exp $
 
 DISTNAME=       imap-2002b
 PKGNAME=        imap-uw-2002.2
@@ -29,10 +29,14 @@ ALL_TARGET=	lrh
 ALL_TARGET=	osx
 .else
 ALL_TARGET=	neb
-.if defined(USE_KERBEROS) && (${USE_KERBEROS} != "no")
+. if defined(USE_KERBEROS) && (${USE_KERBEROS} != "no")
 PKG_USE_KERBEROS=	#defined
 ALL_TARGET+=	EXTRAAUTHENTICATORS="gss"
-.endif
+.  if !empty(MACHINE_PLATFORM:MNetBSD-1.5*)
+# NetBSD-1.5 didn't have "des_new_random_key" in libcrypto
+MAKE_ENV+=	GSS_EXTRA_LDFLAGS= -ldes
+.  endif
+. endif
 .endif
 
 BUILD_DEFS+=	IMAP_UW_CCLIENT_MBOX_FMT IMAP_UW_NO_CLEARTEXT
diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo
index 81b810e7d21..4821a7fd3b7 100644
--- a/mail/imap-uw/distinfo
+++ b/mail/imap-uw/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2003/01/23 07:37:16 martti Exp $
+$NetBSD: distinfo,v 1.11 2003/04/10 14:56:21 fredb Exp $
 
 SHA1 (imap-2002b.tar.Z) = c9ab145a8559670a6a994393d2b9614a5a1fde67
 Size (imap-2002b.tar.Z) = 2168106 bytes
@@ -8,6 +8,6 @@ SHA1 (patch-ac) = 8b4ea8c15929c65eda1b3444c68fdbf70fa68b6a
 SHA1 (patch-ad) = 3404de4e4acb456e3c7b34ca80b31b80b465b3e1
 SHA1 (patch-ae) = 702473377ca66266bdb6d5d13045d279a38ea7de
 SHA1 (patch-ai) = aaa778f60684c797cc53a109b8430fa05ec7f424
-SHA1 (patch-aj) = 3e56f0910ecd6eb50cad7855908c8ff90a889d88
+SHA1 (patch-aj) = 5ce6d6b487e8f8535f7e22483796b6c01af9eb79
 SHA1 (patch-ak) = a0a1a21ec22a92d086e665b263b51532207d0e3c
 SHA1 (patch-al) = ea40f48394df229c03b028eb58d915b5dc5e162b
diff --git a/mail/imap-uw/patches/patch-aj b/mail/imap-uw/patches/patch-aj
index 12abd01187b..46d45349e8f 100644
--- a/mail/imap-uw/patches/patch-aj
+++ b/mail/imap-uw/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.9 2002/12/11 12:21:25 tron Exp $
+$NetBSD: patch-aj,v 1.10 2003/04/10 14:56:21 fredb Exp $
 
 --- src/osdep/unix/Makefile.gss.orig	Wed Oct 23 17:23:36 2002
 +++ src/osdep/unix/Makefile.gss	Wed Oct 23 17:41:19 2002
@@ -26,4 +26,4 @@ $NetBSD: patch-aj,v 1.9 2002/12/11 12:21:25 tron Exp $
  
 +gss:
 +	echo "-I/usr/include/krb5" >> OSCFLAGS
-+	echo "-lgssapi -lkrb5 -lasn1 -lcrypto -lcom_err -lroken" >> LDFLAGS
++	echo "-lgssapi -lkrb5 -lasn1 -lcrypto ${GSS_EXTRA_LDFLAGS} -lcom_err -lroken" >> LDFLAGS
-- 
cgit v1.2.3