Make this port compile again with changed source files.

This port needs to be converted to getting source files from a more
stable cache at FreeBSD, Inc. but I don't recall how to do it, so I
just did the annoying bits of making this damn thing compile again.

3 files changed, 97 insertions, 142 deletions

diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo
index 6ad9f980e0f5..0e2f65d1071b 100644
--- a/mail/imap-uw/distinfo
+++ b/mail/imap-uw/distinfo
@@ -1 +1 @@
-MD5 (imap-4.1.BETA.tar.Z) = 994efbc1121e55d45d469e4b33a61ad4
+MD5 (imap-4.1.BETA.tar.Z) = 6d6f4cf55ea960de0716d4743e603ad8
diff --git a/mail/imap-uw/files/patch-ab b/mail/imap-uw/files/patch-ab
index 90827aa93f56..4b4aeaa29dc9 100644
--- a/mail/imap-uw/files/patch-ab
+++ b/mail/imap-uw/files/patch-ab
@@ -1,55 +1,41 @@
 --- src/osdep/unix/Makefile.orig	Thu Dec  4 17:54:13 1997
 +++ src/osdep/unix/Makefile	Sat Dec  6 16:30:32 1997
-@@ -32,6 +32,7 @@
+@@ -94,7 +94,7 @@
+  dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
+  rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
+  unix.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
+-CFLAGS=$(BASECFLAGS) $(EXTRACFLAGS)
++CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)
+ MAKE=make
+ MV=mv
  
- 
- ARCHIVE=c-client.a
-+SHLIB=libc-client.so.2.1
- ARRC=ar rc
- EXTRAAUTHENTICATORS=
- DEFAULTAUTHENTICATORS=log
-@@ -40,7 +41,8 @@
- 	rfc822.o nntp.o smtp.o imap4r1.o pop3.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)
-+SOFILES=${BINARIES:.o=.so}
-+CFLAGS+=$(EXTRACFLAGS)
- CHECKPW=std
- EXTRADRIVERS=mbox
- DEFAULTDRIVERS=imap nntp pop3 mh mx mbx tenex mtx mmdf unix news phile dummy
-@@ -54,6 +56,9 @@
- RSHPATH=/usr/ucb/rsh
- SHELL=/bin/sh
+@@ -107,6 +107,11 @@
+  PASSWDTYPE=$(PASSWDTYPE) AFSDIR=$(AFSDIR) GSSDIR=$(GSSDIR)
+ BUILD=$(MAKE) build $(BUILDOPTIONS) $(EXTRASPECIALS)
  
 +# Need this for the shared library rule to work correctly
 +.SUFFIXES: .o .so
++SHLIB=libc-client.so.2.1
++SOFILES=${BINARIES:.o=.so}
 +
- missing: ../OSTYPE CCTYPE
- 	$(MAKE) `cat ../OSTYPE` CC=`cat CCTYPE`
+ # Here if no make argument established
  
-@@ -128,11 +133,11 @@
- 		CFLAGS="-g -Dconst= -DNFSKLUDGE $(EXTRACFLAGS)"
+ missing: osdep.h
+@@ -178,11 +183,11 @@
+ 	 BASECFLAGS="-g -Dconst= -DNFSKLUDGE"
  
  bsf:	# FreeBSD
--	$(MAKE) $(ARCHIVE) OS=bsi EXTRADRIVERS="$(EXTRADRIVERS)" SIGTYPE=psx \
-+	$(MAKE) $(ARCHIVE) $(SHLIB) OS=bsi EXTRADRIVERS="$(EXTRADRIVERS)" SIGTYPE=psx \
- 		STDPROTO=unixproto MAILSPOOL=/var/mail \
- 		ACTIVEFILE=/usr/local/news/lib/active NEWSSPOOL=/var/news \
- 		RSHPATH=/usr/bin/rsh \
--		CFLAGS="-g -O -pipe -DNFSKLUDGE $(EXTRACFLAGS)" \
-+		CFLAGS="$(CFLAGS) -DNFSKLUDGE -DIGNORE_LOCK_EACCES_ERRORS $(EXTRACFLAGS)" \
- 		LDFLAGS="-lcrypt"
+-	$(BUILD) OS=bsi SIGTYPE=psx \
++	$(BUILD) $(SHLIB) OS=bsi SIGTYPE=psx \
+ 	 SPOOLDIR=/var \
+ 	 ACTIVEFILE=/usr/local/news/lib/active \
+ 	 RSHPATH=/usr/bin/rsh \
+-	 BASECFLAGS="-g -O -pipe -DNFSKLUDGE" \
++	 BASECFLAGS="-DNFSKLUDGE -DIGNORE_LOCK_EACCES_ERRORS" \
+ 	 BASELDFLAGS="-lcrypt"
  
  bsi:	# BSD/i386
