Upgrade to match current again (groan)

5 files changed, 63 insertions, 43 deletions

diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 31a14a03b945..fb50e1d2149e 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 Jan 1997
 # Whom:			pst
 #
-# $Id: Makefile,v 1.6 1997/06/03 06:44:48 asami Exp $
+# $Id: Makefile,v 1.7 1997/06/03 07:05:23 pst Exp $
 #
 
 DISTNAME=	imap-4.1.BETA
@@ -21,9 +21,14 @@ MAN8=		ipopd.8 imapd.8
 pre-build:
 	@chmod 755 ${WRKSRC}/src/osdep/unix/drivers ${WRKSRC}/src/osdep/unix/mkauths
 
+# this rule currently isn't called or used, because it's not sufficient to
+# install just the .a file and mail.h, so we shouldn't install anything at all!
+install-lib:
+	${INSTALL_DATA} ${WRKSRC}/c-clinet/mail.h ${PREFIX}/include
+	${INSTALL_DATA} ${WRKSRC}/c-client/c-client.a ${PREFIX}/lib/libc-client.a
+
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/c-client/libc-client.so.2.1 ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/c-client/c-client.a ${PREFIX}/lib/libc-client.a
 	${LDCONFIG} -m ${PREFIX}/lib
 	${INSTALL_PROGRAM} ${WRKSRC}/imapd/imapd ${PREFIX}/libexec
 	${INSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop2d ${PREFIX}/libexec
@@ -33,5 +38,5 @@ do-install:
 		${WRKSRC}/src/imapd/imapd.8c ${PREFIX}/man/man8/imapd.8
 	${INSTALL_MAN} \
 		${WRKSRC}/src/ipopd/ipopd.8c ${PREFIX}/man/man8/ipopd.8
-	
+
 .include <bsd.port.mk>
diff --git a/mail/imap-uw/files/patch-aa b/mail/imap-uw/files/patch-aa
new file mode 100644
index 000000000000..76bc895d85b4
--- /dev/null
+++ b/mail/imap-uw/files/patch-aa
@@ -0,0 +1,21 @@
+--- src/osdep/unix/os_bsi.h	Sat Oct 19 10:30:04 1996
++++ src/osdep/unix/os_bsi.h	Thu Nov 20 01:01:00 1997
+@@ -37,7 +37,18 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <sys/types.h>
++
++/*
++ * FreeBSD v3.x and onward whines about <sys/dir.h> being obsolete, so switch
++ * to POSIX semantics.
++ */
++#if	__FreeBSD__ >= 3
++#include <dirent.h>
++#define direct dirent
++#else
+ #include <sys/dir.h>
++#endif
++
+ #include <fcntl.h>
+ #include <syslog.h>
+ #include <sys/file.h>
diff --git a/mail/imap-uw/files/patch-ab b/mail/imap-uw/files/patch-ab
index 2e2f40a62e72..90827aa93f56 100644
--- a/mail/imap-uw/files/patch-ab
+++ b/mail/imap-uw/files/patch-ab
@@ -1,5 +1,5 @@
---- src/osdep/unix/Makefile.orig	Fri Oct 24 00:24:19 1997
-+++ src/osdep/unix/Makefile	Mon Nov 17 13:29:00 1997
+--- 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 @@
  
  
@@ -15,10 +15,10 @@
 -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
- LN=ln -s
-@@ -52,6 +54,9 @@
+@@ -54,6 +56,9 @@
  RSHPATH=/usr/ucb/rsh
  SHELL=/bin/sh
  
@@ -28,32 +28,27 @@
  missing: ../OSTYPE CCTYPE
  	$(MAKE) `cat ../OSTYPE` CC=`cat CCTYPE`
  
-@@ -124,13 +129,13 @@
- 		ACTIVEFILE=/usr/lib/news/active NEWSSPOOL=/usr/spool/news \
+@@ -128,11 +133,11 @@
  		CFLAGS="-g -Dconst= -DNFSKLUDGE $(EXTRACFLAGS)"
  
--bsf:	sigpsx	# FreeBSD
--	$(MAKE) $(ARCHIVE) OS=bsi EXTRADRIVERS="$(EXTRADRIVERS)" \
--		STDPROTO=unixproto MAILSPOOL=/var/mail \
-+bsf:	sigbsd	# FreeBSD
-+		$(MAKE) $(ARCHIVE) $(SHLIB) OS=bsi EXTRADRIVERS="$(EXTRADRIVERS)" \
-+		STDPROTO=unixproto MAILSPOOL=/var/mail \
+ 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)" \
--		LDFLAGS="-lcrypt"
-+		CFLAGS="$(CFLAGS) -DNFSKLUDGE $(EXTRACFLAGS)" \
-+		LDFLAGS="-lcrypt"                                 
++		CFLAGS="$(CFLAGS) -DNFSKLUDGE -DIGNORE_LOCK_EACCES_ERRORS $(EXTRACFLAGS)" \
+ 		LDFLAGS="-lcrypt"
  
