Date: Wed, 27 Jul 2022 14:27:25 GMT From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 131f741e5a0f - main - net-im/prosody: use pkg-message to show message on remove Message-ID: <202207271427.26RERPlu066293@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=131f741e5a0f18883c97869be63b68367604bc5b commit 131f741e5a0f18883c97869be63b68367604bc5b Author: Baptiste Daroussin <bapt@FreeBSD.org> AuthorDate: 2022-07-27 14:22:42 +0000 Commit: Baptiste Daroussin <bapt@FreeBSD.org> CommitDate: 2022-07-27 14:27:13 +0000 net-im/prosody: use pkg-message to show message on remove --- net-im/prosody/Makefile | 5 +++-- net-im/prosody/files/pkg-deinstall.in | 22 ---------------------- net-im/prosody/files/pkg-message.in | 30 ++++++++++++++++++++++++++++++ net-im/prosody/pkg-message | 12 ------------ 4 files changed, 33 insertions(+), 36 deletions(-) diff --git a/net-im/prosody/Makefile b/net-im/prosody/Makefile index 37f23d4eea1a..0b12532be1a4 100644 --- a/net-im/prosody/Makefile +++ b/net-im/prosody/Makefile @@ -1,5 +1,6 @@ PORTNAME= prosody DISTVERSION= 0.12.1 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= https://prosody.im/downloads/source/ @@ -44,8 +45,8 @@ USERS= prosody GROUPS= ${USERS} USE_RC_SUBR= prosody -SUB_FILES= pkg-deinstall -SUB_LIST= USERS=${USERS} GROUPS=${GROUPS} LUA_PREFIX=${LUA_PREFIX} LUA_CMD=${LUA_CMD} +SUB_FILES= pkg-message +SUB_LIST= USERS=${USERS} GROUPS=${GROUPS} LUA_PREFIX=${LUA_PREFIX} LUA_CMD=${LUA_CMD} PORTNAME="${PORTNAME}" PLIST_SUB= PROSODY_USER=${USERS} PROSODY_GROUP=${GROUPS} post-install: diff --git a/net-im/prosody/files/pkg-deinstall.in b/net-im/prosody/files/pkg-deinstall.in deleted file mode 100644 index 91071be27459..000000000000 --- a/net-im/prosody/files/pkg-deinstall.in +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -case $2 in -POST-DEINSTALL) - echo "===> post-deinstallation information for $1:" - echo "" - echo " Note:" - echo " Prosody related user accounts and groups were not removed." - echo "" - echo " To remove the user and group which were created by " - echo " the installation of this package, run:" - echo "" - echo " pw userdel -n %%USERS%%" - echo " pw groupdel -n %%GROUPS%%" - echo "" - echo " and to remove all server data:" - echo " rm -rf /var/db/prosody" - echo " rm -rf /var/run/prosody" - echo "" - ;; -esac -exit 0 diff --git a/net-im/prosody/files/pkg-message.in b/net-im/prosody/files/pkg-message.in new file mode 100644 index 000000000000..09cb718c3642 --- /dev/null +++ b/net-im/prosody/files/pkg-message.in @@ -0,0 +1,30 @@ +[ +{ type: install + message: <<EOM +If you're running Prosody in a jail and experience problems, please add +the following to the global section of your prosody.cfg.lua: + +interfaces = { 'x.x.x.x' } + +where 'x.x.x.x' is the public IP you wish Prosody to bind to. +EOM +}, +{ type: remove + message: <<EOM +===> post-deinstallation information for %%PORTNAME%%:" + + Note: + Prosody related user accounts and groups were not removed. + + To remove the user and group which were created by + the installation of this package, run: + + pw userdel -n %%USERS%% + pw groupdel -n %%GROUPS%% + + and to remove all server data: + rm -rf /var/db/prosody" + rm -rf /var/run/prosody" +EOM +} +] diff --git a/net-im/prosody/pkg-message b/net-im/prosody/pkg-message deleted file mode 100644 index f8c04cf9daef..000000000000 --- a/net-im/prosody/pkg-message +++ /dev/null @@ -1,12 +0,0 @@ -[ -{ type: install - message: <<EOM -If you're running Prosody in a jail and experience problems, please add -the following to the global section of your prosody.cfg.lua: - -interfaces = { 'x.x.x.x' } - -where 'x.x.x.x' is the public IP you wish Prosody to bind to. -EOM -} -]
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202207271427.26RERPlu066293>