-@@ -538,12 +544,19 @@
- 
- clean:
- 	$(RM) *.o linkage.[ch] auths.c $(ARCHIVE) osdep.* CCTYPE CFLAGS LDFLAGS
-+	$(RM) *.so
- 
- $(ARCHIVE): $(BINARIES) linkage.c
- 	$(RM) $(ARCHIVE)
+@@ -553,10 +558,17 @@
  	$(ARRC) $(ARCHIVE) $(BINARIES)
  	$(RANLIB) $(ARCHIVE)
  
@@ -59,32 +45,33 @@
 +.c.so:	osdep.h
 +	$(CC) -fpic -DPIC -c $(CFLAGS) ${@:.so=.c} -o $@
 +
+ # Cleanup
+ 
+ clean:
+ 	$(RM) *.o linkage.[ch] auths.c $(ARCHIVE) osdep.* *TYPE *FLAGS
++	$(RM) *.so $(SHLIB)
+ 
+ 
  # Dependencies
+@@ -590,7 +602,7 @@
  
- dummy.o: mail.h misc.h osdep.h dummy.h
-@@ -588,6 +601,25 @@
+ # OS-dependent
+ 
+-osdep.o:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
++OSDEPS= mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
+ 	osdep.h env_unix.h tcp_unix.h \
+ 	osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c \
+ 	auths.c flock.c fsync.c gethstid.c \
+@@ -602,7 +614,12 @@
  	write.c \
- 	strerror.c strpbrk.c strstr.c strtok.c strtoul.c
- 	$(CC) $(CFLAGS) -DSTDPROTO=$(STDPROTO) -DMAILSPOOL=\"$(MAILSPOOL)\" \
-+	-DANONYMOUSHOME=\"$(MAILSPOOL)/anonymous\" \
-+	-DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
-+	-DRSH=\"$(RSH)\" -DRSHPATH=\"$(RSHPATH)\" \
-+	$(EXTRAOSDEFS) -c osdep.c
+ 	strerror.c strpbrk.c strstr.c strtok.c strtoul.c \
+ 	OSCFLAGS
++
++osdep.o: $(OSDEPS)
+ 	$(CC) $(CFLAGS) `cat OSCFLAGS` -c osdep.c
 +
