diff -urN /usr/ports/mail/libetpan/Makefile libetpan/Makefile
--- /usr/ports/mail/libetpan/Makefile	2009-01-25 13:03:53.000000000 +0100
+++ libetpan/Makefile	2009-07-01 17:46:30.000000000 +0200
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	libetpan
-PORTVERSION=	0.57
-PORTREVISION=	1
+PORTVERSION=	0.58
 CATEGORIES=	mail ipv6
 MASTER_SITES=	SF
 
@@ -32,8 +31,6 @@
 OPTIONS=	GNUTLS	"Enable gnuTLS support" off \
 		IPV6	"Enable ipv6 support." on
 
-.include <bsd.port.pre.mk>
-
 .if defined(WITH_GNUTLS)
 LIB_DEPENDS+=	gnutls.26:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=	--without-openssl --with-gnutls
@@ -51,4 +48,4 @@
 post-patch:
 	@${REINPLACE_CMD} -e 's|2.61|2.62|g' ${WRKSRC}/aclocal.m4
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/mail/libetpan/distinfo libetpan/distinfo
--- /usr/ports/mail/libetpan/distinfo	2009-01-12 15:45:04.000000000 +0100
+++ libetpan/distinfo	2009-07-01 17:35:31.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (libetpan-0.57.tar.gz) = 8ce8c6c071e81884a475b12b7f9a9cc0
-SHA256 (libetpan-0.57.tar.gz) = 1f3fda5c9e2961d1a6298dc8aadae321493d37727d8db45bc2e8d58f20547011
-SIZE (libetpan-0.57.tar.gz) = 1676498
+MD5 (libetpan-0.58.tar.gz) = bf20b5c0548f06b94bc588afdf5b3436
+SHA256 (libetpan-0.58.tar.gz) = 49cc237b1fdb2da9b03ff63f61920045c66bb830380d76f783a1868738f167bb
+SIZE (libetpan-0.58.tar.gz) = 1672554