git: 26b8261e5769 - main - mail/mpop: Update to 1.4.19

From: Wen Heping <wen_at_FreeBSD.org>
Date: Sun, 23 Jun 2024 04:47:13 UTC
The branch main has been updated by wen:

URL: https://cgit.FreeBSD.org/ports/commit/?id=26b8261e5769bd5b38fc955952a493346b256305

commit 26b8261e5769bd5b38fc955952a493346b256305
Author:     Wen Heping <wen@FreeBSD.org>
AuthorDate: 2024-06-23 04:46:01 +0000
Commit:     Wen Heping <wen@FreeBSD.org>
CommitDate: 2024-06-23 04:46:01 +0000

    mail/mpop: Update to 1.4.19
    
    PR:             279562
    Reported by:    mew14930xvi@inbox.lv
---
 mail/mpop/Makefile  | 36 +++++++++++++++++++++---------------
 mail/mpop/distinfo  |  6 +++---
 mail/mpop/pkg-plist | 24 +++++++++++++-----------
 3 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/mail/mpop/Makefile b/mail/mpop/Makefile
index c639989fdbe4..efa82f193c6b 100644
--- a/mail/mpop/Makefile
+++ b/mail/mpop/Makefile
@@ -1,52 +1,58 @@
 PORTNAME=	mpop
-DISTVERSION=	1.4.18
+DISTVERSION=	1.4.19
 CATEGORIES=	mail
 MASTER_SITES=	https://marlam.de/mpop/releases/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mew14930xvi@inbox.lv
 COMMENT=	Small and fast POP3 client
 WWW=		https://marlam.de/mpop/
 
 LICENSE=	GPLv3+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		cpe gettext gmake makeinfo pkgconfig tar:xz
+USES=		cpe gmake makeinfo pkgconfig tar:xz
 CPE_VENDOR=	martin_lambers
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--with-tls=no
-LDFLAGS+=	-L${LOCALBASE}/lib -lintl
-
 INFO=		mpop
+PORTDOCS=	mpoprc.example
 
-OPTIONS_DEFINE=		GSASL IDN LIBSECRET
+OPTIONS_DEFINE=		DOCS GSASL IDN LIBSECRET MPOPD NLS
+OPTIONS_DEFAULT=	GNUTLS IDN MPOPD
 OPTIONS_RADIO=		TLS
 OPTIONS_RADIO_TLS=	GNUTLS LIBTLS OPENSSL
-OPTIONS_DEFAULT=	GNUTLS IDN
 OPTIONS_SUB=		yes
 
+GSASL_DESC=		${SASL_DESC} via GNU SASL
+LIBSECRET_DESC=		GNOME password management
+LIBTLS_DESC=		SSL/TLS support via libtls
+MPOPD_DESC=		Include minimal POP3 server
+
 GNUTLS_LIB_DEPENDS=		libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_ON=		--with-tls=gnutls
-GSASL_DESC=			${SASL_DESC} via GNU SASL
 GSASL_LIB_DEPENDS=		libgsasl.so:security/libgsasl
 GSASL_CONFIGURE_WITH=		libgsasl
 IDN_LIB_DEPENDS=		libidn2.so:dns/libidn2
 IDN_CONFIGURE_WITH=		libidn
-LIBSECRET_DESC=			GNOME password management
 LIBSECRET_LIB_DEPENDS=		libsecret-1.so:security/libsecret
 LIBSECRET_CONFIGURE_WITH=	libsecret
-LIBTLS_DESC=			SSL/TLS support via libtls
 LIBTLS_LIB_DEPENDS=		libtls.so:security/${"${SSL_DEFAULT:Mlibressl*}":?libressl:libretls}
 LIBTLS_CONFIGURE_ON=		--with-tls=libtls
+MPOPD_CONFIGURE_WITH=		mpopd
+NLS_USES=			gettext
+NLS_CONFIGURE_ENABLE=		nls
 OPENSSL_USES=			ssl
+OPENSSL_CONFIGURE_ON=		--with-tls=openssl
 OPENSSL_CONFIGURE_ENV=		${OPENSSLINC:M/usr/include:C,.+,libssl_CFLAGS=" ",} \
 				${OPENSSLLIB:M/usr/lib:C,.+,libssl_LIBS="-lssl -lcrypto",}
-OPENSSL_CONFIGURE_ON=		--with-tls=openssl
 
 post-patch:
-	@${REINPLACE_CMD} -Ee 's/Debian/${OPSYS}/' \
-		-e 's,/etc/ssl/certs,${LOCALBASE}/share/certs,' \
+	@${REINPLACE_CMD} -E -e 's,/etc/ssl/certs,${LOCALBASE}/share/certs,' \
 		-e '/crt/s/ca(\\?)-certificates/ca\1-root\1-nss/' \
-		-e 's/ca\\?-certificates/ca_root_nss/' \
 		${WRKSRC}/doc/mpop*
 
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+
 .include <bsd.port.mk>
diff --git a/mail/mpop/distinfo b/mail/mpop/distinfo
index cfd12fc89288..a1b1a2f7bbb3 100644
--- a/mail/mpop/distinfo
+++ b/mail/mpop/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709836161
-SHA256 (mpop-1.4.18.tar.xz) = 6099950184f7d094a782d1e7ab9833736f12308d34a544a59b46a8471d9f85b7
-SIZE (mpop-1.4.18.tar.xz) = 382564
+TIMESTAMP = 1717551060
+SHA256 (mpop-1.4.19.tar.xz) = 23c41e13c6ffebcaade2c36c9fd462bf25f623e481bb0627cfe093e03a555c8a
+SIZE (mpop-1.4.19.tar.xz) = 400740
diff --git a/mail/mpop/pkg-plist b/mail/mpop/pkg-plist
index ac81d2342b9c..58e5c3ba0aea 100644
--- a/mail/mpop/pkg-plist
+++ b/mail/mpop/pkg-plist
@@ -1,13 +1,15 @@
 bin/mpop
-bin/mpopd
+%%MPOPD%%bin/mpopd
+%%NLS%%share/locale/de/LC_MESSAGES/mpop.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/mpop.mo
+%%NLS%%share/locale/es/LC_MESSAGES/mpop.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/mpop.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/mpop.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/mpop.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/mpop.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/mpop.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/mpop.mo
+%%NLS%%share/locale/ta/LC_MESSAGES/mpop.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/mpop.mo
 share/man/man1/mpop.1.gz
-share/man/man1/mpopd.1.gz
-share/locale/de/LC_MESSAGES/mpop.mo
-share/locale/eo/LC_MESSAGES/mpop.mo
-share/locale/es/LC_MESSAGES/mpop.mo
-share/locale/fr/LC_MESSAGES/mpop.mo
-share/locale/pt_BR/LC_MESSAGES/mpop.mo
-share/locale/sr/LC_MESSAGES/mpop.mo
-share/locale/sv/LC_MESSAGES/mpop.mo
-share/locale/ta/LC_MESSAGES/mpop.mo
-share/locale/uk/LC_MESSAGES/mpop.mo
+%%MPOPD%%share/man/man1/mpopd.1.gz