update to 3.0.6

5 files changed, 73 insertions, 52 deletions

diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 2d3cf51b01f6..ffcb4132fa0f 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	courier-imap
-PORTVERSION=	3.0.5
-PORTREVISION=	2
+PORTVERSION=	3.0.6
+PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/mail/courier-imap/distinfo b/mail/courier-imap/distinfo
index 730edb81ed77..66815f3efe80 100644
--- a/mail/courier-imap/distinfo
+++ b/mail/courier-imap/distinfo
@@ -1,4 +1,2 @@
-MD5 (courier-imap-3.0.5.tar.bz2) = 8b0c79997905dc46cfe4cc13be74ceaf
-SIZE (courier-imap-3.0.5.tar.bz2) = 1648873
-MD5 (courier-imap-3.0.5-drac.patch) = 57c6bfde1b0c435cf2aab4d4ceab3ea2
-SIZE (courier-imap-3.0.5-drac.patch) = 7695
+MD5 (courier-imap-3.0.6.tar.bz2) = f2d3c0d566ea6789192dc3cd5fd8f8fb
+SIZE(courier-imap-3.0.6.tar.bz2) = 1693960
diff --git a/mail/courier-imap/files/patch-Makefile.in b/mail/courier-imap/files/patch-Makefile.in
index e442e33b6e2c..7ed74c9ea2b1 100644
--- a/mail/courier-imap/files/patch-Makefile.in
+++ b/mail/courier-imap/files/patch-Makefile.in
@@ -1,37 +1,37 @@
---- Makefile.in.orig	Wed Jul  2 02:30:46 2003
-+++ Makefile.in	Sun Jul 20 14:09:49 2003
-@@ -132,7 +132,7 @@
- EXTRA_DIST = 00README.NOW.OR.SUFFER README README.cygwin automake.fix COPYING.GPL sysconftool
- 
+--- Makefile.in.orig	Tue Jul 20 01:54:19 2004
++++ Makefile.in	Tue Jul 20 19:31:37 2004
+@@ -218,7 +218,7 @@
+ 	COPYING.GPL NEWS.html $(TEMPLFILES)\
+ sysconftool
  sysconf_DATA = imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist \
 -	imapd.cnf pop3d.cnf quotawarnmsg.example
 +	quotawarnmsg.example
  
  libexec_SCRIPTS = imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
- 
-@@ -351,8 +351,8 @@
+ HTML2TXT = `which lynx 2>/dev/null && echo "lynx -dump -nolist" && exit; echo "links -dump"`
+@@ -433,8 +433,8 @@
  	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
  	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
  	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
--	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
-+	  echo " %%INSTALL_MAN%% $$file $(DESTDIR)$(man1dir)/$$inst"; \
-+	  %%INSTALL_MAN%% $$file $(DESTDIR)$(man1dir)/$$inst; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
++	  echo " %%INSTALL_MAN%% '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
++	  %%INSTALL_MAN%% "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
  	done
  uninstall-man1:
  	@$(NORMAL_UNINSTALL)
-@@ -394,8 +394,8 @@
+@@ -478,8 +478,8 @@
  	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
  	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
  	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \
--	  $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \
-+	  echo " %%INSTALL_MAN%% $$file $(DESTDIR)$(man8dir)/$$inst"; \
-+	  %%INSTALL_MAN%% $$file $(DESTDIR)$(man8dir)/$$inst; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
++	  echo " %%INSTALL_MAN%% '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
++	  %%INSTALL_MAN%% "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
  	done
  uninstall-man8:
  	@$(NORMAL_UNINSTALL)
-@@ -873,6 +873,7 @@
+@@ -1055,6 +1055,7 @@
  
  install-data-local: install-man
  	for f in `cat authlib/modulelist ; . authlib/authdaemonrc ; echo $$authmodulelist ` ; do \
