Index: mail/mpop/Makefile
===================================================================
--- mail/mpop/Makefile
+++ mail/mpop/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mpop
-DISTVERSION=	1.2.0
+DISTVERSION=	1.2.2
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}
 
@@ -18,13 +18,13 @@
 INFO=		mpop
 
 OPTIONS_DEFINE=		GSASL IDN LIBSECRET NLS
-OPTIONS_RADIO=		SSL
-OPTIONS_RADIO_SSL=	GNUTLS OPENSSL
+OPTIONS_RADIO=		TLS
+OPTIONS_RADIO_TLS=	GNUTLS OPENSSL
 OPTIONS_DEFAULT=	IDN OPENSSL
 OPTIONS_SUB=		yes
 
 GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
-GNUTLS_CONFIGURE_ON=	--with-ssl=gnutls
+GNUTLS_CONFIGURE_ON=	--with-tls=gnutls
 GSASL_DESC=		SASL authentication support via GNU SASL
 GSASL_LIB_DEPENDS=	libgsasl.so:${PORTSDIR}/security/gsasl
 GSASL_CONFIGURE_OFF=	--without-libgsasl
@@ -36,14 +36,14 @@
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 OPENSSL_USE=		openssl=yes
-OPENSSL_CONFIGURE_ON=	--with-ssl=openssl \
+OPENSSL_CONFIGURE_ON=	--with-tls=openssl \
 			libssl_CFLAGS=-I${OPENSSLINC} \
 			libssl_LIBS="-lssl -lcrypto"
 
 .include <bsd.port.options.mk>
 
 .if empty(PORT_OPTIONS:MGNUTLS) && empty(PORT_OPTIONS:MOPENSSL)
-CONFIGURE_ARGS+=	--with-ssl=no
+CONFIGURE_ARGS+=	--with-tls=no
 .endif
 
 .include <bsd.port.mk>
Index: mail/mpop/distinfo
===================================================================
--- mail/mpop/distinfo
+++ mail/mpop/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mpop-1.2.0.tar.xz) = 9d28817a6950f64aadf10bf5841400701917102181ebf96c136fbd4707c17ba7
-SIZE (mpop-1.2.0.tar.xz) = 264560
+SHA256 (mpop-1.2.2.tar.xz) = d1e7d7d18147996cfc6195cdfb936ca51620cb841a7460043d8cc838ca48bfc3
+SIZE (mpop-1.2.2.tar.xz) = 266272