Patches corrected

4 files changed, 17 insertions, 17 deletions

diff --git a/mail/courier-imap/distinfo b/mail/courier-imap/distinfo
index 0ecaaeba0cb..6c88680b9fb 100644
--- a/mail/courier-imap/distinfo
+++ b/mail/courier-imap/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.25 2010/11/05 14:16:39 adam Exp $
+$NetBSD: distinfo,v 1.26 2010/11/10 10:00:06 adam Exp $
 
 SHA1 (courier-imap-4.8.1.tar.bz2) = 1b549721cf4d705b8793a262d63bb474c2759cf9
 RMD160 (courier-imap-4.8.1.tar.bz2) = 935a4e850bd2483d9000526727553618042b079a
 Size (courier-imap-4.8.1.tar.bz2) = 3352500 bytes
 SHA1 (patch-aa) = 268f89763de3cd3a02eb5179ca29fbd5478537a2
-SHA1 (patch-ad) = c62c5efde80bbd748d213e14235393bba81b57f5
+SHA1 (patch-ad) = 1091c9a5991c746855db7fc4d3e2e744142b2e3c
 SHA1 (patch-ae) = 9d925f4639086af9f6faecd6a2fab2a9ecab670c
 SHA1 (patch-af) = 0fa0e0bd2f1908404f866de9358c74403615967f
 SHA1 (patch-ag) = 6ddd8b3f6a2cfbab4d814b51552dbf364384cf57
 SHA1 (patch-ah) = e81da45833698ff6da23de640efc322ce34cec0d
-SHA1 (patch-ak) = 057df5c41382768a0f221107137412c46200c035
-SHA1 (patch-ao) = f576d11ee217000a7760f153b131ed7a445d48f6
+SHA1 (patch-ak) = 7bb9f11f4b407ca66676875cd5c74697011b0b9a
+SHA1 (patch-ao) = 0734a1adb01c4d071b480589c045334952c70c4b
diff --git a/mail/courier-imap/patches/patch-ad b/mail/courier-imap/patches/patch-ad
index f90fa64dc26..18fccd61477 100644
--- a/mail/courier-imap/patches/patch-ad
+++ b/mail/courier-imap/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.10 2010/06/15 23:07:07 pettai Exp $
+$NetBSD: patch-ad,v 1.11 2010/11/10 10:00:06 adam Exp $
 
---- configure.orig	2007-11-23 22:20:27.000000000 -0500
+--- configure.orig	2010-10-04 11:12:59.000000000 +0000
 +++ configure
-@@ -12377,9 +12377,6 @@ else
+@@ -11061,9 +11061,6 @@ else
  fi
  
  
diff --git a/mail/courier-imap/patches/patch-ak b/mail/courier-imap/patches/patch-ak
index 3c2f627891e..f37cceb3b77 100644
--- a/mail/courier-imap/patches/patch-ak
+++ b/mail/courier-imap/patches/patch-ak
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.3 2008/02/19 18:45:14 jlam Exp $
+$NetBSD: patch-ak,v 1.4 2010/11/10 10:00:06 adam Exp $
 
---- imap/mkimapdcert.in.orig	2007-11-04 15:50:15.000000000 -0500
+--- imap/mkimapdcert.in.orig	2010-06-29 01:39:59.000000000 +0000
 +++ imap/mkimapdcert.in
 @@ -9,7 +9,13 @@
  # IMAP over SSL.  Normally this script would get called by an automatic
@@ -19,10 +19,10 @@ $NetBSD: patch-ak,v 1.3 2008/02/19 18:45:14 jlam Exp $
  else
 @@ -36,7 +42,7 @@ cleanup() {
  
- cd @mydatadir@
+ cd @certsdir@
  
 -if test "@ssllib@" = "openssl"
 +if test "$ssllib" = "openssl"
  then
- 	cp /dev/null @mydatadir@/imapd.pem
- 	chmod 600 @mydatadir@/imapd.pem
+ 	cp /dev/null @certsdir@/imapd.pem
+ 	chmod 600 @certsdir@/imapd.pem
diff --git a/mail/courier-imap/patches/patch-ao b/mail/courier-imap/patches/patch-ao
index 4eae4c7716a..2bb3bd1bb06 100644
--- a/mail/courier-imap/patches/patch-ao
+++ b/mail/courier-imap/patches/patch-ao
@@ -1,6 +1,6 @@
-$NetBSD: patch-ao,v 1.1 2008/02/19 18:45:14 jlam Exp $
+$NetBSD: patch-ao,v 1.2 2010/11/10 10:00:06 adam Exp $
 
---- imap/mkpop3dcert.in.orig	2007-11-04 15:50:15.000000000 -0500
+--- imap/mkpop3dcert.in.orig	2010-06-29 01:39:59.000000000 +0000
 +++ imap/mkpop3dcert.in
 @@ -9,7 +9,13 @@
  # POP3 over SSL.  Normally this script would get called by an automatic
@@ -19,10 +19,10 @@ $NetBSD: patch-ao,v 1.1 2008/02/19 18:45:14 jlam Exp $
  else
 @@ -36,7 +42,7 @@ cleanup() {
  
- cd @mydatadir@
+ cd @certsdir@
  
 -if test "@ssllib@" = "openssl"
 +if test "$ssllib" = "openssl"
  then
- 	cp /dev/null @mydatadir@/pop3d.pem
- 	chmod 600 @mydatadir@/pop3d.pem
+ 	cp /dev/null @certsdir@/pop3d.pem
+ 	chmod 600 @certsdir@/pop3d.pem