Update to fetchamil 5.0.4.

Submitted by:	cpiazza@home.net
PR:		ports/12172

4 files changed, 16 insertions, 26 deletions

diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 485df8b2017c..99ca12cccd69 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,9 +1,9 @@
 # New ports collection makefile for:	fetchmail
-# Version required:     5.0
+# Version required:     5.0.4
 # Date created:		26 Oct 1996
 # Whom:			Ville Eerola <ve@sci.fi>
 #
-# $Id: Makefile,v 1.74 1999/04/06 11:44:16 flathill Exp $
+# $Id: Makefile,v 1.75 1999/05/16 23:35:39 steve Exp $
 #
 # NOTE:  The fetchmailconf program (an interactive program for
 # writing .fetchmailrc files) requires Python, found in the Ports
@@ -11,7 +11,7 @@
 # does not need Python, so there is no RUN_DEPENDS for Python in
 # this Makefile.
 
-DISTNAME=       fetchmail-5.0.3
+DISTNAME=       fetchmail-5.0.4
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.ccil.org/pub/esr/fetchmail/
 
@@ -33,7 +33,7 @@ CONFIGURE_ARGS += --with-kerberos5=${KRB5_HOME}
 
 FDOC=   ${PREFIX}/share/doc/fetchmail
 
-post-patch:
+pre-patch:
 	@${CP} -f  /usr/include/md5.h ${WRKSRC}
 	@perl -pi.bak -e 's|^#!/.*/python|#!${PREFIX}/bin/python|;' ${WRKSRC}/fetchmailconf
 	@${SED} -e "s|@PREFIX@|${PREFIX}|" ${FILESDIR}/fetchmailconf > ${WRKDIR}/fetchmailconf
diff --git a/mail/fetchmail/distinfo b/mail/fetchmail/distinfo
index 5a9205eaa336..85e77d7df449 100644
--- a/mail/fetchmail/distinfo
+++ b/mail/fetchmail/distinfo
@@ -1 +1 @@
-MD5 (fetchmail-5.0.3.tar.gz) = 72a9ed7756f7e4bad5566c1df4c1287c
+MD5 (fetchmail-5.0.4.tar.gz) = 5c72fda783a28064ef2182407c36e2f2
diff --git a/mail/fetchmail/files/patch-ad b/mail/fetchmail/files/patch-ad
index 20c9b014f32d..96dc5423e8dc 100644
--- a/mail/fetchmail/files/patch-ad
+++ b/mail/fetchmail/files/patch-ad
@@ -1,24 +1,24 @@
-*** configure.orig	Mon Aug  3 08:45:11 1998
---- configure	Sat Sep 19 11:49:22 1998
+*** configure.orig	Sat Jun 12 08:17:32 1999
+--- configure	Sat Jun 12 08:18:28 1999
 ***************
-*** 2880,2886 ****
+*** 4906,4912 ****
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     ac_save_LIBS="$LIBS"
 ! LIBS="-lopie  $LIBS"
   cat > conftest.$ac_ext <<EOF
-  #line 2886 "configure"
+  #line 4912 "configure"
   #include "confdefs.h"
---- 2880,2886 ----
+--- 4906,4912 ----
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     ac_save_LIBS="$LIBS"
 ! LIBS="-lopie -lmd $LIBS"
   cat > conftest.$ac_ext <<EOF
-  #line 2886 "configure"
+  #line 4912 "configure"
   #include "confdefs.h"
 ***************
-*** 2914,2920 ****
+*** 4940,4946 ****
   #define $ac_tr_lib 1
   EOF
   
@@ -26,7 +26,7 @@
   
   else
     echo "$ac_t""no" 1>&6
---- 2914,2920 ----
+--- 4940,4946 ----
   #define $ac_tr_lib 1
   EOF
   
@@ -34,13 +34,3 @@
   
   else
     echo "$ac_t""no" 1>&6
-***************
-*** 3531,3536 ****
---- 3531,3537 ----
-  s%@host_os@%$host_os%g
-  s%@CC@%$CC%g
-  s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-+ s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-  s%@INSTALL_DATA@%$INSTALL_DATA%g
-  s%@CPP@%$CPP%g
-  s%@LEX@%$LEX%g
diff --git a/mail/fetchmail/pkg-plist b/mail/fetchmail/pkg-plist
index ed3e580ec2bd..a0624bed77ba 100644
--- a/mail/fetchmail/pkg-plist
+++ b/mail/fetchmail/pkg-plist
@@ -1,13 +1,13 @@
 bin/fetchmail
 bin/fetchmailconf
 libexec/fetchmailconf.bin
-share/doc/fetchmail/README
 share/doc/fetchmail/COPYING
 share/doc/fetchmail/FAQ
-share/doc/fetchmail/NOTES
 share/doc/fetchmail/FEATURES
-share/doc/fetchmail/fetchmail-FAQ.html
+share/doc/fetchmail/NOTES
+share/doc/fetchmail/README
 share/doc/fetchmail/design-notes.html
+share/doc/fetchmail/fetchmail-FAQ.html
 share/doc/fetchmail/fetchmail-features.html
 share/doc/fetchmail/sample.rcfile
 @dirrm share/doc/fetchmail