From owner-svn-ports-all@freebsd.org Sun Sep 13 04:42:20 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 93B2D3EC9E9; Sun, 13 Sep 2020 04:42:20 +0000 (UTC) (envelope-from lwhsu@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bpxg03LTSz3S5r; Sun, 13 Sep 2020 04:42:20 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 56BD620AE1; Sun, 13 Sep 2020 04:42:20 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08D4gKwO030013; Sun, 13 Sep 2020 04:42:20 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08D4gJPV029903; Sun, 13 Sep 2020 04:42:19 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <202009130442.08D4gJPV029903@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Sun, 13 Sep 2020 04:42:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548450 - in head/net-im/prosody: . files X-SVN-Group: ports-head X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: in head/net-im/prosody: . files X-SVN-Commit-Revision: 548450 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Sep 2020 04:42:20 -0000 Author: lwhsu Date: Sun Sep 13 04:42:19 2020 New Revision: 548450 URL: https://svnweb.freebsd.org/changeset/ports/548450 Log: net-im/prosody: Do not use prosodyctl in init script * Apply shebangfix. * Update init script to directly control the Prosody daemon as using prosodyctl has been deprecated. [1] * Add pkg-message to clearly state that setting the pidfile option in prosody.cfg.lua is required. * Fix pkg-message formatting. [1] https://blog.prosody.im/prosody-0.11.6-released/ PR: 249276 Submitted by: Thomas Morper (maintainer) Modified: head/net-im/prosody/Makefile head/net-im/prosody/files/prosody.in head/net-im/prosody/pkg-message Modified: head/net-im/prosody/Makefile ============================================================================== --- head/net-im/prosody/Makefile Sun Sep 13 04:31:14 2020 (r548449) +++ head/net-im/prosody/Makefile Sun Sep 13 04:42:19 2020 (r548450) @@ -3,6 +3,7 @@ PORTNAME= prosody PORTVERSION= 0.11.6 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= https://prosody.im/downloads/source/ @@ -19,7 +20,8 @@ RUN_DEPENDS= ${LUA_REFMODLIBDIR}/socket/core.so:net/lu ${LUA_REFMODLIBDIR}/bit.so:devel/lua-bitop@${LUA_FLAVOR} LIB_DEPENDS= libidn.so:dns/libidn -USES= compiler:c11 cpe gmake lua:52 ssl +USES= compiler:c11 cpe gmake lua:52 shebangfix ssl +SHEBANG_FILES= prosody prosodyctl tools/migration/prosody-migrator.lua LUA_PREMK= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix="${PREFIX}" \ @@ -43,7 +45,7 @@ GROUPS= ${USERS} USE_RC_SUBR= prosody SUB_FILES= pkg-deinstall -SUB_LIST= USERS=${USERS} GROUPS=${GROUPS} +SUB_LIST= USERS=${USERS} GROUPS=${GROUPS} LUA_PREFIX=${LUA_PREFIX} LUA_CMD=${LUA_CMD} PLIST_SUB= PROSODY_USER=${USERS} \ PROSODY_USER_regex=\b${USERS}\b \ PROSODY_GROUP=${GROUPS} \ Modified: head/net-im/prosody/files/prosody.in ============================================================================== --- head/net-im/prosody/files/prosody.in Sun Sep 13 04:31:14 2020 (r548449) +++ head/net-im/prosody/files/prosody.in Sun Sep 13 04:42:19 2020 (r548450) @@ -16,25 +16,16 @@ name="prosody" rcvar="prosody_enable" -command="%%PREFIX%%/bin/prosodyctl" +command="%%PREFIX%%/bin/prosody" +command_args="-D" +command_interpreter="%%LUA_PREFIX%%/bin/%%LUA_CMD%%" +extra_commands="reload" +prosody_user="%%USERS%%" +prosody_group="%%GROUPS%%" load_rc_config $name prosody_enable=${prosody_enable:-"NO"} pidfile=${prosody_pidfile:-"/var/run/prosody/prosody.pid"} - -extra_commands="reload" -start_cmd="prosody_cmd start" -stop_cmd="prosody_cmd stop" -reload_cmd="prosody_cmd reload" -restart_cmd="prosody_cmd restart" -status_cmd="prosody_cmd status" - -export PATH="%%PREFIX%%/bin:$PATH" - -prosody_cmd() -{ - $command $1 -} run_rc_command "$1" Modified: head/net-im/prosody/pkg-message ============================================================================== --- head/net-im/prosody/pkg-message Sun Sep 13 04:31:14 2020 (r548449) +++ head/net-im/prosody/pkg-message Sun Sep 13 04:42:19 2020 (r548450) @@ -1,12 +1,20 @@ [ { type: install message: <