Update mpop to 1.2.5. From Onno van der Linden in PR pkg/51253.

Version 1.2.5:
- Support SHA256 fingerprints for tls_fingerprint, and mark both SHA1 and MD5 as
  deprecated.

Version 1.2.4:
- The system default policy is used with GnuTLS instead of a hardcoded one.

Version 1.2.3:
- A bug in SOCKS support was fixed.
- Handling non-fatal errors in TLS handshakes was fixed.

Version 1.2.2:
- No significant changes.

Version 1.2.1:
- The new configure option --with-tls replaces --with-ssl.
- A new configure option --disable-gai-idn was added.

Version 1.2.0:
- Support for SOCKS proxies was added. This allows mpop to be used with Tor.
- GNOME Keyring support now uses libsecret instead of libgnome-keyring. It is
  now documented how to use secret-tool to manage passwords for mpop; the
  obsolete mpop-gnome-tool script is removed.
- Configuration file security is now only checked if the file actually contains
  secrets such as passwords. (If you still store passwords in the configuration
  file, consider using the passwordeval command or a key ring instead.)
- The GSSAPI authentication method is not chosen automatically anymore, you have
  to request it manually if you really want to use it.
- Libidn is not required for IDN support anymore on systems where getaddrinfo()
  supports the AI_IDN flag and the GnuTLS version is >= 3.4.0.
- SSLv3 is disabled, and the obsolete tls_force_sslv3 command and
  --tls-force-sslv3 option have no effect anymore.

Version 1.0.29:
- No significant changes.

3 files changed, 12 insertions, 13 deletions

diff --git a/mail/mpop/Makefile b/mail/mpop/Makefile
index 2ce05f8ca14..95a552a9f24 100644
--- a/mail/mpop/Makefile
+++ b/mail/mpop/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.22 2016/03/05 11:28:49 jperkin Exp $
+# $NetBSD: Makefile,v 1.23 2016/06/18 18:55:52 bsiegert Exp $
 #
 
-DISTNAME=	mpop-1.0.28
-PKGREVISION=	4
+DISTNAME=	mpop-1.2.5
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mpop/}
-EXTRACT_SUFX=	.tar.bz2
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	reed@reedmedia.net
 HOMEPAGE=	http://mpop.sourceforge.net/
diff --git a/mail/mpop/distinfo b/mail/mpop/distinfo
index 903925fc7bd..47076633eff 100644
--- a/mail/mpop/distinfo
+++ b/mail/mpop/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2015/11/03 23:27:10 agc Exp $
+$NetBSD: distinfo,v 1.10 2016/06/18 18:55:52 bsiegert Exp $
 
-SHA1 (mpop-1.0.28.tar.bz2) = bfc2447adb25081aacb6999c5badaf86d5a39741
-RMD160 (mpop-1.0.28.tar.bz2) = feaae6a5025b65bee749448305453e85e52d974e
-SHA512 (mpop-1.0.28.tar.bz2) = 419ef8bf1e06f5a3c824abc61559c4906488eefb46058801a907b67e6b7ab3cbaa558f8a23653f1c557f8d1e17ffd66aed9ea2b6979c65e2a21a0a58f5470305
-Size (mpop-1.0.28.tar.bz2) = 289664 bytes
+SHA1 (mpop-1.2.5.tar.xz) = cf72f3a906ee7cbbe8d71a465a7b893b0af29c1a
+RMD160 (mpop-1.2.5.tar.xz) = 71c563ff2d0cf1a3189102ffe345699ee9a6349e
+SHA512 (mpop-1.2.5.tar.xz) = 9c724915f2f6b776ed0d8f27b3af5e2c86c63ccfd2eb4bcdf69f4f86f47d10ab23a21cd76e5ee173ba18bb7ccbc5f13a2dc9c2cbbfa91b9a40dddc5197c4c1de
+Size (mpop-1.2.5.tar.xz) = 269204 bytes
diff --git a/mail/mpop/options.mk b/mail/mpop/options.mk
index 0a0732eac49..ca78008d2aa 100644
--- a/mail/mpop/options.mk
+++ b/mail/mpop/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2005/11/13 03:09:20 minskim Exp $
+# $NetBSD: options.mk,v 1.2 2016/06/18 18:55:52 bsiegert Exp $
 #
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.mpop
@@ -10,13 +10,13 @@ PKG_SUGGESTED_OPTIONS=		ssl
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mgnutls)
-CONFIGURE_ARGS+=	--with-ssl=gnutls
+CONFIGURE_ARGS+=	--with-tls=gnutls
 .  include "../../security/gnutls/buildlink3.mk"
 .elif !empty(PKG_OPTIONS:Mssl)
-CONFIGURE_ARGS+=	--with-ssl=openssl
+CONFIGURE_ARGS+=	--with-tls=openssl
 .  include "../../security/openssl/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=	--disable-ssl
+CONFIGURE_ARGS+=	--disable-tls
 .endif
 
 .if !empty(PKG_OPTIONS:Mgsasl)