diff -urN /usr/ports/mail/libetpan/Makefile mail/libetpan/Makefile
--- /usr/ports/mail/libetpan/Makefile	Tue Apr 12 14:07:55 2005
+++ mail/libetpan/Makefile	Mon Jul  4 02:08:30 2005
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	libetpan
-PORTVERSION=	0.36
+PORTVERSION=	0.37
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +16,6 @@
 COMMENT=	A mail library
 
 USE_ICONV=	yes
-USE_OPENSSL=	yes
 USE_LIBTOOL_VER=	15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
@@ -24,5 +23,13 @@
 
 CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+
+.if defined(WITH_GNUTLS)
+LIB_DEPENDS+=	gnutls.12:${PORTSDIR}/security/gnutls
+CONFIGURE_ARGS+=	--with-gnutls
+.else
+USE_OPENSSL=	yes
+CONFIGURE_ARGS+=	--without-gnutls
+.endif
 
 .include <bsd.port.mk>
diff -urN /usr/ports/mail/libetpan/distinfo mail/libetpan/distinfo
--- /usr/ports/mail/libetpan/distinfo	Sat Feb 26 15:59:02 2005
+++ mail/libetpan/distinfo	Mon Jul  4 02:01:42 2005
@@ -1,2 +1,2 @@
-MD5 (libetpan-0.36.tar.gz) = 208b1c2deafba40eb640aabbc81c247f
-SIZE (libetpan-0.36.tar.gz) = 1136981
+MD5 (libetpan-0.37.tar.gz) = 82fbce08c9b3c073e9e93798c2797224
+SIZE (libetpan-0.37.tar.gz) = 1009047