svn commit: r358202 - head/mail/mpop

[Martin Wilke]

Author: miwi
Date: Wed Jun 18 03:48:21 2014
New Revision: 358202
URL: http://svnweb.freebsd.org/changeset/ports/358202
QAT: https://qat.redports.org/buildarchive/r358202/

Log:
  - Update to 1.0.29
  
  PR:		191096

Modified:
  head/mail/mpop/Makefile
  head/mail/mpop/distinfo

Modified: head/mail/mpop/Makefile
==============================================================================
--- head/mail/mpop/Makefile	Wed Jun 18 03:15:35 2014	(r358201)
+++ head/mail/mpop/Makefile	Wed Jun 18 03:48:21 2014	(r358202)
@@ -2,51 +2,47 @@
 # $FreeBSD$
 
 PORTNAME=	mpop
-PORTVERSION=	1.0.28
-PORTREVISION=	1
+PORTVERSION=	1.0.29
 CATEGORIES=	mail
 MASTER_SITES=	SF
 
 MAINTAINER=	ports at FreeBSD.org
-COMMENT=	MPOP is a small and fast POP3 client
+COMMENT=	Small and fast POP3 client
 
-LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
-
-OPTIONS_DEFINE=	GSASL NLS
-OPTIONS_RADIO=	SSL
-OPTIONS_RADIO_SSL=	GNUTLS OPENSSL
-OPTIONS_SUB=	yes
-
-GSASL_DESC=	GSASL GNU SASL authentication support
-
-NLS_USES=	gettext
-NLS_CONFIGURE_ENABLE=	nls
+LICENSE=	GPLv3 # (or later)
 
 USES=		pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-libidn
+CONFIGURE_ARGS=	--disable-silent-rules
 
-INFO=	mpop
+INFO=		mpop
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=		GNOMEKEYRING GSASL IDN NLS
+OPTIONS_RADIO=		SSL
+OPTIONS_RADIO_SSL=	GNUTLS OPENSSL
+OPTIONS_DEFAULT=	IDN OPENSSL
+OPTIONS_SUB=		yes
 
-.if ${PORT_OPTIONS:MGNUTLS}
-LIB_DEPENDS+=		libgnutls.so:${PORTSDIR}/security/gnutls
-CONFIGURE_ARGS+=	--with-ssl=gnutls
-.elif ${PORT_OPTIONS:MOPENSSL}
-USE_GCC=		yes
-USE_OPENSSL=		yes
-CONFIGURE_ARGS+=	--with-ssl=openssl \
+GNOMEKEYRING_LIB_DEPENDS=	libgnome-keyring:${PORTSDIR}/security/libgnome-keyring
+GNOMEKEYRING_CONFIGURE_WITH=	gnome-keyring
+GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_CONFIGURE_ON=	--with-ssl=gnutls
+GSASL_DESC=		SASL authentication support via GNU SASL
+GSASL_LIB_DEPENDS=	libgsasl.so:${PORTSDIR}/security/gsasl
+GSASL_CONFIGURE_OFF=	--without-libgsasl
+IDN_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
+IDN_CONFIGURE_WITH=	libidn
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
+OPENSSL_USE=		openssl=yes
+OPENSSL_CONFIGURE_ON=	--with-ssl=openssl \
 			libssl_CFLAGS=-I${OPENSSLINC} \
-			libssl_LIBS=-lssl
-.else
-CONFIGURE_ARGS+=	--with-ssl=no
-.endif
+			libssl_LIBS="-lssl -lcrypto"
 
-.if ${PORT_OPTIONS:MGSASL}
-LIB_DEPENDS+=		libgsasl.so:${PORTSDIR}/security/gsasl
-.else
-CONFIGURE_ARGS+=	--without-libgsasl
+.include <bsd.port.options.mk>
+
+.if empty(PORT_OPTIONS:MGNUTLS) && empty(PORT_OPTIONS:MOPENSSL)
+CONFIGURE_ARGS+=	--with-ssl=no
 .endif
 
 .include <bsd.port.mk>

Modified: head/mail/mpop/distinfo
==============================================================================
--- head/mail/mpop/distinfo	Wed Jun 18 03:15:35 2014	(r358201)
+++ head/mail/mpop/distinfo	Wed Jun 18 03:48:21 2014	(r358202)
@@ -1,2 +1,2 @@
-SHA256 (mpop-1.0.28.tar.bz2) = e7e397c932285abc1aa65ce416679217a45d688dc8ea7f5912c6c49a8056b7ea
-SIZE (mpop-1.0.28.tar.bz2) = 289664
+SHA256 (mpop-1.0.29.tar.bz2) = bd7409741629669969b176ed664e0adec449bf434b9f333e74fed534b28690b8
+SIZE (mpop-1.0.29.tar.bz2) = 292369