Update to 5.3.8.

PR:		18446, 18456
Submitted by:	Ville Eerola <ve@sci.fi>

4 files changed, 18 insertions, 21 deletions

diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 81f9013fc667..34b0eec60ce6 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -11,7 +11,7 @@
 # this Makefile.
 
 PORTNAME=	fetchmail
-PORTVERSION= 	5.3.0
+PORTVERSION= 	5.3.8
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.ccil.org/pub/esr/fetchmail/
 
diff --git a/mail/fetchmail/distinfo b/mail/fetchmail/distinfo
index 559ed81b1186..e097456301ab 100644
--- a/mail/fetchmail/distinfo
+++ b/mail/fetchmail/distinfo
@@ -1 +1 @@
-MD5 (fetchmail-5.3.0.tar.gz) = a5656aaf9410c1f712bd63fd9e18a5cb
+MD5 (fetchmail-5.3.8.tar.gz) = cb278207934947e121745c55d5477719
diff --git a/mail/fetchmail/files/patch-ad b/mail/fetchmail/files/patch-ad
index ac4e4498400f..f6fcbd63749f 100644
--- a/mail/fetchmail/files/patch-ad
+++ b/mail/fetchmail/files/patch-ad
@@ -1,7 +1,7 @@
-diff -ruN ../fetchmail-5.3.0.OLD/configure ./configure
---- ../fetchmail-5.3.0.OLD/configure	Wed Feb 16 11:27:00 2000
-+++ ./configure	Wed Feb 23 23:42:25 2000
-@@ -1595,7 +1595,7 @@
+diff -ru ../fetchmail-5.3.8.old/configure ./configure
+--- ../fetchmail-5.3.8.old/configure	Fri Apr 14 09:32:49 2000
++++ ./configure	Tue May  9 02:19:31 2000
+@@ -1637,7 +1637,7 @@
  if test `uname` = "FreeBSD" 
  then
     echo "Adding -lkvm to standard libraries"
@@ -10,7 +10,7 @@ diff -ruN ../fetchmail-5.3.0.OLD/configure ./configure
  fi
   
  # Check for Rhapsody special case: it doesn't like -s
-@@ -5555,7 +5555,7 @@
+@@ -5693,7 +5693,7 @@
  then
    echo "Configuring kerberosIV for `uname`"
    CEFLAGS="$CEFLAGS -DKERBEROS_V4 -I/usr/include/kerberosIV"
@@ -19,7 +19,7 @@ diff -ruN ../fetchmail-5.3.0.OLD/configure ./configure
  elif test -n "$with_kerberos" -a -n "$with_kerberos5" -a "$with_kerberos" != "no"
  then
      CEFLAGS="$CEFLAGS -DKERBEROS_V4 -I$with_kerberos/include"
-@@ -5586,7 +5586,7 @@
+@@ -5724,7 +5724,7 @@
  then
      CEFLAGS="$CEFLAGS -DKERBEROS_V4 -I$with_kerberos/include"
      LDEFLAGS="$LDEFLAGS -L$with_kerberos/lib"
@@ -28,7 +28,7 @@ diff -ruN ../fetchmail-5.3.0.OLD/configure ./configure
  else
    if test "$with_kerberos" != "no"
    then
-@@ -5596,7 +5596,7 @@
+@@ -5734,7 +5734,7 @@
        then
          CEFLAGS="$CEFLAGS -DKERBEROS_V4 -I$dir/include"
          LDEFLAGS="$LDEFLAGS -L$dir/lib"
diff --git a/mail/fetchmail/files/patch-ai b/mail/fetchmail/files/patch-ai
index 0a2bf5543bc5..5651cb62a83c 100644
--- a/mail/fetchmail/files/patch-ai
+++ b/mail/fetchmail/files/patch-ai
@@ -1,15 +1,12 @@
-diff -ruN ../fetchmail-5.3.0.OLD/conf.c ./conf.c
---- ../fetchmail-5.3.0.OLD/conf.c	Fri Feb 18 01:31:22 2000
-+++ ./conf.c	Wed Feb 23 23:48:58 2000
-@@ -249,9 +249,10 @@
- 	    stringdump("via", ctl->server.via); 
- 	    stringdump("protocol", 
- 		       using_kpop ? "KPOP" : showproto(ctl->server.protocol));
--	    numdump("port",  ctl->server.port);
- #if INET6_ENABLE
- 	    stringdump("service", ctl->server.service);
-+#else
-+	    numdump("port",  ctl->server.port);
+diff -ru ../fetchmail-5.3.8.old/conf.c ./conf.c
+--- ../fetchmail-5.3.8.old/conf.c	Mon Mar  6 07:20:17 2000
++++ ./conf.c	Tue May  9 02:19:32 2000
+@@ -252,7 +252,7 @@
+ #ifndef INET6_ENABLE
+ 	    numdump("port",  ctl->server.port);
+ #else
+-	    stringdump("port",  ctl->server.service);
++	    stringdump("service",  ctl->server.service);
  #endif
  	    numdump("timeout",  ctl->server.timeout);
  	    numdump("interval", ctl->server.interval);