git: c0708e4a9ac2 - main - net-im/sshout: Update 1.2.0 => 1.3.0

From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Sun, 21 Dec 2025 13:53:24 UTC
The branch main has been updated by vvd:

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

commit c0708e4a9ac20fec0ab47023a182fea1e7b4c9fa
Author:     WHR <whr@rivoreo.one>
AuthorDate: 2025-12-21 13:39:19 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-12-21 13:39:19 +0000

    net-im/sshout: Update 1.2.0 => 1.3.0
    
    Commit log:
    https://src.rivoreo.one/net/sshout-daemon/+log/1.3.0
    
    Improve port:
    * Strip executable files.
    * Update description.
    * Update the maintainer's email address.
    * Fix pkg-message.
    * Parametrize sshout with ${PORTNAME} in MASTER_SITES, USE_RC_SUBR,
      USERS, GROUPS.
    * Replace PORTVERSION with DISTVERSION in DISTNAME.
    * Sort OPTIONS_DEFINE.
    * Fix warnings from portclippy in order of options.
    * Remove unnecessary ".include <bsd.port.options.mk>".
    
    PR:             291826
    Co-authored-by: Vladimir Druzenko <vvd@FreeBSD.org>
---
 net-im/sshout/Makefile             | 48 +++++++++++++++++++-------------------
 net-im/sshout/distinfo             |  6 ++---
 net-im/sshout/files/patch-Makefile | 11 ---------
 net-im/sshout/pkg-descr            | 14 +++++------
 net-im/sshout/pkg-message          |  6 +++++
 5 files changed, 40 insertions(+), 45 deletions(-)

diff --git a/net-im/sshout/Makefile b/net-im/sshout/Makefile
index 5746a4be1d48..f53a28192038 100644
--- a/net-im/sshout/Makefile
+++ b/net-im/sshout/Makefile
@@ -1,11 +1,10 @@
 PORTNAME=	sshout
-DISTVERSION=	1.2.0
-PORTREVISION=	2
+DISTVERSION=	1.3.0
 CATEGORIES=	net-im
-MASTER_SITES=	SF/sshout/${PORTNAME}/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/
+DISTNAME=	${PORTNAME}-${DISTVERSION}-src
 
-MAINTAINER=	msl0000023508@gmail.com
+MAINTAINER=	whr@rivoreo.one
 COMMENT=	Instant-messaging service based on SSH
 WWW=		https://sourceforge.net/projects/sshout/
 
@@ -14,41 +13,42 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libmhash.so:security/mhash
 
-USES=		tar:bz2 gmake readline
+USES=		gmake iconv readline tar:bz2
+USE_RC_SUBR=	${PORTNAME}
 
-NO_WRKSUBDIR=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-MAKE_ENV=	LIBEXECDIR=\${PREFIX}/libexec \
-		MANDIR=\${PREFIX}/share/man
+MAKE_ENV=	ICONV_LIBS="${ICONV_LIB}" \
+		LIBEXECDIR=${PREFIX}/libexec \
+		MANDIR=${PREFIX}/share/man
 
-USE_RC_SUBR=	sshout
+NO_WRKSUBDIR=	yes
 
-USERS=		sshout
-GROUPS=		sshout
+USERS=		${PORTNAME}
+GROUPS=		${PORTNAME}
 
-OPTIONS_DEFINE=		NLS IRC
+OPTIONS_DEFINE=		IRC NLS
 OPTIONS_DEFAULT=	NLS
 OPTIONS_GROUP=		SUGGESTED
 OPTIONS_GROUP_SUGGESTED=XCLIP ELINKS
 
-SUGGESTED_DESC=		Suggested ports
+OPTIONS_SUB=		yes
 
-XCLIP_DESC=		Add dependency to xclip(1) for CLI pasteimage support
-XCLIP_RUN_DEPENDS=	xclip:x11/xclip
 ELINKS_DESC=		Add dependency to elinks(1) for showing HTML messages in CLI
