From nobody Sat Mar 2 13:51:02 2024 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 4Tn5vq0Tmhz5CH0T; Sat, 2 Mar 2024 13:51:03 +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 4Tn5vp6t8vz4lWm; Sat, 2 Mar 2024 13:51:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709387463; 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=EcvI3wjGUn/Neuy78nrEHGgVsqhw7LlkdVwsI2h7a+A=; b=JgcLJ1wWleDJcdpUmnRc9G0AeXk6WYmRUbAaLLZXwt5/2/eNUHpkZ4np2apJyLucPIn+GW juq9VlCA6WVs3iBE1i/LFEAovdI2UEVpgrjuT3Pd5aJloZhGM+nJ6jMUsZjY37R6zPg2t9 ht9tB5c+DhGDDuSV+UZi1nan4mAHlWT3coVasJMzOFniJNEA6xtlWEYcMaUDYbkf+nICmf 4g7meF1cjTOngl5EsNLb+TpiHSwDLe66KX6mIOCAYHFU/T8jPV0hKN+REYwnF3SvSPfzp/ OMyk3bAIwa2hpiS4X8YmhMpXfoVH7wcAkMDKHAyWYP5kpAP/jPFrz3j2NQo5aQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709387463; a=rsa-sha256; cv=none; b=pcoiHQsLrt5sZXltzdOOmhl0mzy3Qtj1BLb+A0UmTPPewt4oSIrkYN+jKKcqOrsL4WC9Wn feuF/ugnP3sH+HcCza6uWzb2cUFqCg5octCEKxJyrFWI8eeILlJPBfywWaWU6tM/m5Uo6Q FcrN7046cZrWCc1IkyMVE8yet2hv4u5PFJO4VIDHX3HfeocBBuoE/XI85buB3e8ZH//+ZO 0e9mM5s6lSqELTN1g5X+0rx2h298q7NTPj8Z10rhw+s4FhIgJlgL1eAset5I7tQlohR/Cy 9mCJbbbFfTf1Go/2+QPdPmQtPS5mpFNej0DGr+8TX4GRSVCJihvlOmi864b0EA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709387463; 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=EcvI3wjGUn/Neuy78nrEHGgVsqhw7LlkdVwsI2h7a+A=; b=Cd6OcOHMX5LK6cwT09wEAWN2izg0oedh9neCxfA2iny1VFyH2acQMjE3VRrGswZXebB2Py XUYPExhV6vgyw2lmRl1Ed51kEaBHfN1Tj4iYXuFRJkeOxCnsfQOyHaVSevR6Lhug7OatLH UI15bKMWkXpHJoZn/Bb9yBjPbxfJ6ZsoVOZCSHLSNA+k6gUcusKfjnTLL2w28lHsN1PHb6 PhW4AubZK4GTj5NFHJbZqgtY+NVVa/uNBtxHiQN4LN79jwPkMyi8lAwDr6kf9Md4qoY+bE qduoaESviMHP3WBOl7O+Eumz0rmCy2mtekN6O8b+WEGiVMRM7q/aZQArxFsKGw== 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 4Tn5vp69rHz1BkW; Sat, 2 Mar 2024 13:51:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 422Dp2UF039276; Sat, 2 Mar 2024 13:51:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 422Dp25m039273; Sat, 2 Mar 2024 13:51:02 GMT (envelope-from git) Date: Sat, 2 Mar 2024 13:51:02 GMT Message-Id: <202403021351.422Dp25m039273@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 6b44583fe4ce - main - irc/ircproxy: Remove useless pkg-deinstall 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: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6b44583fe4ce656d090b3b99509d491d343752b0 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=6b44583fe4ce656d090b3b99509d491d343752b0 commit 6b44583fe4ce656d090b3b99509d491d343752b0 Author: Gleb Popov AuthorDate: 2024-03-02 13:48:09 +0000 Commit: Gleb Popov CommitDate: 2024-03-02 13:50:02 +0000 irc/ircproxy: Remove useless pkg-deinstall The "you need to remove users" message is shown automatically. We also don't shutdown rc services during deinstall/upgrade. --- irc/ircproxy/Makefile | 4 +--- irc/ircproxy/files/pkg-deinstall.in | 40 ------------------------------------- 2 files changed, 1 insertion(+), 43 deletions(-) diff --git a/irc/ircproxy/Makefile b/irc/ircproxy/Makefile index e2a2428f87aa..1cf0df5f0e49 100644 --- a/irc/ircproxy/Makefile +++ b/irc/ircproxy/Makefile @@ -1,5 +1,6 @@ PORTNAME= ircproxy DISTVERSION= 1.3.8 +PORTREVISION= 1 CATEGORIES= irc MASTER_SITES= https://codeberg.org/BSDforge/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/ @@ -16,9 +17,6 @@ USES= autoreconf localbase:ldflags GNU_CONFIGURE= yes LDFLAGS+= -lcrypto -SUB_FILES= pkg-deinstall -SUB_LIST= IRC_USR=${USERS} IRC_GRP=${GROUPS} - WRKSRC= ${WRKDIR}/${PORTNAME} USERS= ircproxyd diff --git a/irc/ircproxy/files/pkg-deinstall.in b/irc/ircproxy/files/pkg-deinstall.in deleted file mode 100644 index 1ea52d8dba1f..000000000000 --- a/irc/ircproxy/files/pkg-deinstall.in +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -case $2 in - POST-DEINSTALL) - cat </dev/null 2>&1 - if [ $? -eq 0 ]; then - for count in 1 2 3 4 5 6 7 8 9 10; do - if [ $count -ge 5 ]; then - kill -KILL "$PID" || break - break - fi - kill -TERM "$PID" || break - sleep 2 - ps -p "$PID" >/dev/null 2>&1 - if [ ! $? -eq 0 ]; then - break; - fi - done - fi - fi - echo - ;; -esac