svn commit: r332552 - head/mail/mpop

[William Grzybowski]

Author: wg
Date: Sat Nov  2 23:09:33 2013
New Revision: 332552
URL: http://svnweb.freebsd.org/changeset/ports/332552

Log:
  mail/mpop: update to 1.0.28
  
  - Update to 1.0.28 [1]
  - Allow staging
  - Use options helpers
  - Convert lib depends to new format
  
  PR:		ports/181276 [1]
  Submitted by:	Takefu <takefu airport.fm> [1]
  Approved by:	maintainer (timeout)

Modified:
  head/mail/mpop/Makefile
  head/mail/mpop/distinfo
  head/mail/mpop/pkg-descr
  head/mail/mpop/pkg-plist

Modified: head/mail/mpop/Makefile
==============================================================================
--- head/mail/mpop/Makefile	Sat Nov  2 23:06:17 2013	(r332551)
+++ head/mail/mpop/Makefile	Sat Nov  2 23:09:33 2013	(r332552)
@@ -2,52 +2,51 @@
 # $FreeBSD$
 
 PORTNAME=	mpop
-PORTVERSION=	1.0.27
-PORTREVISION=	1
+PORTVERSION=	1.0.28
 CATEGORIES=	mail
 MASTER_SITES=	SF
 
 MAINTAINER=	sylvio at FreeBSD.org
 COMMENT=	MPOP is a small and fast POP3 client
 
-LIB_DEPENDS=	idn.17:${PORTSDIR}/dns/libidn
+LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
+
+OPTIONS_DEFINE=	GSASL NLS
+OPTIONS_RADIO=	SSL
+OPTIONS_RADIO_SSL=	GNUTLS OPENSSL
+OPTIONS_SUB=	yes
 
-OPTIONS_DEFINE=	GNUTLS GSASL NLS
-GNUTLS_DESC=	GNUTLS Enable gnuTLS support
 GSASL_DESC=	GSASL GNU SASL authentication support
 
+NLS_USES=	gettext
+NLS_CONFIGURE_ENABLE=	nls
+
 USES=		pkgconfig
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-libidn
 
-MAN1=	mpop.1
 INFO=	mpop
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGNUTLS}
-LIB_DEPENDS+=		gnutls.26:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=		libgnutls.so:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=	--with-ssl=gnutls
-.else
+.elif ${PORT_OPTIONS:MOPENSSL}
+USE_GCC=		yes
 USE_OPENSSL=		yes
-CONFIGURE_ARGS+=	--with-ssl=openssl
-.endif
-
-.if ${PORT_OPTIONS:MGSASL}
-LIB_DEPENDS+=		gsasl.16:${PORTSDIR}/security/gsasl
+CONFIGURE_ARGS+=	--with-ssl=openssl \
+			libssl_CFLAGS=-I${OPENSSLINC} \
+			libssl_LIBS=-lssl
 .else
-CONFIGURE_ARGS+=	--without-libgsasl-prefix
+CONFIGURE_ARGS+=	--with-ssl=no
 .endif
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CONFIGURE_ARGS+=	--enable-nls
-PLIST_SUB=		NLS=""
+.if ${PORT_OPTIONS:MGSASL}
+LIB_DEPENDS+=		libgsasl.so:${PORTSDIR}/security/gsasl
 .else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB=		NLS="@comment "
+CONFIGURE_ARGS+=	--without-libgsasl
 .endif
 
 .include <bsd.port.mk>

Modified: head/mail/mpop/distinfo
==============================================================================
--- head/mail/mpop/distinfo	Sat Nov  2 23:06:17 2013	(r332551)
+++ head/mail/mpop/distinfo	Sat Nov  2 23:09:33 2013	(r332552)
@@ -1,2 +1,2 @@
-SHA256 (mpop-1.0.27.tar.bz2) = aac265d3e27378a48d8a63bd6d086db9b6142e07e6bb0460ffa99b3ff32de3c3
-SIZE (mpop-1.0.27.tar.bz2) = 288817
+SHA256 (mpop-1.0.28.tar.bz2) = e7e397c932285abc1aa65ce416679217a45d688dc8ea7f5912c6c49a8056b7ea
+SIZE (mpop-1.0.28.tar.bz2) = 289664

Modified: head/mail/mpop/pkg-descr
==============================================================================
--- head/mail/mpop/pkg-descr	Sat Nov  2 23:06:17 2013	(r332551)
+++ head/mail/mpop/pkg-descr	Sat Nov  2 23:09:33 2013	(r332552)
@@ -4,4 +4,4 @@ delivery to mbox files, maildir folders,
 a very fast POP3 implementation, many authentication methods,
 and good support for TLS/SSL.
 
-WWW:    http://mpop.sourceforge.net
+WWW: http://mpop.sourceforge.net

Modified: head/mail/mpop/pkg-plist
==============================================================================
--- head/mail/mpop/pkg-plist	Sat Nov  2 23:06:17 2013	(r332551)
+++ head/mail/mpop/pkg-plist	Sat Nov  2 23:09:33 2013	(r332552)
@@ -1,2 +1,3 @@
 bin/mpop
+man/man1/mpop.1.gz
 %%NLS%%share/locale/de/LC_MESSAGES/mpop.mo