Update "imap-uw" package to version 4.5:

imap-4.5 is a maintenace update, with minor bugfixes to imap-4.4 and
optional support for CRAM-MD5.

5 files changed, 32 insertions, 32 deletions

diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 9b4866d69c2..e5bf7ed2def 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 1998/11/22 22:59:24 tv Exp $
+# $NetBSD: Makefile,v 1.8 1999/02/08 23:31:59 tron 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/
 EXTRACT_SUFX=	.tar.Z
@@ -14,7 +14,7 @@ USE_LIBTOOL=	yes
 
 INST_PROG=	${LIBTOOL} ${INSTALL_PROGRAM}
 INST_LIB=	${LIBTOOL} ${INSTALL_DATA}
-CONFLICTS=	imap-uw-4.1 imap-uw-4.2
+CONFLICTS=	imap-uw-*
 
 MESSAGE_FILE=	${WRKDIR}/.MESSAGE
 
@@ -27,14 +27,14 @@ do-build:
 	cd ${WRKSRC} && ${MAKE} neb PREFIX=${PREFIX} CC="${LIBTOOL} ${CC}"
 
 do-install:
-	${INST_LIB} ${WRKSRC}/c-client/libimapuw.la ${PREFIX}/lib/
+	${INST_LIB} ${WRKSRC}/c-client/libimapuw.la ${PREFIX}/lib
 	@${RM} -f ${PREFIX}/lib/libimapuw.a
-	${INST_PROG} ${WRKSRC}/imapd/imapd ${PREFIX}/libexec/
-	${INST_PROG} ${WRKSRC}/ipopd/ipop2d ${PREFIX}/libexec/
-	${INST_PROG} ${WRKSRC}/ipopd/ipop3d ${PREFIX}/libexec/
-	${INST_PROG} ${WRKSRC}/mtest/mtest ${PREFIX}/sbin/
-	${INSTALL_MAN} ${WRKSRC}/imapd.8 ${PREFIX}/man/man8/
-	${INSTALL_MAN} ${WRKSRC}/ipopd.8 ${PREFIX}/man/man8/
+	${INST_PROG} ${WRKSRC}/imapd/imapd ${PREFIX}/libexec
+	${INST_PROG} ${WRKSRC}/ipopd/ipop2d ${PREFIX}/libexec
+	${INST_PROG} ${WRKSRC}/ipopd/ipop3d ${PREFIX}/libexec
+	${INST_PROG} ${WRKSRC}/mtest/mtest ${PREFIX}/sbin
+	${INSTALL_MAN} ${WRKSRC}/imapd.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/ipopd.8 ${PREFIX}/man/man8
 	${LN} -sf ipopd.8 ${PREFIX}/man/man8/ipop2d.8
 	${LN} -sf ipopd.8 ${PREFIX}/man/man8/ipop3d.8
 
diff --git a/mail/imap-uw/files/md5 b/mail/imap-uw/files/md5
index 72e78f53cea..a944562cbc6 100644
--- a/mail/imap-uw/files/md5
+++ b/mail/imap-uw/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 1998/11/22 22:59:25 tv Exp $
+$NetBSD: md5,v 1.5 1999/02/08 23:31:59 tron Exp $
 
-MD5 (imap-4.4.tar.Z) = 89b1cc8031c4a12da102fb1bc9f842c9
+MD5 (imap-4.5.tar.Z) = 24e5ff01e0f14ecc647f10a9148a9dbd
diff --git a/mail/imap-uw/patches/patch-aa b/mail/imap-uw/patches/patch-aa
index c28b41b446f..7ac45dd7349 100644
--- a/mail/imap-uw/patches/patch-aa
+++ b/mail/imap-uw/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 11:09:37 agc Exp $
+$NetBSD: patch-aa,v 1.3 1999/02/08 23:31:59 tron Exp $
 
