Update to 5.6.3, skipping the slightly buggy 5.6.2.

Also, correct the help message in the fetchmailconf wrapper script -
fetchmailconf depends on py-tkinter, not just Python.

Submitted by:	Jack Twilley <jmt@inktomi.com> - the fetchmailconf inaccuracy
Approved by:	maintainer

4 files changed, 17 insertions, 17 deletions

diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index eb342df00ac1..275576d27c9a 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -10,7 +10,7 @@
 # want fetchmailconf to work, define WITH_X11
 
 PORTNAME=	fetchmail
-PORTVERSION=	5.6.1
+PORTVERSION=	5.6.3
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://www.tuxedo.org/~esr/fetchmail/ \
 		ftp://ftp.ccil.org/pub/esr/fetchmail/
diff --git a/mail/fetchmail/distinfo b/mail/fetchmail/distinfo
index 62c3d85b4939..51c45a7e0475 100644
--- a/mail/fetchmail/distinfo
+++ b/mail/fetchmail/distinfo
@@ -1 +1 @@
-MD5 (fetchmail-5.6.1.tar.gz) = 6e34835e97aa74976083031f53d21fb2
+MD5 (fetchmail-5.6.3.tar.gz) = b6ca3d32ee59ba39c9323d1cc34579e5
diff --git a/mail/fetchmail/files/fetchmailconf b/mail/fetchmail/files/fetchmailconf
index 78ba6af9004f..b59c51780987 100644
--- a/mail/fetchmail/files/fetchmailconf
+++ b/mail/fetchmail/files/fetchmailconf
@@ -11,9 +11,9 @@ if [ -e $PREFIX/bin/python ]; then
 	exec $PREFIX/libexec/fetchmailconf.bin
 else
 	cat <<EOF
-The fetchmailconf program requires Python, which does not appear to be
-installed on this system.  Python can be found in the FreeBSD Ports
-Collection under lang/python.
+The fetchmailconf program requires Python with Tkinter , which does not
+appear to be installed on this system.  Python/Tkinter can be found in
+the FreeBSD Ports Collection under x11/py-tkinter.
 EOF
 	exit 1
 fi
diff --git a/mail/fetchmail/files/patch-ad b/mail/fetchmail/files/patch-ad
index 6bf0b09ddb5e..e302c7a313ba 100644
--- a/mail/fetchmail/files/patch-ad
+++ b/mail/fetchmail/files/patch-ad
@@ -1,5 +1,5 @@
---- ../fetchmail-5.5.6/configure	Sun Nov  5 01:49:32 2000
-+++ ./configure	Sun Nov 12 18:58:13 2000
+--- configure.old	Wed Feb  7 15:26:10 2001
++++ configure	Wed Feb  7 15:27:04 2001
 @@ -1637,7 +1637,7 @@
  if test `uname` = "FreeBSD" 
  then
@@ -9,27 +9,27 @@
  fi
   
  # Check for Rhapsody special case: it doesn't like -s
-@@ -5690,7 +5690,7 @@
- then
-   echo "Configuring kerberosIV for `uname`"
-   CEFLAGS="$CEFLAGS -DKERBEROS_V4 -I/usr/include/kerberosIV"
+@@ -5638,7 +5638,7 @@
+ EOF
+ 
+   CEFLAGS="$CEFLAGS -I/usr/include/kerberosIV"
 -  LIBS="$LIBS -lkrb -ldes"
 +  LIBS="$LIBS -lkrb -ldes -lcom_err"
  elif test -n "$with_kerberos" -a -n "$with_kerberos5" -a "$with_kerberos" != "no" -a "$with_kerberos5" != "no"
  then
-     CEFLAGS="$CEFLAGS -DKERBEROS_V4 -I$with_kerberos/include"
-@@ -5721,7 +5721,7 @@
- then
-     CEFLAGS="$CEFLAGS -DKERBEROS_V4 -I$with_kerberos/include"
+     cat >> confdefs.h <<\EOF
+@@ -5681,7 +5681,7 @@
+ 
+     CEFLAGS="$CEFLAGS -I$with_kerberos/include"
      LDEFLAGS="$LDEFLAGS -L$with_kerberos/lib"
 -    LIBS="$LIBS -lkrb -ldes"
 +    LIBS="$LIBS -lkrb -ldes -lcom_err"
  else
    if test "$with_kerberos" != "no"
    then
-@@ -5731,7 +5731,7 @@
+@@ -5695,7 +5695,7 @@
        then
-         CEFLAGS="$CEFLAGS -DKERBEROS_V4 -I$dir/include"
+         CEFLAGS="$CEFLAGS -I$dir/include"
          LDEFLAGS="$LDEFLAGS -L$dir/lib"
 -        LIBS="$LIBS -lkrb -ldes"
 +        LIBS="$LIBS -lkrb -ldes -lcom_err"