Index: head/mail/msmtp/Makefile
===================================================================
--- head/mail/msmtp/Makefile	(revision 402463)
+++ head/mail/msmtp/Makefile	(revision 402464)
@@ -1,94 +1,69 @@
 # Created by: R.I.Pienaar <rip@devco.net>
 # $FreeBSD$
 
 PORTNAME=	msmtp
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	SF
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	SMTP plugin for MUAs
 
 LICENSE=	GPLv3
 
 GNU_CONFIGURE=	yes
 USES=		gmake makeinfo pkgconfig tar:xz
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INFO=	msmtp
 
-OPTIONS_DEFINE=	GSASL NLS IDN GNOMEKEYRING MSMTPQ
+OPTIONS_DEFINE=	DOCS GSASL NLS IDN LIBSECRET MSMTPQ
 OPTIONS_RADIO=	TLS
 OPTIONS_RADIO_TLS=	GNUTLS OPENSSL
 OPTIONS_DEFAULT=	MSMTPQ OPENSSL
+OPTIONS_SUB=	yes
 
 GSASL_DESC=	GSASL support
+LIBSECRET_DESC=	GNOME password management
 MSMTPQ_DESC=	Install offline messaging scripts
 
-.include       <bsd.port.options.mk>
+GSASL_CONFIGURE_WITH=	libgsasl
+GSASL_LIB_DEPENDS=	libgsasl.so:${PORTSDIR}/security/gsasl
+IDN_CONFIGURE_WITH=	libidn
+IDN_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
+LIBSECRET_CONFIGURE_WITH=	libsecret
+LIBSECRET_LIB_DEPENDS=	libsecret-1.so:${PORTSDIR}/security/libsecret
+MSMTPQ_PORTDOCS=	README.msmtpq
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext
 
-.if ${PORT_OPTIONS:MGNUTLS}
-LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
-CONFIGURE_ARGS+=	--with-ssl=gnutls
-.elif ${PORT_OPTIONS:MOPENSSL}
-USE_OPENSSL=	yes
-CONFIGURE_ARGS+=	--with-ssl=openssl
-CONFIGURE_ENV+=		libssl_CFLAGS="-I${OPENSSLINC}" \
+GNUTLS_CONFIGURE_ON=	--with-ssl=gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+OPENSSL_VARS=		USE_OPENSSL=yes
+OPENSSL_CONFIGURE_ON=	--with-ssl=openssl
+OPENSSL_CONFIGURE_ENV=	libssl_CFLAGS="-I${OPENSSLINC}" \
 			libssl_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
-.else
-CONFIGURE_ARGS+=	--with-ssl=no
-.endif
+CERTSFILE=		${LOCALBASE}/share/certs/ca-root-nss.crt
 
-.if ${PORT_OPTIONS:MGNUTLS} || ${PORT_OPTIONS:MOPENSSL}
-RUN_DEPENDS+=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
-.endif
+.include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MGSASL}
-LIB_DEPENDS+=	libgsasl.so:${PORTSDIR}/security/gsasl
-CONFIGURE_ARGS+=	--with-libgsasl
+.if ${PORT_OPTIONS:MGNUTLS} || ${PORT_OPTIONS:MOPENSSL}
+RUN_DEPENDS+=	${CERTSFILE}:${PORTSDIR}/security/ca_root_nss
 .else
-CONFIGURE_ARGS+=	--without-libgsasl
+CONFIGURE_ARGS+=	--with-ssl=no
 .endif
 
-.if ${PORT_OPTIONS:MIDN}
-LIB_DEPENDS+=	libidn.so:${PORTSDIR}/dns/libidn
-CONFIGURE_ARGS+=	--with-libidn
-.else
-CONFIGURE_ARGS+=	--without-libidn
-.endif
-
-.if ${PORT_OPTIONS:MGNOMEKEYRING}
-CONFIGURE_ARGS+=	--with-gnome-keyring
-LIB_DEPENDS+=	libgnome-keyring.so:${PORTSDIR}/security/gnome-keyring
-.else
-CONFIGURE_ARGS+=	--without-gnome-keyring
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CONFIGURE_ARGS+=	--enable-nls
-PLIST_SUB+=		NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=		NLS="@comment "
-.endif
-
-.include <bsd.port.pre.mk>
-
 post-extract:
-	@${REINPLACE_CMD} -e 's|/etc/ssl/certs/ca\\-certificates.crt|${LOCALBASE}/share/certs/ca\\-root\\-nss.crt|' \
+	@${REINPLACE_CMD} -e 's|/etc/ssl/certs/ca\\-certificates.crt|${CERTSFILE}|' \
 		${WRKSRC}/doc/msmtp.1
 
 .if ${PORT_OPTIONS:MMSMTPQ}
-PLIST_SUB+=	MSMTPQ=""
-
-post-install:
+post-stage:
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/msmtpq/msmtp-queue ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/msmtpq/msmtpq ${STAGEDIR}${PREFIX}/bin
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/scripts/msmtpq/README.msmtpq ${STAGEDIR}${DOCSDIR}
-.else
-PLIST_SUB+=	MSMTPQ="@comment "
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/msmtpq/README.msmtpq ${STAGEDIR}${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: head/mail/msmtp/pkg-plist
===================================================================
--- head/mail/msmtp/pkg-plist	(revision 402463)
+++ head/mail/msmtp/pkg-plist	(revision 402464)
@@ -1,6 +1,5 @@
 bin/msmtp
 man/man1/msmtp.1.gz
 %%MSMTPQ%%bin/msmtp-queue
 %%MSMTPQ%%bin/msmtpq
-%%MSMTPQ%%%%DOCSDIR%%/README.msmtpq
 %%NLS%%share/locale/de/LC_MESSAGES/msmtp.mo