+IRC_DESC=		Experimental IRC over SSH frontend
+SUGGESTED_DESC=		Suggested ports
+XCLIP_DESC=		Add dependency to xclip(1) for CLI pasteimage support
+
 ELINKS_RUN_DEPENDS=	elinks>=0.12:www/elinks
 
+IRC_CPPFLAGS=		-D ENABLE_IRC_FRONTEND=1
+
 NLS_USES=		gettext
 NLS_MAKE_ENV=		NLS_LIBS="-l intl"
 NLS_MAKE_ENV_OFF=	NO_NLS=1
 
-IRC_DESC=		Experimental IRC over SSH frontend
-IRC_CPPFLAGS=		-D ENABLE_IRC_FRONTEND=1
-
-OPTIONS_SUB=		yes
+XCLIP_RUN_DEPENDS=	xclip:x11/xclip
 
-.include <bsd.port.options.mk>
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/sshoutd \
+		${STAGEDIR}${PREFIX}/sbin/sshoutcfg
 
 .include <bsd.port.mk>
diff --git a/net-im/sshout/distinfo b/net-im/sshout/distinfo
index d0f80eca969f..8993bbbda21b 100644
--- a/net-im/sshout/distinfo
+++ b/net-im/sshout/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1599058479
-SHA256 (sshout-1.2.0-src.tar.bz2) = ced431585228186e5029f2c4cff76802b76eb6389fe78d5e9c14b0289a535b22
-SIZE (sshout-1.2.0-src.tar.bz2) = 45150
+TIMESTAMP = 1766203530
+SHA256 (sshout-1.3.0-src.tar.bz2) = 81d383ddb78a8abd0e5577152a1a9714a435075f52cf98dc73c784b5dc668af8
+SIZE (sshout-1.3.0-src.tar.bz2) = 46288
diff --git a/net-im/sshout/files/patch-Makefile b/net-im/sshout/files/patch-Makefile
deleted file mode 100644
index 0cb7636ea882..000000000000
--- a/net-im/sshout/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2020-09-01 11:34:08 UTC
-+++ Makefile
-@@ -4,7 +4,7 @@
- INSTALL ?= install
- MSGFMT ?= msgfmt
- 
--CFLAGS += -Wall -Wno-switch -Wno-pointer-to-int-cast -O1
-+CFLAGS += -Wall -Wno-switch -Wno-pointer-to-int-cast
- #LIBS += 
- 
- #SOCKET_LIBS := -l socket
diff --git a/net-im/sshout/pkg-descr b/net-im/sshout/pkg-descr
index f37119642b78..0ba448143d20 100644
--- a/net-im/sshout/pkg-descr
+++ b/net-im/sshout/pkg-descr
@@ -1,9 +1,9 @@
-Secure Shout Host Oriented Unified Talk is an instant-messaging platform
-designed to make uses of the existing SSH server in your system.
+SSHOUT is an instant-messaging platform designed to make uses of the existing
+OpenSSH SSH server in your system.
 SSHOUT creates a private chat room in your host. The authentication of the
 chat room is done by SSH public authentication. Users can join your chat room
-by either directly connecting your SSH server with any SSH client; or using a
-SSHOUT client that implemented the client side SSHOUT API.
-This package provides the SSHOUT server side programs; if you are finding a
-SSHOUT client, go to project page and find out a suitable client; or you can
-also write your own client using SSHOUT API.
+by either directly connecting the SSH server with any SSH client, or by using
+a SSHOUT client that implements the client side SSHOUT API.
+This package provides the SSHOUT server side programs; if you are looking for
+a SSHOUT client software, see the project page. You can also create your own
+client software using the SSHOUT API.
diff --git a/net-im/sshout/pkg-message b/net-im/sshout/pkg-message
index 322176dbe53f..2dcb864d5e0a 100644
--- a/net-im/sshout/pkg-message
+++ b/net-im/sshout/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 #### NOTES OF SSHOUT
 In order to start sshout service you need some more configuration:
 
@@ -10,3 +13,6 @@ Suggested ports:
 x11/xclip	For '/pasteimage' command to work in CLI frontend
 www/elinks	For HTML messages be properly displayed in CLI frontend
 #### END
+EOM
+}
+]