- bsi:	sigbsd	# BSD/i386
- 	$(MAKE) $(ARCHIVE) OS=$@ EXTRADRIVERS="$(EXTRADRIVERS)" \
-@@ -517,12 +522,19 @@
+ bsi:	# BSD/i386
+@@ -538,12 +544,19 @@
  
  clean:
  	$(RM) *.o linkage.[ch] auths.c $(ARCHIVE) osdep.* CCTYPE CFLAGS LDFLAGS
 +	$(RM) *.so
  
- $(ARCHIVE): $(BINARIES)
+ $(ARCHIVE): $(BINARIES) linkage.c
  	$(RM) $(ARCHIVE)
  	$(ARRC) $(ARCHIVE) $(BINARIES)
  	$(RANLIB) $(ARCHIVE)
@@ -61,36 +56,35 @@
 +$(SHLIB): $(SOFILES)
 +	ld -Bshareable -x -o $(SHLIB) $(SOFILES)
 +
-+.c.so: osdep.h
++.c.so:	osdep.h
 +	$(CC) -fpic -DPIC -c $(CFLAGS) ${@:.so=.c} -o $@
 +
  # Dependencies
  
  dummy.o: mail.h misc.h osdep.h dummy.h
-@@ -572,6 +584,26 @@
- 	-DRSH=\"$(RSH)\" -DRSHPATH=\"$(RSHPATH)\" \
- 	$(EXTRAOSDEFS) -c os_$(OS).c
- 	$(MV) os_$(OS).o osdep.o
+@@ -588,6 +601,25 @@
+ 	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
 +
-+osdep.so: mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
++osdep.so:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
 +	osdep.h env_unix.h tcp_unix.h \
-+	os_$(OS).c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c \
-+	flock.c fsync.c gethstid.c \
++	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 \
-+	log_std.c log_sv4.c \
-+	log_a41.c log_sco.c log_sec.c log_sha.c log_ssn.c log_ult.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) -fpic -DPIC $(CFLAGS) -DSTDPROTO=$(STDPROTO) -DMAILSPOOL=\"$(MAILSPOOL)\" \
-+	-DANONYMOUSHOME=\"$(MAILSPOOL)/anonymous\" \
-+	-DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
-+	-DRSH=\"$(RSH)\" -DRSHPATH=\"$(RSHPATH)\" \
-+	$(EXTRAOSDEFS) -c os_$(OS).c
-+	$(MV) os_$(OS).o osdep.so
- 
- osdep.h: os_$(OS).h linkage
- 	$(RM) CCTYPE CFLAGS LDFLAGS osdep.h
++	$(CC) -o $@ -fPIC -DPIC $(CFLAGS) -DSTDPROTO=$(STDPROTO) -DMAILSPOOL=\"$(MAILSPOOL)\" \
+ 	-DANONYMOUSHOME=\"$(MAILSPOOL)/anonymous\" \
+ 	-DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
+ 	-DRSH=\"$(RSH)\" -DRSHPATH=\"$(RSHPATH)\" \
diff --git a/mail/imap-uw/pkg-comment b/mail/imap-uw/pkg-comment
index 823eead16768..6e18efcd21cf 100644
--- a/mail/imap-uw/pkg-comment
+++ b/mail/imap-uw/pkg-comment
@@ -1 +1 @@
-University of Washington IMAP v4 server (and POP2/POP3 compatible servers)
+University of Washington IMAPv4.1/POP2/POP3 mail servers
diff --git a/mail/imap-uw/pkg-plist b/mail/imap-uw/pkg-plist
index cd84be27b51c..4fa2f091bec3 100644
--- a/mail/imap-uw/pkg-plist
+++ b/mail/imap-uw/pkg-plist
@@ -1,6 +1,6 @@
 lib/libc-client.so.2.1
-lib/libc-client.a
 @exec /sbin/ldconfig -m %B
+@unexec /sbin/ldconfig -m %B
 libexec/imapd
 libexec/ipop2d
 libexec/ipop3d