make patch-ab work again.

Don´t know, why this worked at home on my -current system.
This is now tested on a -stable system ...

mail/imap-uw/files/patch-ab

@@ -1,8 +1,6 @@
-*** src/osdep/unix/Makefile.orig	Sat Nov 15 15:24:31 1997
+--- src/osdep/unix/Makefile.orig	Fri Oct 24 00:24:19 1997
---- src/osdep/unix/Makefile	Sat Nov 15 15:32:23 1997
++++ src/osdep/unix/Makefile	Mon Nov 17 13:29:00 1997
-***************
+@@ -32,6 +32,7 @@
-*** 32,37 ****
---- 32,38 ----
  
  
  ARCHIVE=c-client.a
@@ -10,66 +8,46 @@
  ARRC=ar rc
  EXTRAAUTHENTICATORS=
  DEFAULTAUTHENTICATORS=log
-***************
+@@ -40,7 +41,8 @@
-*** 40,46 ****
  	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
+ 	unix.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
  CC=cc
-! CFLAGS=$(EXTRACFLAGS)
+-CFLAGS=$(EXTRACFLAGS)
++SOFILES=${BINARIES:.o=.so}
++CFLAGS+=$(EXTRACFLAGS)
  EXTRADRIVERS=mbox
-  DEFAULTDRIVERS=imap nntp pop3 mh mx mbx tenex mtx mmdf bezerk news phile dummy
+ DEFAULTDRIVERS=imap nntp pop3 mh mx mbx tenex mtx mmdf unix news phile dummy
  LN=ln -s
---- 41,48 ----
+@@ -52,6 +54,9 @@
-  	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
-! SOFILES=${BINARIES:.o=.so}
-! CFLAGS+=$(EXTRACFLAGS)
-  EXTRADRIVERS=mbox
-  DEFAULTDRIVERS=imap nntp pop3 mh mx mbx tenex mtx mmdf bezerk news phile dummy
-  LN=ln -s
-***************
-*** 52,57 ****
---- 54,62 ----
  RSHPATH=/usr/ucb/rsh
  SHELL=/bin/sh
  
 +# Need this for the shared library rule to work correctly
 +.SUFFIXES: .o .so
 +
-  missing:
+ missing: ../OSTYPE CCTYPE
-  	@echo "You must specify what type of system"
+ 	$(MAKE) `cat ../OSTYPE` CC=`cat CCTYPE`
-  	@false
+ 
-***************
+@@ -124,13 +129,13 @@
-*** 117,128 ****
  		ACTIVEFILE=/usr/lib/news/active NEWSSPOOL=/usr/spool/news \
  		CFLAGS="-g -Dconst= -DNFSKLUDGE $(EXTRACFLAGS)"
  
-! bsf:	sigpsx	# FreeBSD
+-bsf:	sigpsx	# FreeBSD
-! 	$(MAKE) $(ARCHIVE) OS=bsi EXTRADRIVERS="$(EXTRADRIVERS)" \
+-	$(MAKE) $(ARCHIVE) OS=bsi EXTRADRIVERS="$(EXTRADRIVERS)" \
-  		STDPROTO=bezerkproto MAILSPOOL=/var/mail \
+-		STDPROTO=unixproto MAILSPOOL=/var/mail \
++bsf:	sigbsd	# FreeBSD
++		$(MAKE) $(ARCHIVE) $(SHLIB) OS=bsi EXTRADRIVERS="$(EXTRADRIVERS)" \
++		STDPROTO=bezerkproto MAILSPOOL=/var/mail \
  		ACTIVEFILE=/usr/local/news/lib/active NEWSSPOOL=/var/news \
  		RSHPATH=/usr/bin/rsh \
-! 		CFLAGS="-g -O -pipe -DNFSKLUDGE $(EXTRACFLAGS)" \
+-		CFLAGS="-g -O -pipe -DNFSKLUDGE $(EXTRACFLAGS)" \
-  		LDFLAGS="-lcrypt"
+-		LDFLAGS="-lcrypt"
++		CFLAGS="$(CFLAGS) -DNFSKLUDGE $(EXTRACFLAGS)" \
++		LDFLAGS="-lcrypt"                                 
  
  bsi:	sigbsd	# BSD/i386
---- 122,133 ----
+ 	$(MAKE) $(ARCHIVE) OS=$@ EXTRADRIVERS="$(EXTRADRIVERS)" \
-  		ACTIVEFILE=/usr/lib/news/active NEWSSPOOL=/usr/spool/news \
+@@ -517,12 +522,19 @@
-  		CFLAGS="-g -Dconst= -DNFSKLUDGE $(EXTRACFLAGS)"
-  
-! bsf:	sigbsd	# FreeBSD
-! 	$(MAKE) $(ARCHIVE) $(SHLIB) OS=bsi EXTRADRIVERS="$(EXTRADRIVERS)" \
-  		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
-***************
-*** 457,468 ****
---- 462,480 ----
  
  clean:
  	$(RM) *.o linkage.[ch] auths.c $(ARCHIVE) osdep.* CCTYPE CFLAGS LDFLAGS
@@ -88,10 +66,8 @@
 +
  # Dependencies
  
-  bezerk.o: mail.h misc.h osdep.h bezerk.h pseudo.h dummy.h
+ dummy.o: mail.h misc.h osdep.h dummy.h
-***************
+@@ -572,6 +584,26 @@
-*** 511,516 ****
---- 523,548 ----
  	-DRSH=\"$(RSH)\" -DRSHPATH=\"$(RSHPATH)\" \
  	$(EXTRAOSDEFS) -c os_$(OS).c
  	$(MV) os_$(OS).o osdep.o