From nobody Wed Jul 27 14:27:25 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 4LtGML1j90z4XhP7; Wed, 27 Jul 2022 14:27:26 +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 4LtGML1FJMz3jLV; Wed, 27 Jul 2022 14:27:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658932046; 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=Z9OnZ+3QWvNviWH+IaZkIDWrBagbxSzb4o+2O9SpEo8=; b=dst2LHBUTOqVuJWuLHGX4c0jRR090oMq73vAE7tJ1rPQUmtQrUgnsbj3Hmj7nauWBDPmXU P8VdKGfEEhdA0vW9ixqolV1ies7rvc1ONWQ1hKvOBmXfO8dCnQLdg873wa2I67Vfz7ltb+ OKA3cc2Y6h1YJ8crJyKn7LaAFSIglQ5iy0BE452HjfNdg/0j/lsIGqzz3EfTLTRknxbF9m 7ZXE+P23g4RAEX8OoRjsDU5MhDh+fRs/Zr4y9HmaTFdWgpWAAwLYr/TMDERvn6SBYdVsSW +P1uRydhwmw692MkC2v1c58ZG0PiBk5DcilySB8xv2cZOU3QIK4MdUjCHjMqyQ== 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 4LtGML0Ld3zKVJ; Wed, 27 Jul 2022 14:27:26 +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 26RERPCS066294; Wed, 27 Jul 2022 14:27:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26RERPlu066293; Wed, 27 Jul 2022 14:27:25 GMT (envelope-from git) Date: Wed, 27 Jul 2022 14:27:25 GMT Message-Id: <202207271427.26RERPlu066293@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 131f741e5a0f - main - net-im/prosody: use pkg-message to show message on remove 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: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 131f741e5a0f18883c97869be63b68367604bc5b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658932046; 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=Z9OnZ+3QWvNviWH+IaZkIDWrBagbxSzb4o+2O9SpEo8=; b=WKvSBN/dwVZWrODQWB9TV4YhWlIe3SfVylSxoRhA1amyrK4hW5j77Wihfere38EdVInwZA 7KU5o9voyYOWhYrtWZk14VTxA6dMx9lPzvcc2MHWlxGJMgFSNWur2u0LJzHHXxhfDUeuVc 2Yad2NMyIhjjBfjQcKoWTvmvk+hrfCyDgqJz72jOw9QvrTHSn2tXb606n1P0F4Z2KGsL2i rlHhSIHNddeFJW8K46r/cmNOwmL0IqUdhOuQmVIARdhcEH+/ZPEV55ANaGPUUelcm0aqj8 r+etb7VTrKy9+xVqJ19BsyNFr/vHKOPXyl5NsqIJKxf3+kZvHCF93HfCSNupNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658932046; a=rsa-sha256; cv=none; b=Dt8DmYaXqbTek0wBaiIl88YXI7lxUAIzNnkqNPHdMW3JhUqPkT4PH3kuFlCcgB9wkKbwpX 2sv+O70Piqb/sa5F6/ZiVS6JgsYEkzYgFunCXlnwFTVZe2Erbd9reug+9OYSAD/joHAGdK Mqp6nELNb7hkVhx6uutDNU9uT9sJuxP56DDsTP1WvgabmCNyaAKaKN9LJVjXzDOeTRspTv 9y8uTDkTpgsehqQoTPW+H7AsJFVJdW2NLg2jopWlNHEU+6yeTcV5POFjKNMMVV1nUzRrS8 BMJefyz8lRZwXViuoDQm6uAxeJoYs9pz1/BoY1a8+Jt8KUQRLKWcnVJTe0t32g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=131f741e5a0f18883c97869be63b68367604bc5b commit 131f741e5a0f18883c97869be63b68367604bc5b Author: Baptiste Daroussin AuthorDate: 2022-07-27 14:22:42 +0000 Commit: Baptiste Daroussin 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: < 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: <