Update to version 4.5.

PR:		10288
Submitted by:	maintainer

4 files changed, 27 insertions, 26 deletions

diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 0943b7a86a1a..d8984b2e3128 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	imap-uw
-# Version required:	4.4
+# Version required:	4.5
 # Date created:		9 Jan 1997
 # Whom:			pst
 #
-# $Id: Makefile,v 1.25 1999/01/13 02:47:30 scrappy Exp $
+# $Id: Makefile,v 1.26 1999/01/21 03:47:42 flathill Exp $
 #
 
-DISTNAME=	imap-4.4
-PKGNAME=	imap-uw-4.4
+DISTNAME=	imap-4.5
+PKGNAME=	imap-uw-4.5
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/old/
+MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	imap-uw@freebsd.ady.ro
@@ -20,7 +20,7 @@ ALL_TARGET=	bsf
 MAN8=		ipopd.8 imapd.8
 
 SHLIBBASE=	c-client4
-SHLIBMAJ=	4
+SHLIBMAJ=	5
 SHLIBNAME=	lib${SHLIBBASE}.so.${SHLIBMAJ}
 MAKE_ENV=	SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE}
 PLIST_SUB=	SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE}
diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo
index ed8849c59fa2..60e3e3193c4a 100644
--- a/mail/imap-uw/distinfo
+++ b/mail/imap-uw/distinfo
@@ -1,2 +1,2 @@
-MD5 (imap-4.4.tar.Z) = 89b1cc8031c4a12da102fb1bc9f842c9
-SIZE (imap-4.4.tar.Z) =  1656459
+MD5 (imap-4.5.tar.Z) = 24e5ff01e0f14ecc647f10a9148a9dbd
+SIZE (imap-4.5.tar.Z) =  1656569
diff --git a/mail/imap-uw/files/patch-ab b/mail/imap-uw/files/patch-ab
index b174a8355cd2..a04ad8a29ecb 100644
--- a/mail/imap-uw/files/patch-ab
+++ b/mail/imap-uw/files/patch-ab
@@ -1,6 +1,6 @@
---- src/osdep/unix/Makefile.orig	Wed Sep  9 00:02:26 1998
-+++ src/osdep/unix/Makefile	Thu Nov 19 14:00:02 1998
-@@ -93,7 +93,7 @@
+--- src/osdep/unix/Makefile.orig	Wed Jan 27 01:17:39 1999
++++ src/osdep/unix/Makefile	Sat Feb 27 17:16:00 1999
+@@ -100,7 +100,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
@@ -9,9 +9,9 @@
  MAKE=make
  MV=mv
  RM=rm -rf
-@@ -108,6 +108,10 @@
-  PASSWDTYPE=$(PASSWDTYPE) AFSDIR=$(AFSDIR) GSSDIR=$(GSSDIR)
- BUILD=$(MAKE) build $(BUILDOPTIONS) $(EXTRASPECIALS)
+@@ -115,6 +115,10 @@
+  PASSWDTYPE=$(PASSWDTYPE)
+ BUILD=$(MAKE) build $(BUILDOPTIONS)
  
 +# Need this for the shared library rule to work correctly
 +.SUFFIXES: .o .so
@@ -20,7 +20,7 @@
  # Here if no make argument established
  
  missing: osdep.h
-@@ -183,7 +187,7 @@
+@@ -190,7 +194,7 @@
  	 SPOOLDIR=/var \
  	 ACTIVEFILE=/usr/local/news/lib/active \
  	 RSHPATH=/usr/bin/rsh \
@@ -29,7 +29,7 @@
  	 BASELDFLAGS="-lcrypt"
  
  bsi:	# BSD/i386
-@@ -565,19 +569,31 @@
+@@ -606,19 +610,31 @@
  
  # Build it!
  
@@ -63,7 +63,7 @@
  
  
  # Dependencies
-@@ -611,7 +627,7 @@
+@@ -652,7 +668,7 @@
  
  # OS-dependent
  
@@ -72,7 +72,7 @@
  	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 flockbsd.c flcksafe.c fsync.c gethstid.c \
-@@ -623,7 +639,12 @@
+@@ -664,7 +680,12 @@
  	write.c \
  	strerror.c strpbrk.c strstr.c strtok.c strtoul.c \
  	OSCFLAGS
@@ -84,4 +84,4 @@
 +	$(CC) -fpic -DPIC -c $(CFLAGS) `cat OSCFLAGS` osdep.c -o $@
  
  osdep.c: osdepbas.c osdepckp.c osdeplog.c
- 	sh -c '$(RM) osdep.c || true'
+ 	cat osdepbas.c osdepckp.c osdeplog.c > osdep.c
diff --git a/mail/imap-uw/files/patch-ac b/mail/imap-uw/files/patch-ac
index 20d966020d0e..9d324e6b5e40 100644
--- a/mail/imap-uw/files/patch-ac
+++ b/mail/imap-uw/files/patch-ac
@@ -1,20 +1,21 @@
---- src/imapd/Makefile.orig	Wed Apr 15 01:41:45 1998
-+++ src/imapd/Makefile	Sat Oct 10 21:47:24 1998
-@@ -31,8 +31,8 @@
+--- src/imapd/Makefile.orig	Sat Nov 21 05:26:03 1998
++++ src/imapd/Makefile	Sat Feb 27 17:19:33 1999
+@@ -31,9 +31,9 @@
  # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  
  
 -ALERT=/etc/imapd.alert
--ANO=/etc/anonymous.newsgroups
 +ALERT=$(PREFIX)/etc/imapd.alert
+ USERALERT=.imapalert
+-ANO=/etc/anonymous.newsgroups
 +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 @@
+@@ -56,7 +56,7 @@
  CC = `cat $C/CCTYPE`
- CFLAGS = -I$C `cat $C/CFLAGS` -DALERTFILE=\"$(ALERT)\" -DANOFILE=\"$(ANO)\" \
- 	$(EXTRACFLAGS)
+ CFLAGS = -I$C `cat $C/CFLAGS` $(EXTRACFLAGS) -DANOFILE=\"$(ANO)\" \
+ 	-DALERTFILE=\"$(ALERT)\" -DUSERALERTFILE=\"$(USERALERT)\"
 -LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
 +LDFLAGS = -L$C -l$(SHLIBBASE) `cat $C/LDFLAGS`