svn commit: r311787 - head/mail/libetpan

[Pawel Pekala]

Author: pawel
Date: Wed Feb  6 18:11:24 2013
New Revision: 311787
URL: http://svnweb.freebsd.org/changeset/ports/311787

Log:
  - Add missing dependency on security/libgcrypt when GNUTLS=on
  - Use common descriptions for OPENSSL, GNUTLS
  - IPv6 option is on by default now
  - Set better COMMENT

Modified:
  head/mail/libetpan/Makefile

Modified: head/mail/libetpan/Makefile
==============================================================================
--- head/mail/libetpan/Makefile	Wed Feb  6 18:02:43 2013	(r311786)
+++ head/mail/libetpan/Makefile	Wed Feb  6 18:11:24 2013	(r311787)
@@ -1,19 +1,14 @@
-# ex:ts=8
-# Ports collection makefile for:	libEtPan!
-# Date created:			Jun 27, 2002
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	libetpan
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail ipv6
 MASTER_SITES=	SF
 
 MAINTAINER=	pawel at FreeBSD.org
-COMMENT=	A mail library
+COMMENT=	Mail framework for C language
 
 LICENSE=	BSD
 
@@ -21,10 +16,11 @@ LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		expat:${PORTSDIR}/textproc/expat2 \
 		sasl2:${PORTSDIR}/security/cyrus-sasl2
 
-USE_ICONV=	yes
 USE_AUTOTOOLS=	libtool autoconf
-USE_LDCONFIG=	yes
+AUTOTOOLSFILES=	aclocal.m4
 USE_GMAKE=	yes
+USE_ICONV=	yes
+USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
@@ -32,15 +28,14 @@ LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_L
 
 OPTIONS_DEFINE=		IPV6
 OPTIONS_SINGLE=		CRYPTO
-OPTIONS_SINGLE_CRYPTO=	GNUTLS OPENSSL 
-GNUTLS_DESC=		Enable GNUTLS support
-OPENSSL_DESC=		Enable OpenSSL support
-OPTIONS_DEFAULT=	IPV6 OPENSSL
+OPTIONS_SINGLE_CRYPTO=	GNUTLS OPENSSL
+OPTIONS_DEFAULT=	OPENSSL
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGNUTLS}
-LIB_DEPENDS+=	gnutls.26:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls \
+		gcrypt:${PORTSDIR}/security/libgcrypt
 CONFIGURE_ARGS+=	--without-openssl --with-gnutls
 .endif
 
@@ -55,8 +50,6 @@ CONFIGURE_ARGS+=	--enable-ipv6
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
-AUTOTOOLSFILES=	aclocal.m4
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|2.61|%%AUTOCONF_VERSION%%|g' ${WRKSRC}/aclocal.m4