From 09f1b1cd886e4edae5605a1bc318b51999e9c944 Mon Sep 17 00:00:00 2001
From: jakob <jakob@openbsd.org>
Date: Mon, 1 Jan 2007 21:25:20 +0000
Subject: [PATCH] imapd release 2006d

---
 mail/imap-uw/Makefile               | 10 ++++++----
 mail/imap-uw/distinfo               |  8 ++++----
 mail/imap-uw/patches/patch-Makefile | 11 +----------
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 6f8dc6d3930..82016858cbe 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.50 2006/12/02 10:35:56 jakob Exp $
+# $OpenBSD: Makefile,v 1.51 2007/01/01 21:25:20 jakob Exp $
 
 COMMENT-server=		"University of Washington IMAP4rev1/POP2/POP3 mail servers"
 COMMENT-mailutil=	"University of Washington IMAP4rev1/POP2/POP3 mail utility"
 
-VERSION=		2006c1
-DISTNAME=		imap-2006c1
+VERSION=		2006d
+DISTNAME=		imap-2006d
 
 PKGNAME-server=		imap-uw-${VERSION}
 PKGNAME-mailutil=	mailutil-uw-${VERSION}
@@ -17,7 +17,9 @@ HOMEPAGE=	http://www.washington.edu/imap/
 MAINTAINER=     Jakob Schlyter <jakob@openbsd.org>
 
 MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/ \
-		ftp://ftp.sunet.se/pub/unix/mail/imap/
+		ftp://ftp.cac.washington.edu/imap/old/ \
+		ftp://ftp.sunet.se/pub/unix/mail/imap/ \
+		ftp://ftp.sunet.se/pub/unix/mail/imap/old/
 
 PERMIT_PACKAGE_CDROM=	no
 PERMIT_PACKAGE_FTP=	yes
diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo
index 073d8b142fd..f504fcfe004 100644
--- a/mail/imap-uw/distinfo
+++ b/mail/imap-uw/distinfo
@@ -1,4 +1,4 @@
-MD5 (imap-2006c1.tar.Z) = 35a9976cc0c57e0423cd49fb0f967d5e
-RMD160 (imap-2006c1.tar.Z) = 58cc0e09cc61a390c9c88f463fd0d8aa6e5ef766
-SHA1 (imap-2006c1.tar.Z) = b59e66ede620257f1bc5f6e6e66ca91b7bef15c7
-SIZE (imap-2006c1.tar.Z) = 2708011
+MD5 (imap-2006d.tar.Z) = db28da518698ec006edbfc5c96bbed28
+RMD160 (imap-2006d.tar.Z) = 0f4e8f0d6564775e0bf3e35162cbac0c9e958343
+SHA1 (imap-2006d.tar.Z) = 072fbc80d88dc7f346b470ac157f35fc0c387434
+SIZE (imap-2006d.tar.Z) = 2692289
diff --git a/mail/imap-uw/patches/patch-Makefile b/mail/imap-uw/patches/patch-Makefile
index 7de7e49ea13..668455a1f7a 100644
--- a/mail/imap-uw/patches/patch-Makefile
+++ b/mail/imap-uw/patches/patch-Makefile
@@ -1,4 +1,4 @@
-$OpenBSD: patch-Makefile,v 1.7 2006/12/01 14:40:00 jakob Exp $
+$OpenBSD: patch-Makefile,v 1.8 2007/01/01 21:25:20 jakob Exp $
 --- Makefile.orig	Fri Sep 15 20:10:32 2006
 +++ Makefile	Wed Nov 22 11:56:03 2006
 @@ -320,8 +320,7 @@ aos art asv aux bsd cvx dpx dyn isc pyr 
@@ -11,12 +11,3 @@ $OpenBSD: patch-Makefile,v 1.7 2006/12/01 14:40:00 jakob Exp $
  
  cyg:	an
  	$(BUILD) BUILDTYPE=cyg \
-@@ -486,8 +485,6 @@ sslunix sslsco:
- 	@echo ++ SSLTYPE=$(SSLTYPE).nopwd
- 	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 	@echo
--	@echo Do you want to continue this build anyway?  Type y or n please:
--	@$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 1;; esac'
- 
- sslnone:
- 	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++