From 09f1ca4c30a5234805a543e804efd1b447a2b90c Mon Sep 17 00:00:00 2001
From: markd <markd>
Date: Tue, 29 Aug 2006 23:53:55 +0000
Subject: Delay cat'ing the LDFLAGS file till the actual linking is happening
 so that all library dependencies are picked up.  Fixes the build of pine when
 imap-uw has been built with the kerberos option.  No revision bump as doesn't
 change the default build.

---
 mail/imap-uw/distinfo         | 4 ++--
 mail/imap-uw/patches/patch-ab | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'mail')

diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo
index 3dff987fa19..9c6175a1fda 100644
--- a/mail/imap-uw/distinfo
+++ b/mail/imap-uw/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.29 2006/07/26 20:00:27 jlam Exp $
+$NetBSD: distinfo,v 1.30 2006/08/29 23:53:55 markd Exp $
 
 SHA1 (imap-2004g.tar.Z) = 791a8bb247ca51ce0a4c32e814a2f736c2bcf066
 RMD160 (imap-2004g.tar.Z) = a016a06ba073e879d2574a6395ce1074ea74c687
 Size (imap-2004g.tar.Z) = 2246713 bytes
 SHA1 (patch-aa) = 5e7dd27e949a191ddaeac9d7ba1db4e0fd258bc8
-SHA1 (patch-ab) = 3209c7902e2f91a701b7b5e8ae300920d9506646
+SHA1 (patch-ab) = 8f64017296d11bd57d57f1221c55fec278be20b3
 SHA1 (patch-ac) = 802b456555f6e79f60444cfe32d42e053d73cef8
 SHA1 (patch-ad) = e4b64935d0af726d3771489df411454788722727
 SHA1 (patch-ae) = 2e33641db5081e0f15e612db98f841591d5b2dd7
diff --git a/mail/imap-uw/patches/patch-ab b/mail/imap-uw/patches/patch-ab
index 5e5f91b27c8..af503462a5e 100644
--- a/mail/imap-uw/patches/patch-ab
+++ b/mail/imap-uw/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.19 2006/07/26 20:00:27 jlam Exp $
+$NetBSD: patch-ab,v 1.20 2006/08/29 23:53:55 markd Exp $
 
 --- src/osdep/unix/Makefile.orig	2005-04-30 16:51:13.000000000 -0400
 +++ src/osdep/unix/Makefile
@@ -67,7 +67,7 @@ $NetBSD: patch-ab,v 1.19 2006/07/26 20:00:27 jlam Exp $
  	 -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS
  	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
 -	echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
-+	echo "$(LTLINK) $(CC) -o $(ARCHIVE) $(BINARIES:.o=.lo) -rpath $(PREFIX)/lib -version-info $(CCLIENT_MAJOR):$(CCLIENT_MINOR) `$(CAT) LDFLAGS`" > ARCHIVE
++	echo "$(LTLINK) $(CC) -o $(ARCHIVE) $(BINARIES:.o=.lo) -rpath $(PREFIX)/lib -version-info $(CCLIENT_MAJOR):$(CCLIENT_MINOR) \`$(CAT) LDFLAGS\`" > ARCHIVE
  	echo $(OS) > OSTYPE
  	./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy
  	./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS)
-- 
cgit v1.2.3