Update 5.9.13 --> 6.1.0. Fixes yet another buffer overflow (exploit)

described at http://security.e-matters.de/advisories/032002.html.

Approved by:	nectar (using his security-officer hat)
		will (using his portmgr hat)
		As we are so close to last tagging, as suggested by
		portmgr, maintainer approval is forgone.

mail/fetchmail/Makefile

@@ -10,21 +10,20 @@
 # want fetchmailconf to work, define WITH_X11
 
 PORTNAME=	fetchmail
-PORTVERSION=	5.9.13
+PORTVERSION=	6.1.0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://www.tuxedo.org/~esr/fetchmail/ \
 		ftp://ftp.ccil.org/pub/esr/fetchmail/
 
 MAINTAINER=	ve@sci.fi
 
-FORBIDDEN=	"Yet another remote buffer overflow. http://security.e-matters.de/advisories/032002.html"
-
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 .if defined(WITH_X11)
 USE_PYTHON=	yes
 RUN_DEPENDS=	${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 .endif
 
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-opie --enable-RPA --enable-POP2 --enable-SDPS \
@@ -82,6 +81,8 @@ pre-patch:
 	@${MV} -f ${WRKDIR}/fetchmailconf.temp ${WRKSRC}/fetchmailconf
 	@${SED} -e "s,@PREFIX@,${PREFIX},g" \
 		${FILESDIR}/fetchmailconf > ${WRKDIR}/fetchmailconf
+	@${REINPLACE_CMD} -e "s,@l@,,;s,@GT_NO@,," \
+		${WRKSRC}/intl/Makefile.in
 
 post-install:
 .if !defined(NOPORTDOCS)

mail/fetchmail/distinfo

@@ -1 +1 @@
-MD5 (fetchmail-5.9.13.tar.gz) = da6fbd034bf9af1e2ec078fa3141f06c
+MD5 (fetchmail-6.1.0.tar.gz) = 8c57c33e4c49ffddde0024e24e371d25

mail/fetchmail/files/patch-aclocal.m4

@@ -2,11 +2,11 @@
 +++ 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
- 	])
+         CATOBJEXT=.gmo
+       fi
++      if test "$gt_cv_func_gettext_libintl" = "yes"; then
++	    INTLLIBS='-lintl'
++      fi
+     ])
  
-         if test "$CATOBJEXT" = "NONE"; then
+     if test "$gt_use_preinstalled_gnugettext" = "yes" \