-+osdep.so:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
-+	osdep.h env_unix.h tcp_unix.h \
-+	osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c \
-+	auths.c flock.c fsync.c gethstid.c \
-+	gr_wait.c gr_wait4.c gr_waitp.c \
-+	auth_krb.c auth_log.c \
-+	ckp_a41.c ckp_dce.c ckp_krb.c ckp_os4.c ckp_sec.c ckp_ssn.c ckp_std.c \
-+	ckp_sv4.c ckp_ult.c log_os4.c log_sec.c log_std.c log_sv4.c \
-+	scandir.c setpgrp.c strerror.c truncate.c write.c \
-+	memmove.c memmove2.c memset.c \
-+	tz_bsd.c tz_nul.c tz_sv4.c \
-+	write.c \
-+	strerror.c strpbrk.c strstr.c strtok.c strtoul.c
-+	$(CC) -o $@ -fPIC -DPIC $(CFLAGS) -DSTDPROTO=$(STDPROTO) -DMAILSPOOL=\"$(MAILSPOOL)\" \
- 	-DANONYMOUSHOME=\"$(MAILSPOOL)/anonymous\" \
- 	-DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
- 	-DRSH=\"$(RSH)\" -DRSHPATH=\"$(RSHPATH)\" \
++osdep.so: $(OSDEPS)
++	$(CC) $(CFLAGS) `cat OSCFLAGS` -c osdep.c -o $@ -fpic -DPIC
+ 
+ osdep.c: osdepbas.c osdepckp.c osdeplog.c
+ 	$(RM) osdep.c
diff --git a/mail/imap-uw/files/patch-ac b/mail/imap-uw/files/patch-ac
index 3e6d27741a8f..0b549e76eea2 100644
--- a/mail/imap-uw/files/patch-ac
+++ b/mail/imap-uw/files/patch-ac
@@ -1,76 +1,44 @@
-*** src/imapd/Makefile.bak	Fri Mar 15 00:16:22 1996
---- src/imapd/Makefile	Sun Jan 12 18:25:27 1997
-***************
-*** 31,38 ****
-  # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-  
-  
-! ALERT=/etc/imapd.alert
-! ANO=/etc/anonymous.newsgroups
-  C = ../c-client
-  CCLIENTLIB = $C/c-client.a
-  SHELL= /bin/sh
---- 31,38 ----
-  # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-  
-  
-! ALERT=$(PREFIX)/etc/imapd.alert
-! ANO=$(PREFIX)/etc/anonymous.newsgroups
-  C = ../c-client
-  CCLIENTLIB = $C/c-client.a
-  SHELL= /bin/sh
-***************
-*** 41,47 ****
-  
-  CC = `cat $C/CCTYPE`
-  CFLAGS = -I$C `cat $C/CFLAGS` -DALERTFILE=\"$(ALERT)\" -DANOFILE=\"$(ANO)\"
-! LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
-  
-  imapd: $(CCLIENTLIB) imapd.o
-  	$(CC) $(CFLAGS) -o imapd imapd.o $(LDFLAGS)
---- 41,47 ----
-  
-  CC = `cat $C/CCTYPE`
-  CFLAGS = -I$C `cat $C/CFLAGS` -DALERTFILE=\"$(ALERT)\" -DANOFILE=\"$(ANO)\"
-! LDFLAGS = -L$C -lc-client `cat $C/LDFLAGS`
-  
-  imapd: $(CCLIENTLIB) imapd.o
-  	$(CC) $(CFLAGS) -o imapd imapd.o $(LDFLAGS)
-*** src/ipopd/Makefile.bak	Fri Mar 15 00:18:17 1996
---- src/ipopd/Makefile	Sun Jan 12 18:24:06 1997
-***************
-*** 39,45 ****
-  
-  CC = `cat $C/CCTYPE`
-  CFLAGS = -I$C `cat $C/CFLAGS`
-! LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
-  
-  ipopd: ipop2d ipop3d
-  
---- 39,45 ----
-  
-  CC = `cat $C/CCTYPE`
-  CFLAGS = -I$C `cat $C/CFLAGS`
-! LDFLAGS = -L$C -lc-client `cat $C/LDFLAGS`
-  
-  ipopd: ipop2d ipop3d
-  
-*** src/mtest/Makefile.bak	Fri Mar 15 00:18:42 1996
---- src/mtest/Makefile	Sun Jan 12 18:26:14 1997
-***************
-*** 39,45 ****
-  
-  CC = `cat $C/CCTYPE`
-  CFLAGS = -I$C `cat $C/CFLAGS`
-! LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
-  
-  mtest: $(CCLIENTLIB) mtest.o
-  	$(CC) $(CFLAGS) -o mtest mtest.o $(LDFLAGS)
---- 39,45 ----
-  
-  CC = `cat $C/CCTYPE`
-  CFLAGS = -I$C `cat $C/CFLAGS`
-! LDFLAGS = -L$C -lc-client `cat $C/LDFLAGS`
-  
-  mtest: $(CCLIENTLIB) mtest.o
-  	$(CC) $(CFLAGS) -o mtest mtest.o $(LDFLAGS)
+--- src/imapd/Makefile.ORIG	Thu Jan 22 15:42:52 1998
++++ src/imapd/Makefile	Sun Feb 22 20:59:41 1998
+@@ -31,8 +31,8 @@
+ # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ 
+ 
+-ALERT=/etc/imapd.alert
+-ANO=/etc/anonymous.newsgroups
++ALERT=$(PREFIX)/etc/imapd.alert
++ANO=$(PREFIX)/etc/anonymous.newsgroups
+ SHELL= /bin/sh
+ 
+ #  The "Manage Mail" menu item of Netscape Messager puts up an error message
+@@ -55,7 +55,7 @@
+ CC = `cat $C/CCTYPE`
+ CFLAGS = -I$C `cat $C/CFLAGS` -DALERTFILE=\"$(ALERT)\" -DANOFILE=\"$(ANO)\" \
+ 	$(EXTRACFLAGS)
+-LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
++LDFLAGS = -L$C -lc-client `cat $C/LDFLAGS`
+ 
+ all:	imapd
+ 
+--- src/ipopd/Makefile.ORIG	Thu Mar 14 13:18:17 1996
++++ src/ipopd/Makefile	Sun Feb 22 20:58:29 1998
+@@ -39,7 +39,7 @@
+ 
+ CC = `cat $C/CCTYPE`
+ CFLAGS = -I$C `cat $C/CFLAGS`
+-LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
++LDFLAGS = -L$C -lc-client `cat $C/LDFLAGS`
+ 
+ ipopd: ipop2d ipop3d
+ 
+--- src/mtest/Makefile.ORIG	Thu Jan 22 15:41:45 1998
++++ src/mtest/Makefile	Sun Feb 22 20:58:56 1998
+@@ -39,7 +39,7 @@
+ 
+ CC = `cat $C/CCTYPE`
+ CFLAGS = -I$C `cat $C/CFLAGS`
+-LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
++LDFLAGS = -L$C -lc-client `cat $C/LDFLAGS`
+ 
+ all:	mtest
+