From nobody Wed Jul 27 14:27:22 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 4LtGMG6dtcz4XhP4; Wed, 27 Jul 2022 14:27:22 +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 4LtGMG5p7yz3j6H; Wed, 27 Jul 2022 14:27:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658932042; 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=/p1qfAgpI5BreBuirdCij2kWLawnJiOrdQvp5LYlamI=; b=Z5sEdqBi/8ivl4kUlHEABKyiQxhSbCpDNNPjPAqLQZQ8MRSnM6IDZBkslRSTQS6eEffZaw VLJSczpT7toKkNSI9OiZh+z8ZYMPg6SGtQveGUx7f5Dkn1bichha57I/6QE5nXlMj+bHzI CYvmXnr0CVJhvKlJL+PekfsYSm0IMHe/LXJ7NXIWNuid1NnUqSBSI2XFepp+kRvgCjALW5 SiLdc6ja03VJfqxjziJzJaM8xD684RBh2erJ4nGLcMVi5hJ9dOpyGsHVP0GXIc57l8wmZL qkfqbYLU3R1XZ53oVXXFCZ4/aak2choAYaCsuGKL2PkrLt7TKG00W6Hxpw3eDg== 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 4LtGMG4ZRtzKgd; Wed, 27 Jul 2022 14:27:22 +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 26RERMUJ066216; Wed, 27 Jul 2022 14:27:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26RERMdu066215; Wed, 27 Jul 2022 14:27:22 GMT (envelope-from git) Date: Wed, 27 Jul 2022 14:27:22 GMT Message-Id: <202207271427.26RERMdu066215@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: 6c0c974b5bbc - main - security/pks: 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: 6c0c974b5bbc2b3f1e4a86ed3c97c17d4e9d573e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658932042; 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=/p1qfAgpI5BreBuirdCij2kWLawnJiOrdQvp5LYlamI=; b=xSnuG/xs3Da0l+G+bj3JBMCDVqrtQa0awQ2ne3uyQ2Hx4nD6pul2B7NIwIq1YBdqA6Z9FB X1Ai+TlQtDjnEC9wM5f/hNzBskWAnu8EtNudtiENiwPNorNKLxcy8ioGgVhlPfTsUC38Sq myd6Ebfch+7Wfk2JbP6Ylhi8rG3LoAWtHd1VoyKUp+x6WD6I+ug/Y2X5oaHUTxb3eUR5UK GGyZISbPLti+ljxC2q2Ml+v7M5XH4A57czHersXtbJv4kkOeiL0qnB7L83p9J2axqkniM3 xhXjfG4MMROUIDqYg7P9ZKsi3IbQr8WB3G/Ck+wI57L2LbOEumgQV5YTeiFWhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658932042; a=rsa-sha256; cv=none; b=a8aEn08Xx5gSkjz6vJ0TxJ7LoGZsedpZvtcKXZIfw2k/+3tBuHrr5Jfuc9pZzd6dQslFAu cLfbmBXcvio6FfLLmUJ6e4Ze8RuCxX+nVq9mI6u7Sne9Ae0Qzhe428WJtYcvTjc/wyt7Au E3f7VsTwCRed8GHMxzym6wV0iOl7q59rNiX91fRkVcH2zHTILIM8sPZD4iLfQeiiZicsb9 cxeyWxHCTK85gbcqrrSqCieW/AUhkto4+gg25KD8cuj06GuogOn9FklB6pZbP7yAJ6F/Pi V25wlhCtJAVRy+G/UD2exJjBU5KIQjsDYREuWVzipsyRnTlplKIav5I6vnvqoA== 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=6c0c974b5bbc2b3f1e4a86ed3c97c17d4e9d573e commit 6c0c974b5bbc2b3f1e4a86ed3c97c17d4e9d573e Author: Baptiste Daroussin AuthorDate: 2022-07-27 14:12:37 +0000 Commit: Baptiste Daroussin CommitDate: 2022-07-27 14:27:12 +0000 security/pks: use pkg-message to show message on remove --- security/pks/Makefile | 3 ++- security/pks/files/pkg-deinstall.in | 25 ------------------------- security/pks/files/pkg-message.in | 11 +++++++++++ 3 files changed, 13 insertions(+), 26 deletions(-) diff --git a/security/pks/Makefile b/security/pks/Makefile index 37d5a568f46a..ee844db05803 100644 --- a/security/pks/Makefile +++ b/security/pks/Makefile @@ -1,6 +1,6 @@ PORTNAME= pks PORTVERSION= 0.9.6.20040312 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= security www MASTER_SITES= http://pks.sourceforge.net/ LOCAL/mandree DISTFILES= pks-current.tgz @@ -31,6 +31,7 @@ CONFIGURE_ENV= DBLIB="-L${BDB_LIB_DIR} -l${BDB_LIB_NAME}" \ DBINC=-I${BDB_INCLUDE_DIR} DBHDR=db.h SUB_FILES= pkg-message +SUB_LIST= PORTNAME="${PORTNAME}" OPTIONS_DEFINE= DOCS PORTDOCS= pks_help.* README EMAIL diff --git a/security/pks/files/pkg-deinstall.in b/security/pks/files/pkg-deinstall.in deleted file mode 100644 index 9d424a24855e..000000000000 --- a/security/pks/files/pkg-deinstall.in +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -PKGNAME=$1 -STAGE=$2 - -case ${STAGE} in -DEINSTALL) - ;; -POST-DEINSTALL) - cat << EOF -=========================================================================== -If you won't be using ${PKGNAME} any longer, you may want to remove the -following directories and files: - - %%PREFIX%%/etc/pksd.conf - /var/pks -=========================================================================== -EOF - ;; -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/security/pks/files/pkg-message.in b/security/pks/files/pkg-message.in index feb4dbff8c2d..68e9f9701430 100644 --- a/security/pks/files/pkg-message.in +++ b/security/pks/files/pkg-message.in @@ -37,5 +37,16 @@ Add the following lines to /etc/rc.conf.local or /etc/rc.conf to enable this ser man 8 pksclient EOM +}, +{ type: remove + message: <