- Upgrade to 5.2.3.

- Support IPv6.

Approved by:	maintainer

3 files changed, 20 insertions, 26 deletions

diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 53c5aaccd648..9755e2989460 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for:	fetchmail
-# Version required:     5.2.1
+# Version required:     5.2.3
 # Date created:		26 Oct 1996
 # Whom:			Ville Eerola <ve@sci.fi>
 #
@@ -11,7 +11,7 @@
 # does not need Python, so there is no RUN_DEPENDS for Python in
 # this Makefile.
 
-DISTNAME=       fetchmail-5.2.1
+DISTNAME=       fetchmail-5.2.3
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.ccil.org/pub/esr/fetchmail/
 
@@ -20,6 +20,9 @@ MAINTAINER=	ve@sci.fi
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --enable-OPIE --enable-RPA --enable-POP2 --enable-SDPS
 CONFIGURE_ENV=  LDFLAGS="${CFLAGS}"
+.if defined(USE_INET6)
+CONFIGURE_ARGS+=--enable-inet6
+.endif
 MAN1=		fetchmail.1
 MLINKS=		fetchmail.1 fetchmailconf.1
 
diff --git a/mail/fetchmail/distinfo b/mail/fetchmail/distinfo
index d5a1a7e94f18..68cfee465520 100644
--- a/mail/fetchmail/distinfo
+++ b/mail/fetchmail/distinfo
@@ -1 +1 @@
-MD5 (fetchmail-5.2.1.tar.gz) = 52b6e39871129a00f59caa929d539bcc
+MD5 (fetchmail-5.2.3.tar.gz) = ad21b1ac6a062bd8b8236c1e33299bf3
diff --git a/mail/fetchmail/files/patch-ad b/mail/fetchmail/files/patch-ad
index 84e7a9dff080..4aa131f9fff4 100644
--- a/mail/fetchmail/files/patch-ad
+++ b/mail/fetchmail/files/patch-ad
@@ -1,24 +1,15 @@
---- configure.orig	Thu Sep 16 00:21:02 1999
-+++ configure	Fri Sep 24 13:13:25 1999
-@@ -4970,7 +4970,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lopie  $LIBS"
-+LIBS="-lopie -lmd $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 4976 "configure"
- #include "confdefs.h"
-@@ -5004,7 +5004,7 @@
- #define $ac_tr_lib 1
- EOF
- 
--  LIBS="-lopie $LIBS"
-+  LIBS="-lopie -lmd $LIBS"
- 
- else
-   echo "$ac_t""no" 1>&6
-@@ -5368,7 +5368,7 @@
+--- configure.orig	Tue Jan  4 15:59:12 2000
++++ configure	Wed Jan 12 08:56:41 2000
+@@ -1595,7 +1595,7 @@
+ if test `uname` = "FreeBSD" 
+ then
+    echo "Adding -lkvm to standard libraries"
+-   LIBS="$LIBS -lkvm"
++   LIBS="$LIBS -lmd -lkvm"
+ fi
+  
+ # Check for Rhapsody special case: it doesn't like -s
+@@ -5553,7 +5553,7 @@
  then
    echo "Configuring kerberosIV for `uname`"
    CEFLAGS="$CEFLAGS -DKERBEROS_V4 -I/usr/include/kerberosIV"
@@ -27,7 +18,7 @@
  elif test -n "$with_kerberos" -a -n "$with_kerberos5"
  then
      CEFLAGS="$CEFLAGS -DKERBEROS_V4 -I$with_kerberos/include"
-@@ -5399,7 +5399,7 @@
+@@ -5584,7 +5584,7 @@
  then
      CEFLAGS="$CEFLAGS -DKERBEROS_V4 -I$with_kerberos/include"
      LDEFLAGS="$LDEFLAGS -L$with_kerberos/lib"
@@ -36,7 +27,7 @@
  else
    if test "$with_kerberos" != "no"
    then
-@@ -5409,7 +5409,7 @@
+@@ -5594,7 +5594,7 @@
        then
          CEFLAGS="$CEFLAGS -DKERBEROS_V4 -I$dir/include"
          LDEFLAGS="$LDEFLAGS -L$dir/lib"