From nobody Tue Apr 19 06:38:08 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0A04C11E312E; Tue, 19 Apr 2022 06:38:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KjDdX6YvPz3lJb; Tue, 19 Apr 2022 06:38:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650350288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UqSR7yaH965UwtKonS366ZKPZ1UPm3eF26rBW9+ALDU=; b=jQj++p6HvAZTldnYR7OijDRYOgCsHNDS0S5/MM6SO1dI+n+vnBaEIAWs1tkOgsA0eZkDJM kBrzgB2nJmyWdPOvI0H/rl09mFPpnn3flB0JHxhveO0GXrLS8yxiCPhS/sqfkgDqpjw4h7 4n1HnAL/d3BX0GvS1q6XupaLlA2IcPZd35FeZyJy5d1uA+a5QRJ7+UCzYNoTEtm8/Z8fLI OeoJdywoQdBAKkn4qCoSY92EZXsKxq6B/GABOHmi2/E99R5WblWWubCud9xw3/jk9gwxuS kOwve58mD0/UXfCFCY+pU130yoV1D8JOCQ0qDiOh9NsoKask4VBohw3+oF71Pg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C1D3822172; Tue, 19 Apr 2022 06:38:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23J6c8AP020095; Tue, 19 Apr 2022 06:38:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23J6c85P020094; Tue, 19 Apr 2022 06:38:08 GMT (envelope-from git) Date: Tue, 19 Apr 2022 06:38:08 GMT Message-Id: <202204190638.23J6c85P020094@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: 45125c023de5 - main - net-im/sshout: fix optimization compiling option and update optional dependency List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 45125c023de5e914ddc1aa78540d24fb2ce7e364 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650350288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UqSR7yaH965UwtKonS366ZKPZ1UPm3eF26rBW9+ALDU=; b=OY7eqgaIUEgu9IDnPHTU6MYXLbB+Nrv7TNnc137lZaSrIViBi1VZmUIfNtv5ZnQXSg5BLg yVwXe5CyLDjpxPJnYnz3jvBM0OE2aIgHr7TdNrAAi9ILY8l7GcnG255h+ObNJ1uACl8n65 Ihzq8vty4PqPZvO7VWQAgObu7sKky/gODjIE4uK8/oFha8xe87U+4MkBVh0W5AledmYbl7 kbXqoRA3pj8ewkeF34HYAsMvkqU4ROwYuvoAT/rEp1bRo/D7BiWvyxUtQzW2pTB9T84JJn lPJHDMSW0IyFth2lZw9mecdib/Y0JmdviMRwv8rEtTQto5rSMCUbvO9N/rMx5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650350288; a=rsa-sha256; cv=none; b=eJrd/bseZIsBDawFxZvc0GIO3Jli9VKgMaAq2/iASkGqHw9O1j07vLKHvUmxbkl1L6wD5a 19PQ+TxsHTPTJGO/p9VdqiBS6qlV5MFT4GxJpnXgQXK/Kr/bzWEO3EHzCfoxAXj26dP+Vl fIUJO3gkyvHu+Jz0NUZt3/rGy5dWuc+VK4A/tnVBcY6WYcf2hRoPe5gB9Ah6iF8BI6f3K7 9MXjz+xYc+hsYB7to+hankE/IxzHKpR982ayZAHaP15nDqxNqqT0T83xsTpq2IPZd8sXuC kb0wIXwO12zSJlm5hSYXtWObc056jKH0FeW4j5S3ZPiiHhN2rlWlGgrwG5h3pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=45125c023de5e914ddc1aa78540d24fb2ce7e364 commit 45125c023de5e914ddc1aa78540d24fb2ce7e364 Author: WHR AuthorDate: 2022-04-18 14:36:18 +0000 Commit: Mikael Urankar CommitDate: 2022-04-19 06:36:02 +0000 net-im/sshout: fix optimization compiling option and update optional dependency This update fixes the followings: - The current upstream Makefile appends '-O1' to CFLAGS, which would inadvertently override any previous optimization option that passed by the user. - www/elinks has recently been updated to a supported version add optional dependency to it, and remove the related note in 'pkg-message'. PR: 263391 --- net-im/sshout/Makefile | 13 ++++++++----- net-im/sshout/files/patch-Makefile | 11 +++++++++++ net-im/sshout/pkg-message | 7 +++---- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/net-im/sshout/Makefile b/net-im/sshout/Makefile index 787578caea61..8a5ec7456b7a 100644 --- a/net-im/sshout/Makefile +++ b/net-im/sshout/Makefile @@ -1,5 +1,6 @@ PORTNAME= sshout DISTVERSION= 1.2.0 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= SF/sshout/${PORTNAME}/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -29,13 +30,19 @@ GROUPS= sshout OPTIONS_DEFINE= NLS IRC OPTIONS_DEFAULT= NLS OPTIONS_GROUP= SUGGESTED -OPTIONS_GROUP_SUGGESTED=XCLIP +OPTIONS_GROUP_SUGGESTED=XCLIP ELINKS SUGGESTED_DESC= Suggested ports + 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 +ELINKS_RUN_DEPENDS= elinks>=0.12:www/elinks + 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 @@ -43,8 +50,4 @@ OPTIONS_SUB= yes .include -.if ${PORT_OPTIONS:MXCLIP} -RUN_DEPENDS+= ${LOCALBASE}/bin/xclip:x11/xclip -.endif - .include diff --git a/net-im/sshout/files/patch-Makefile b/net-im/sshout/files/patch-Makefile new file mode 100644 index 000000000000..0cb7636ea882 --- /dev/null +++ b/net-im/sshout/files/patch-Makefile @@ -0,0 +1,11 @@ +--- 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-message b/net-im/sshout/pkg-message index 454cb7bc8b69..322176dbe53f 100644 --- a/net-im/sshout/pkg-message +++ b/net-im/sshout/pkg-message @@ -6,8 +6,7 @@ In order to start sshout service you need some more configuration: If you installed SSHOUT for the first time, use sshoutcfg(8) to add users. You must have SSH server running and accepting public key authentication. -For HTML messages be properly displayed in CLI frontend, elinks(1) version -0.12 or later is required; however the ports tree currently doesn't have an -up-to-date elinks version available. You will have to install the required -version manually, if such support is needed. +Suggested ports: +x11/xclip For '/pasteimage' command to work in CLI frontend +www/elinks For HTML messages be properly displayed in CLI frontend #### END