summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mail/fetchmail/Makefile12
-rw-r--r--mail/fetchmail/distinfo2
-rw-r--r--mail/fetchmail/files/patch-aclocal.m416
3 files changed, 15 insertions, 15 deletions
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 8bd948fa16d6..4d9b76842c4c 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -10,16 +10,13 @@
# want fetchmailconf to work, define WITH_X11
PORTNAME= fetchmail
-PORTVERSION= 5.9.6
-PORTREVISION= 1
+PORTVERSION= 5.9.11
CATEGORIES= mail ipv6
MASTER_SITES= http://www.tuxedo.org/~esr/fetchmail/ \
ftp://ftp.ccil.org/pub/esr/fetchmail/
MAINTAINER= ve@sci.fi
-FORBIDDEN= Buffer overflow. http://tuxedo.org/~esr/fetchmail/NEWS
-
LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
.if defined(WITH_X11)
USE_PYTHON= yes
@@ -78,8 +75,11 @@ PLIST_SUB+= NTLMDOCS="%%PORTDOCS%%@comment "
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
+ @${SED} -e "s,^#!/.*/python,#!${PREFIX}/bin/python,g" \
+ ${WRKSRC}/fetchmailconf > ${WRKDIR}/fetchmailconf.temp
+ @${MV} -f ${WRKDIR}/fetchmailconf.temp ${WRKSRC}/fetchmailconf
+ @${SED} -e "s,@PREFIX@,${PREFIX},g" \
+ ${FILESDIR}/fetchmailconf > ${WRKDIR}/fetchmailconf
post-install:
.if !defined(NOPORTDOCS)
diff --git a/mail/fetchmail/distinfo b/mail/fetchmail/distinfo
index f56b38ae1dc7..a558bbfdf8b5 100644
--- a/mail/fetchmail/distinfo
+++ b/mail/fetchmail/distinfo
@@ -1 +1 @@
-MD5 (fetchmail-5.9.6.tar.gz) = 8a97f627da2f09c536b3ba86e2ae8919
+MD5 (fetchmail-5.9.11.tar.gz) = fff00cbf7be1d01a17605fee23ac96dd
diff --git a/mail/fetchmail/files/patch-aclocal.m4 b/mail/fetchmail/files/patch-aclocal.m4
index c7aac731d7a8..454af9df60c4 100644
--- a/mail/fetchmail/files/patch-aclocal.m4
+++ b/mail/fetchmail/files/patch-aclocal.m4
@@ -1,12 +1,12 @@
---- aclocal.m4 2001/03/20 09:46:26 1.3
-+++ aclocal.m4 2001/03/23 11:09:05
-@@ -177,6 +177,9 @@
- INSTOBJEXT=.mo
- fi
- fi
-+ if test "$gt_cv_func_gettext_libintl" = "yes"; then
+--- aclocal.m4.orig Sat Mar 9 04:27:20 2002
++++ aclocal.m4 Wed May 22 21:11:00 2002
+@@ -273,6 +273,9 @@
+
+ CATOBJEXT=.gmo
+ fi
++ if test "$gt_cv_func_gettext_libintl" = "yes"; then
+ INTLLIBS='-lintl'
-+ fi
++ fi
])
if test "$CATOBJEXT" = "NONE"; then