---- Makefile.orig	Sun Jul 19 10:52:40 1998
-+++ Makefile	Sun Jul 19 10:53:08 1998
-@@ -260,7 +260,7 @@
- OSTYPE:
- 	@echo Building c-client for $(OS)...
- 	$(CD) c-client;$(MAKE) $(OS) BUILDOPTIONS='$(BUILDOPTIONS)' \
--	 EXTRASPECIALS="$(EXTRASPECIALS)"
-+	 EXTRASPECIALS="$(EXTRASPECIALS)" PREFIX=$(PREFIX) CC="$(CC)"
+--- Makefile.orig	Wed Jan 27 23:40:30 1999
++++ Makefile	Mon Feb  8 23:50:20 1999
+@@ -392,7 +392,7 @@
+ # *** TEMPORARY FOR PINE 4.10 BUILD ***
+ 	echo GSSDIR=$(GSSDIR) >> c-client/EXTRASPECIALS
+ # *** TEMPORARY FOR PINE 4.10 BUILD ***
+-	$(CD) c-client;$(MAKE) $(OS) BUILDOPTIONS='$(BUILDOPTIONS)' $(EXTRASPECIALS)
++	$(CD) c-client;$(MAKE) $(OS) BUILDOPTIONS='$(BUILDOPTIONS)' $(EXTRASPECIALS) PREFIX=$(PREFIX) CC="$(CC)"
  	echo $(OS) > OSTYPE
  	$(TOUCH) rebuild
  
diff --git a/mail/imap-uw/patches/patch-ae b/mail/imap-uw/patches/patch-ae
index 8e3ea4c0c74..56103de1885 100644
--- a/mail/imap-uw/patches/patch-ae
+++ b/mail/imap-uw/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.5 1998/11/22 22:59:25 tv Exp $
+$NetBSD: patch-ae,v 1.6 1999/02/08 23:31:59 tron Exp $
 
---- src/osdep/unix/Makefile.orig	Thu Jul 16 21:12:22 1998
-+++ src/osdep/unix/Makefile	Tue Aug  4 22:23:05 1998
-@@ -88,7 +88,7 @@
+--- src/osdep/unix/Makefile.orig	Wed Jan 27 00:17:39 1999
++++ src/osdep/unix/Makefile	Tue Feb  9 00:09:04 1999
+@@ -95,7 +95,7 @@
  
  # Normally no need to change any of these
  
@@ -11,10 +11,10 @@ $NetBSD: patch-ae,v 1.5 1998/11/22 22:59:25 tv Exp $
  BINARIES=mail.o misc.o newsrc.o smanager.o osdep.o utf8.o siglocal.o \
   dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
   rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
-@@ -342,10 +342,11 @@
+@@ -375,10 +375,11 @@
  
  neb:	# NetBSD
- 	$(BUILD) OS=bsi \
+ 	$(BUILD) `cat EXTRASPECIALS` OS=bsi \
 +	 CC="$(CC)" \
  	 SPOOLDIR=/var \
  	 ACTIVEFILE=/var/db/news/active \
@@ -24,14 +24,14 @@ $NetBSD: patch-ae,v 1.5 1998/11/22 22:59:25 tv Exp $
  	 BASELDFLAGS="-lcrypt"
  
  nxt:	# NEXTSTEP
-@@ -562,8 +563,8 @@
+@@ -612,8 +613,8 @@
  
  $(ARCHIVE): $(BINARIES)
  	sh -c '$(RM) $(ARCHIVE) || true'
 -	@cat ARCHIVE
 -	@$(SH) ARCHIVE
 +	$(CC) -o $(ARCHIVE) $(BINARIES:.o=.lo) -rpath $(PREFIX)/lib \
-+		-version-info 2:0
++		-version-info 3:0
  
  # Cleanup
  
diff --git a/mail/imap-uw/pkg/PLIST b/mail/imap-uw/pkg/PLIST
index 457ea89e511..cfeb1f982b1 100644
--- a/mail/imap-uw/pkg/PLIST
+++ b/mail/imap-uw/pkg/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 1998/11/22 22:59:25 tv Exp $
-lib/libimapuw.so.2.0
+@comment $NetBSD: PLIST,v 1.4 1999/02/08 23:31:59 tron Exp $
+lib/libimapuw.so.3.0
 libexec/imapd
 libexec/ipop2d
 libexec/ipop3d