Fix build problems caused by libtool usage.

5 files changed, 58 insertions, 8 deletions

diff --git a/mail/imap-uw/files/patch-sum b/mail/imap-uw/files/patch-sum
index 8226661c412..b54ca032408 100644
--- a/mail/imap-uw/files/patch-sum
+++ b/mail/imap-uw/files/patch-sum
@@ -1,9 +1,11 @@
-$NetBSD: patch-sum,v 1.2 1999/11/18 14:59:14 agc Exp $
+$NetBSD: patch-sum,v 1.3 1999/11/25 14:32:42 tron Exp $
 
-MD5 (patch-aa) = 5766ba23265a4dc2e6bb6f1ac585d2e5
+MD5 (patch-aa) = c385fd7821ae7209ff8c6b73f60829b5
+MD5 (patch-ab) = fff307bd32fb969938366b2731523cd9
 MD5 (patch-ac) = af18863cad9851603b47b604eaffb13c
 MD5 (patch-ad) = 7f4bdb112125a0537a7e101093be8d07
-MD5 (patch-ae) = cb107343b89f8d27624aa8a08a1611f5
+MD5 (patch-ae) = 75b4b34b2882d282cb57c5f0853fe2cf
 MD5 (patch-af) = 0381e9ade01a520a673f6cb2d2a71104
 MD5 (patch-ag) = 0da043e9e17ea708ee15b71d4747ea93
 MD5 (patch-ah) = 77f2d8c0b1bc5cfb088fcc5f4b6420cb
+MD5 (patch-ai) = 03c45f118c746a0acb5fc6b39fcb661e
diff --git a/mail/imap-uw/patches/patch-aa b/mail/imap-uw/patches/patch-aa
index 7ac45dd7349..65fd04f5ea9 100644
--- a/mail/imap-uw/patches/patch-aa
+++ b/mail/imap-uw/patches/patch-aa
@@ -1,7 +1,16 @@
-$NetBSD: patch-aa,v 1.3 1999/02/08 23:31:59 tron Exp $
+$NetBSD: patch-aa,v 1.4 1999/11/25 14:32:43 tron Exp $
 
 --- Makefile.orig	Wed Jan 27 23:40:30 1999
-+++ Makefile	Mon Feb  8 23:50:20 1999
++++ Makefile	Thu Nov 25 15:22:08 1999
+@@ -32,7 +32,7 @@
+ 
+ 
+ # *** TEMPORARY FOR PINE 4.10 BUILD ***
+-GSSDIR=/usr/local
++GSSDIR=$(PREFIX)
+ # *** TEMPORARY FOR PINE 4.10 BUILD ***
+ 
+ # Normal command to build IMAP toolkit:
 @@ -392,7 +392,7 @@
  # *** TEMPORARY FOR PINE 4.10 BUILD ***
  	echo GSSDIR=$(GSSDIR) >> c-client/EXTRASPECIALS
diff --git a/mail/imap-uw/patches/patch-ab b/mail/imap-uw/patches/patch-ab
new file mode 100644
index 00000000000..c5d945e47ac
--- /dev/null
+++ b/mail/imap-uw/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.4 1999/11/25 14:32:43 tron Exp $
+
+--- src/imapd/Makefile.orig	Sat Nov 21 04:26:03 1998
++++ src/imapd/Makefile	Thu Nov 25 15:13:27 1999
+@@ -52,7 +52,7 @@
+ # Get local definitions from c-client directory
+ 
+ C = ../c-client
+-CCLIENTLIB = $C/c-client.a
++CCLIENTLIB = $C/libimapuw.la
+ CC = `cat $C/CCTYPE`
+ CFLAGS = -I$C `cat $C/CFLAGS` $(EXTRACFLAGS) -DANOFILE=\"$(ANO)\" \
+ 	-DALERTFILE=\"$(ALERT)\" -DUSERALERTFILE=\"$(USERALERT)\"
diff --git a/mail/imap-uw/patches/patch-ae b/mail/imap-uw/patches/patch-ae
index 56103de1885..76567661746 100644
--- a/mail/imap-uw/patches/patch-ae
+++ b/mail/imap-uw/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.6 1999/02/08 23:31:59 tron Exp $
+$NetBSD: patch-ae,v 1.7 1999/11/25 14:32:43 tron Exp $
 
 --- src/osdep/unix/Makefile.orig	Wed Jan 27 00:17:39 1999
-+++ src/osdep/unix/Makefile	Tue Feb  9 00:09:04 1999
++++ src/osdep/unix/Makefile	Thu Nov 25 15:08:49 1999
 @@ -95,7 +95,7 @@
  
  # Normally no need to change any of these
@@ -11,13 +11,23 @@ $NetBSD: patch-ae,v 1.6 1999/02/08 23:31:59 tron Exp $
  BINARIES=mail.o misc.o newsrc.o smanager.o osdep.o utf8.o siglocal.o \
   dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
   rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
+@@ -118,7 +118,7 @@
+ # Here if no make argument established
+ 
+ missing: osdep.h
+-	$(MAKE) all CC=`cat CCTYPE` CFLAGS="`cat CFLAGS`" `cat EXTRASPECIALS`
++	$(MAKE) all CC="`cat CCTYPE`" CFLAGS="`cat CFLAGS`" `cat EXTRASPECIALS`
+ 
+ osdep.h:
+ 	@echo You must specify what type of system
 @@ -375,10 +375,11 @@
  
  neb:	# NetBSD
  	$(BUILD) `cat EXTRASPECIALS` OS=bsi \
 +	 CC="$(CC)" \
  	 SPOOLDIR=/var \
- 	 ACTIVEFILE=/var/db/news/active \
+-	 ACTIVEFILE=/var/db/news/active \
++	 ACTIVEFILE=/var/news/db/active \
  	 RSHPATH=/usr/bin/rsh \
 -	 BASECFLAGS="-g -O -pipe -DNFSKLUDGE" \
 +	 BASECFLAGS="-O -pipe -DNFSKLUDGE" \
diff --git a/mail/imap-uw/patches/patch-ai b/mail/imap-uw/patches/patch-ai
new file mode 100644
index 00000000000..aac94c757b8
--- /dev/null
+++ b/mail/imap-uw/patches/patch-ai
@@ -0,0 +1,16 @@
+$NetBSD: patch-ai,v 1.1 1999/11/25 14:32:43 tron Exp $
+
+--- src/mtest/mtest.c.orig	Thu Jan  8 08:40:50 1998
++++ src/mtest/mtest.c	Thu Nov 25 15:17:58 1999
+@@ -52,6 +52,11 @@
+ 
+ /* Excellent reasons to hate ifdefs, and why my real code never uses them */
+ 
++#ifdef __NetBSD__
++#undef unix
++#define unix 1
++#endif
++
+ #ifndef unix
+ # define unix 0
+ #endif