From nobody Wed Jul 27 14:27:19 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 4LtGMC2q6Hz4XhSS; Wed, 27 Jul 2022 14:27:19 +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 4LtGMC2MPYz3j0Q; Wed, 27 Jul 2022 14:27:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658932039; 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=Lp73QHoDp06UrOT1edrUBa6TtyPQtbliSBo5rPy/cs8=; b=yjs5wPhwJOJQeBF+PDPf8UO1Q3BFG1UFN3bS/WrbaNzjoiKUQMpVlaZqJv7synV9bXRejl qG6PwvHskYumNBp0u8L4HyzbnGwlZcw0zPjNG8Wx3kegz+wyNAT4kl3g+P9TJk96R1D9dY 24foDs3SjFTMCAA5AMD1aZslLsyM36N+MfJTYMkxIBLXp87Yv0pjvKluJz/2LA61g1q4Pg +2E4cXnNaclMXavWnkjxAnw7aqRtvtHPA1OB/G/vm4XLjZynjAPhRG8SLiFDyDOHmlWhYk tLlP+A9sXIxpbQzOLUZ+21/oFB944v/BBnAEmjR1gwrLy5JHGxKfIvPqL0+cLg== 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 4LtGMC1SyLzKlY; Wed, 27 Jul 2022 14:27:19 +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 26RERJmr066144; Wed, 27 Jul 2022 14:27:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26RERJgg066143; Wed, 27 Jul 2022 14:27:19 GMT (envelope-from git) Date: Wed, 27 Jul 2022 14:27:19 GMT Message-Id: <202207271427.26RERJgg066143@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: 02ee212d4b7b - main - dns/openresolv: use pkg-message to show message on remove 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: 02ee212d4b7b1ce294710974f2d0b27e70324e7c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658932039; 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=Lp73QHoDp06UrOT1edrUBa6TtyPQtbliSBo5rPy/cs8=; b=OrseGdCiAKzz40yqdRw8oCtU11e5U1lmaEkriHnrkiQSClmRHqFdbd+4UeRELwPHqQQohb Ziregd6e/nfHWBo86B55saHQzlD0j6peqELQ2ocrN7fKG/+DxNtM4UdMOQiU1iU0K9feE5 WbMMtVIa86U/fpYNI0hH3qRIGk9kq8PGOJQM502iod66TaOOPHqU/ezf4MO9yb906qM3mb AkHXG5MTxjQaMWJqHtJpeFJhhqE9MgcUIHcn6jAZSAD6CpLt+o00S2pslPfadeifX3wRRl mtdk4lKEfwxi6yAT7V3iybWrz/C/B8HBqSJdyYzloGomO5T1Iy3h7kY7cweN0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658932039; a=rsa-sha256; cv=none; b=yvHEXnyDksMLrFhTqhMX6UFeZNTYzzNQlHcHgUr29UAmuti1sCcfsRU36IBydexz0zMHmN Fi6DpQT9IeE/lGaIhWVxWIS+okSh8qXunve/ULNUOn5AwlRAP0HwR6dDQukPcPKU0d9/oO Fc/rMHp6vhenizdSclNa1HiodNQmt2l7hB4VIRJlDeYsjo0j0pysprsngv4g4vBOHgLCao pyAyxjBxcwZawYwNhgLxodYFlgNaJ9KSmGwsh4YBhzw/cIc2t2QmS5wdwELLRJko23dzuv Jg8UXS/Yqwv4SHV7jSuWgzRrNa2iCGM5WIko1S1+Im2wjZZY95KVhzbu9AaVWg== 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=02ee212d4b7b1ce294710974f2d0b27e70324e7c commit 02ee212d4b7b1ce294710974f2d0b27e70324e7c Author: Baptiste Daroussin AuthorDate: 2022-07-27 13:41:46 +0000 Commit: Baptiste Daroussin CommitDate: 2022-07-27 14:27:11 +0000 dns/openresolv: use pkg-message to show message on remove --- dns/openresolv/Makefile | 4 +++- dns/openresolv/files/pkg-deinstall.in | 21 --------------------- dns/openresolv/files/pkg-message.in | 13 +++++++++++++ 3 files changed, 16 insertions(+), 22 deletions(-) diff --git a/dns/openresolv/Makefile b/dns/openresolv/Makefile index 70bb65e4a905..a73911b7b368 100644 --- a/dns/openresolv/Makefile +++ b/dns/openresolv/Makefile @@ -1,5 +1,6 @@ PORTNAME= openresolv PORTVERSION= 3.12.0 +PORTREVISION= 1 CATEGORIES= dns MASTER_SITES= https://roy.marples.name/downloads/openresolv/ @@ -12,6 +13,7 @@ CPE_VENDOR= ${PORTNAME}_project GNU_CONFIGURE= yes NO_ARCH= yes -SUB_FILES= pkg-deinstall pkg-message +SUB_FILES= pkg-message +SUB_LIST= PORTNAME=${PORTNAME} .include diff --git a/dns/openresolv/files/pkg-deinstall.in b/dns/openresolv/files/pkg-deinstall.in deleted file mode 100644 index 5d6ab56e733a..000000000000 --- a/dns/openresolv/files/pkg-deinstall.in +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -case $2 in - DEINSTALL) - ;; - POST-DEINSTALL) - echo "===> post-deinstallation information for $1" - echo "" - echo "Please note that $1 was not completely removed" - echo "from this system:" - echo "" - echo "/etc/resolv.conf should now be changed to be a regular" - echo "file and /var/run/resolvconf can be removed if openresolv" - echo "will no longer be used." - echo "" - ;; - *) - exit 64 - ;; -esac -exit 0 diff --git a/dns/openresolv/files/pkg-message.in b/dns/openresolv/files/pkg-message.in index e25daf854019..1b6c44026dc2 100644 --- a/dns/openresolv/files/pkg-message.in +++ b/dns/openresolv/files/pkg-message.in @@ -4,6 +4,19 @@ To make sure openresolv runs correctly please symlink /etc/resolv.conf to %%PREFIX%%/etc/resolvconf/run/resolv.conf +EOM +}, +{ type: remove + message: < post-deinstallation information for %%PORTNAME%% + +Please note that %%PORTNAME%% was not completely removed +from this system: + +/etc/resolv.conf should now be changed to be a regular +file and /var/run/resolvconf can be removed if openresolv +will no longer be used. + EOM } ]