git: 46e00f0b6588 - main - net-im/loudmouth: update to 1.5.4

[Tobias C. Berner]

The branch main has been updated by tcberner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=46e00f0b65882160df82ce51c0b168637beaf5fb

commit 46e00f0b65882160df82ce51c0b168637beaf5fb
Author:     Tobias C. Berner <tcberner at FreeBSD.org>
AuthorDate: 2021-07-16 09:17:18 +0000
Commit:     Tobias C. Berner <tcberner at FreeBSD.org>
CommitDate: 2021-07-16 09:18:08 +0000

    net-im/loudmouth: update to 1.5.4
    
    - remove defunct DOCS option
    - cleanup options handling for SSL options
---
 net-im/loudmouth/Makefile  | 32 +++++++++++++++++---------------
 net-im/loudmouth/distinfo  |  5 +++--
 net-im/loudmouth/pkg-plist | 20 --------------------
 3 files changed, 20 insertions(+), 37 deletions(-)

diff --git a/net-im/loudmouth/Makefile b/net-im/loudmouth/Makefile
index 7ad57b8bc1ac..7925c72c9194 100644
--- a/net-im/loudmouth/Makefile
+++ b/net-im/loudmouth/Makefile
@@ -2,8 +2,7 @@
 #   $MCom: ports/trunk/net-im/loudmouth/Makefile 19914 2014-09-25 22:33:21Z kwm $
 
 PORTNAME=	loudmouth
-PORTVERSION=	1.5.3
-PORTREVISION=	1
+DISTVERSION=	1.5.4
 CATEGORIES=	net-im
 MASTER_SITES=	https://mcabber.com/files/loudmouth/ \
 		http://www.lilotux.net/~mikael/mcabber/files/loudmouth/
@@ -20,26 +19,29 @@ USES=		gettext gmake gnome libtool pkgconfig tar:bzip2
 USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--disable-gtk-doc --disable-rebuilds \
+CONFIGURE_ARGS=	--disable-rebuilds \
+		--disable-gtk-doc \
+		--with-compile-warnings=no \
 		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
 INSTALL_TARGET=	install-strip
 
-OPTIONS_DEFINE=	DOCS
-OPTIONS_DEFAULT=GNUTLS
-OPTIONS_RADIO=	SSL
+OPTIONS_DEFINE=		DOCS
+OPTIONS_RADIO=		SSL
 OPTIONS_RADIO_SSL=	GNUTLS OPENSSL
 
+OPTIONS_DEFAULT=	GNUTLS
+
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
+GNUTLS_CONFIGURE_ON=	--with-ssl=gnutls
+
+OPENSSL_USES=		ssl
+OPENSSL_CONFIGURE_ON=	--with-ssl=openssl
+OPENSSL_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
+
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MGNUTLS}
-LIB_DEPENDS+=	libgnutls.so:security/gnutls
-CONFIGURE_ARGS+=--with-ssl=gnutls
-.elif ${PORT_OPTIONS:MOPENSSL}
-USES+=		ssl
-CONFIGURE_ARGS+=--with-ssl=openssl
-RUN_DEPENDS+=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
-.else
-CONFIGURE_ARGS+=--without-ssl
+.if empty(PORT_OPTIONS:MGNUTLS) && empty(PORT_OPTIONS:MOPENSSL)
+CONFIGURE_ARGS+=	--without-ssl
 .endif
 
 .include <bsd.port.mk>
diff --git a/net-im/loudmouth/distinfo b/net-im/loudmouth/distinfo
index 0ec15d3ab041..652ee1508d9f 100644
--- a/net-im/loudmouth/distinfo
+++ b/net-im/loudmouth/distinfo
@@ -1,2 +1,3 @@
-SHA256 (loudmouth-1.5.3.tar.bz2) = 54329415cb1bacb783c20f5f1f975de4fc460165d0d8a1e3b789367b5f69d32c
-SIZE (loudmouth-1.5.3.tar.bz2) = 375974
+TIMESTAMP = 1626423379
+SHA256 (loudmouth-1.5.4.tar.bz2) = 31cbc91c1fddcc5346b3373b8fb45594e9ea9cc7fe36d0595e8912c47ad94d0d
+SIZE (loudmouth-1.5.4.tar.bz2) = 361323
diff --git a/net-im/loudmouth/pkg-plist b/net-im/loudmouth/pkg-plist
index 656f333df002..a801d6c05b6e 100644
--- a/net-im/loudmouth/pkg-plist
+++ b/net-im/loudmouth/pkg-plist
@@ -12,23 +12,3 @@ lib/libloudmouth-1.so
 lib/libloudmouth-1.so.0
 lib/libloudmouth-1.so.0.1.0
 libdata/pkgconfig/loudmouth-1.0.pc
-%%PORTDOCS%%share/gtk-doc/html/loudmouth/ch01.html
-%%PORTDOCS%%share/gtk-doc/html/loudmouth/home.png
-%%PORTDOCS%%share/gtk-doc/html/loudmouth/index.html
-%%PORTDOCS%%share/gtk-doc/html/loudmouth/index.sgml
-%%PORTDOCS%%share/gtk-doc/html/loudmouth/left-insensitive.png
-%%PORTDOCS%%share/gtk-doc/html/loudmouth/left.png
-%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-LmConnection.html
-%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-LmError.html
-%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-LmMessage.html
-%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-LmMessageHandler.html
-%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-LmMessageNode.html
-%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-LmProxy.html
-%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-LmSSL.html
-%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-Miscellaneous-Utility-Functions.html
-%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth.devhelp2
-%%PORTDOCS%%share/gtk-doc/html/loudmouth/right-insensitive.png
-%%PORTDOCS%%share/gtk-doc/html/loudmouth/right.png
-%%PORTDOCS%%share/gtk-doc/html/loudmouth/style.css
-%%PORTDOCS%%share/gtk-doc/html/loudmouth/up-insensitive.png
-%%PORTDOCS%%share/gtk-doc/html/loudmouth/up.png