diff --git a/mail/courier-imap/files/patch-maildir::maildirquota.c b/mail/courier-imap/files/patch-maildir::maildirquota.c
deleted file mode 100644
index a643011a8809..000000000000
--- a/mail/courier-imap/files/patch-maildir::maildirquota.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- maildir/maildirquota.c.orig	Fri Jun 18 23:27:53 2004
-+++ maildir/maildirquota.c	Fri Jun 18 23:45:01 2004
-@@ -748,7 +748,7 @@
- char	*p;
- DIR	*dirp;
- struct dirent *de;
--off_t	s;
-+unsigned long s;
- 
- 	if (stat(dir, &stat_buf))	return (0);	/* Ignore */
- 	if (stat_buf.st_mtime > *dirstamp)	*dirstamp=stat_buf.st_mtime;
diff --git a/mail/courier-imap/files/patch-mysql b/mail/courier-imap/files/patch-mysql
index 37aca7b23304..029829ef7a5d 100644
--- a/mail/courier-imap/files/patch-mysql
+++ b/mail/courier-imap/files/patch-mysql
@@ -1,28 +1,44 @@
---- authlib/configure.orig	Thu Oct 30 21:36:15 2003
-+++ authlib/configure	Thu Oct 30 21:43:26 2003
-@@ -6766,9 +6766,9 @@
+--- authlib/configure.orig	Tue Jul 20 19:37:46 2004
++++ authlib/configure	Tue Jul 20 19:37:22 2004
+@@ -7337,9 +7337,9 @@
  if test "$doauthmysql" = ""
  then
  	LIBS="$MYSQL_LIBS $LIBS"
 -	echo "$as_me:$LINENO: checking for mysql_connect" >&5
 -echo $ECHO_N "checking for mysql_connect... $ECHO_C" >&6
 -if test "${ac_cv_func_mysql_connect+set}" = set; then
-+       echo "$as_me:$LINENO: checking for mysql_real_connect" >&5
++	echo "$as_me:$LINENO: checking for mysql_real_connect" >&5
 +echo $ECHO_N "checking for mysql_real_connect... $ECHO_C" >&6
 +if test "${ac_cv_func_mysql_real_connect+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -6779,7 +6779,7 @@
+@@ -7348,12 +7348,12 @@
+ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
+-/* Define mysql_connect to an innocuous variant, in case <limits.h> declares mysql_connect.
++/* Define mysql_real_connect to an innocuous variant, in case <limits.h> declares mysql_real_connect.
+    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define mysql_connect innocuous_mysql_connect
++#define mysql_real_connect innocuous_mysql_real_connect
+ 
  /* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char mysql_connect (); below.
-+    which can conflict with char mysql_real_connect (); below.  */
++    which can conflict with char mysql_real_connect (); below.
      Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
      <limits.h> exists even on freestanding compilers.  */
- #ifdef __STDC__
-@@ -6794,14 +6794,14 @@
+ 
+@@ -7363,7 +7363,7 @@
+ # include <assert.h>
+ #endif
+ 
+-#undef mysql_connect
++#undef mysql_real_connect
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -7372,14 +7372,14 @@
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
@@ -40,7 +56,7 @@
  #endif
  #ifdef __cplusplus
  }
-@@ -6810,7 +6810,7 @@
+@@ -7388,7 +7388,7 @@
  int
  main ()
  {
@@ -49,7 +65,7 @@
    ;
    return 0;
  }
-@@ -6827,18 +6827,18 @@
+@@ -7415,19 +7415,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -62,7 +78,8 @@
 -ac_cv_func_mysql_connect=no
 +ac_cv_func_mysql_real_connect=no
  fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_func_mysql_connect" >&5
 -echo "${ECHO_T}$ac_cv_func_mysql_connect" >&6
@@ -73,7 +90,7 @@
    doauthmysql="yes"
  
  fi
-@@ -6930,9 +6930,9 @@
+@@ -7537,9 +7537,9 @@
  else
  	saveLIBS="$LIBS"
  	LIBS="$MYSQL_LIBS $LIBS"
@@ -86,16 +103,32 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -6943,7 +6943,7 @@
+@@ -7548,12 +7548,12 @@
+ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
+-/* Define mysql_connect to an innocuous variant, in case <limits.h> declares mysql_connect.
++/* Define mysql_real_connect to an innocuous variant, in case <limits.h> declares mysql_real_connect.
+    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define mysql_connect innocuous_mysql_connect
++#define mysql_real_connect innocuous_mysql_real_connect
+ 
  /* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char mysql_connect (); below.
 +    which can conflict with char mysql_real_connect (); below.
      Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
      <limits.h> exists even on freestanding compilers.  */
- #ifdef __STDC__
-@@ -6958,14 +6958,14 @@
+ 
+@@ -7563,7 +7563,7 @@
+ # include <assert.h>
+ #endif
+ 
+-#undef mysql_connect
++#undef mysql_real_connect
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -7572,14 +7572,14 @@
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
@@ -113,7 +146,7 @@
  #endif
  #ifdef __cplusplus
  }
-@@ -6974,7 +6974,7 @@
+@@ -7588,7 +7588,7 @@
  int
  main ()
  {
@@ -122,7 +155,7 @@
    ;
    return 0;
  }
-@@ -6991,18 +6991,18 @@
+@@ -7615,19 +7615,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -135,7 +168,8 @@
 -ac_cv_func_mysql_connect=no
 +ac_cv_func_mysql_real_connect=no
  fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_func_mysql_connect" >&5
 -echo "${ECHO_T}$ac_cv_func_mysql_connect" >&6