From nobody Wed Jul 27 15:00:02 2022 X-Original-To: dev-commits-ports-main@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 4LtH4y2Z9Xz4XmBx; Wed, 27 Jul 2022 15:00:02 +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 4LtH4y23SJz3m01; Wed, 27 Jul 2022 15:00:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658934002; 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=/zWPrjhhfyXXGDWiqL/vy7RXiAYAX/6OaVKdHfLK7Cw=; b=dbKmS5H4d0bigm5NaOPtLh4HabRjMIF8dVhK+lDpFU7y2tNCrZyLpJzkppvDDcucQMV7Qw crG4YJ51SkX+99nok9la434QO1xdXSlX1VUZc7InbJjqygOxFDTrZjhXj7ZIRGULMJNXxe 5TgpZ5WGAtNOagp0VAfGywuYN/MdilWCLTJm1TH+DHn9TdPRdCP8U2aM9P+VG4epP1yIGD wAi8SwzuoTCWMz3oiwkHZEEkGIxT8tf6JJje46JNm6FO5bI0IuFPDPN/Ytg0gHrX8I1/ED ptvRUOM2hpWJUPlmRW+dWyOkiDijUTtiDxodYDBRuwW51fKL280bW/49dEJVoQ== 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 4LtH4y12q2zLJn; Wed, 27 Jul 2022 15:00:02 +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 26RF027c008125; Wed, 27 Jul 2022 15:00:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26RF025I008116; Wed, 27 Jul 2022 15:00:02 GMT (envelope-from git) Date: Wed, 27 Jul 2022 15:00:02 GMT Message-Id: <202207271500.26RF025I008116@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: 5c8b0736fb28 - main - mail/nullmailer: remove useless pkg-deinstall List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 5c8b0736fb28ac194e1c1f90639fcf8ee6ee3ad6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658934002; 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=/zWPrjhhfyXXGDWiqL/vy7RXiAYAX/6OaVKdHfLK7Cw=; b=DmbcyYiIjm5E5Yvmm49SZGHqdNabPnmeB7Icp1Ox5gaxDiYI/a8kgjltgZOVEuJt5dniD8 /c08ndd6DemUCaz3E6XL08WkUwdCCl1NPSYB5m0u0Sf3amHe3phv7OhuduzI/n9dFxuwuy cpRCxfFtDeoSE5XwjElthYam5JxkUe9sumNgmd7Ygv3n45xKZhVmT+7D+kbs6TUYhJ02EY U23xsbSIpS585K0A0GCkRNMZcpMU0MSCQdhMlikBTqTk1tnK9jVRvw4KNMoJXm2RhlJD8u gUo/qUBoX7tCZEZe7vXnyg0nYqIDfeOJ1sXdLMbAkrthPJZ3PwymlgTd9kRDIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658934002; a=rsa-sha256; cv=none; b=nnEWAxlfw75CnLt7EskYt7GCP8Apg7WbMx3RmX/r2upgfMuxzmNdYuQbM/vmQSv+fUHx7w YLFulTfREUq/ZRyLHb0uyARvZqOjiYOzthY136aYT1T4VS3cajLkqtRKqVutDq/e62BCK9 WIdxX6yQ14PZaQCnkjyorzbhTRhWQPT6GvN8+VadNtrFjiZZaPQZ0Htvr/WWKPO5qx8Kxf TNQIjoTZ5yku52Sy6KL0H1Wvpt3UjfC7QJz7kSE7G7DzvTslzhQeHJjBpa9J9ZhR9FdpNT jSNY0hrwSXSoxS9kmC1ngnaTmA1+6kOZgpdqdK0f9GCzFqst/e4Wibb0EC6aDA== 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=5c8b0736fb28ac194e1c1f90639fcf8ee6ee3ad6 commit 5c8b0736fb28ac194e1c1f90639fcf8ee6ee3ad6 Author: Baptiste Daroussin AuthorDate: 2022-07-27 14:53:47 +0000 Commit: Baptiste Daroussin CommitDate: 2022-07-27 14:59:48 +0000 mail/nullmailer: remove useless pkg-deinstall pkg does not allow interractive script, so the pkg-deinstall script is never run --- mail/nullmailer/Makefile | 1 + mail/nullmailer/files/pkg-deinstall.in | 44 ---------------------------------- 2 files changed, 1 insertion(+), 44 deletions(-) diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile index 7d0c55095e58..edf43baa90f7 100644 --- a/mail/nullmailer/Makefile +++ b/mail/nullmailer/Makefile @@ -1,5 +1,6 @@ PORTNAME= nullmailer PORTVERSION= 2.2 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= mail MASTER_SITES= http://untroubled.org/nullmailer/ \ diff --git a/mail/nullmailer/files/pkg-deinstall.in b/mail/nullmailer/files/pkg-deinstall.in deleted file mode 100644 index 1f2d7da63f59..000000000000 --- a/mail/nullmailer/files/pkg-deinstall.in +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh - -ask() { - local question default answer - - question=$1 - default=$2 - if [ -z "${PACKAGE_BUILDING}" ]; then - read -p "${question} [${default}]? " answer - fi - if [ x${answer} = x ]; then - answer=${default} - fi - echo ${answer} -} - -yesno() { - local dflt question answer - - question=$1 - dflt=$2 - while :; do - answer=$(ask "${question}" "${dflt}") - case "${answer}" in - [Yy]*) return 0;; - [Nn]*) return 1;; - esac - echo "Please answer yes or no." - done -} - -if [ x"$2" = xDEINSTALL ]; then - if [ ! -n "$BATCH" ]; then - if /bin/ps -axc | /usr/bin/grep -q nullmailer-send; then - if yesno "There are some nullmailer processes running. Shall I kill them" y; then - %%PREFIX%%/etc/rc.d/nullmailer stop - sleep 2 - else - echo "OK ... I hope you know what you are doing." - fi - fi - - fi -fi