1 files changed, 21 insertions, 38 deletions
diff --git a/mail/ml/files/patch-aa b/mail/ml/files/patch-aa
index f3cf396f834a..1b9178ffd035 100644
--- a/mail/ml/files/patch-aa
+++ b/mail/ml/files/patch-aa
@@ -1,38 +1,21 @@
-*** ../imap-4/src/osdep/unix/Makefile.orig	Sun Mar 15 18:36:06 1998
---- ../imap-4/src/osdep/unix/Makefile	Sun Mar 15 18:37:26 1998
-***************
-*** 39,46 ****
-  	dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
-  	rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
-  	bezerk.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
-! CC=cc
-! CFLAGS=$(EXTRACFLAGS)
-  EXTRADRIVERS=mbox
-  DEFAULTDRIVERS=imap nntp pop3 mh mx mbx tenex mtx mmdf bezerk news phile dummy
-  LN=ln -s
---- 39,46 ----
-  	dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
-  	rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
-  	bezerk.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
-! #CC=cc
-! #CFLAGS+=$(EXTRACFLAGS)
-  EXTRADRIVERS=mbox
-  DEFAULTDRIVERS=imap nntp pop3 mh mx mbx tenex mtx mmdf bezerk news phile dummy
-  LN=ln -s
-***************
-*** 122,128 ****
-  		STDPROTO=bezerkproto MAILSPOOL=/var/mail \
-  		ACTIVEFILE=/usr/local/news/lib/active NEWSSPOOL=/var/news \
-  		RSHPATH=/usr/bin/rsh \
-! 		CFLAGS="-g -O -pipe -DNFSKLUDGE $(EXTRACFLAGS)" \
-  		LDFLAGS="-lcrypt"
-  
-  bsi:	sigbsd	# BSD/i386
---- 122,128 ----
-  		STDPROTO=bezerkproto MAILSPOOL=/var/mail \
-  		ACTIVEFILE=/usr/local/news/lib/active NEWSSPOOL=/var/news \
-  		RSHPATH=/usr/bin/rsh \
-! 		CFLAGS="${CFLAGS} -DNFSKLUDGE $(EXTRACFLAGS)" \
-  		LDFLAGS="-lcrypt"
-  
-  bsi:	sigbsd	# BSD/i386
+--- ../imap-4/src/osdep/unix/Makefile.orig	Mon Mar 30 17:07:21 1998
++++ ../imap-4/src/osdep/unix/Makefile	Sat Jun 26 02:04:49 1999
+@@ -39,7 +39,7 @@
+ 	netmsg.o rfc822.o nntp.o smtp.o imap4.o pop3.o \
+ 	bezerk.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o
+ EXTRACFLAGS=
+-CFLAGS=$(EXTRACFLAGS)
++#CFLAGS=$(EXTRACFLAGS)
+ EXTRADRIVERS=mbox mbx
+ DEFAULTDRIVERS=imap nntp pop3 mh tenex mtx mmdf bezerk news phile dummy
+ LN=ln -s
+@@ -109,7 +109,8 @@
+ bsi:	# BSD/i386
+ 	$(MAKE) mtest OS=$@ EXTRADRIVERS="$(EXTRADRIVERS)" \
+ 		STDPROTO=bezerkproto \
+-		RSHPATH=/usr/bin/rsh CFLAGS="-g -O -pipe $(EXTRACFLAGS)"
++		RSHPATH=/usr/bin/rsh CFLAGS="$(CFLAGS) $(EXTRACFLAGS)" \
++		LDFLAGS="-lcrypt"
+ 
+ cvx:	# Convex
+ 	$(MAKE) mtest OS=$@ EXTRADRIVERS="$(EXTRADRIVERS)" \