From nobody Thu Jun 23 23:48:26 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 D4CE6865D36; Thu, 23 Jun 2022 23:48: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 4LTcQL5kBgz3JqR; Thu, 23 Jun 2022 23:48:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656028106; 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=LPUj6OHxDlKN7z15hs33lRvHgMJ6tdAne/Sxs6O7pl4=; b=w2IhnEKM9CrIZ6YZ94Rqk0y1aj8AmD803F1ISgZWhxtnNR6nzPZncm6NLAX6U8ZEeeVOuG Ua6Vp2gqN9uIg3h31bTdn7xKoiIA1u4POZCqEzOy+YPoHC+3DLUHqAcsL2PpKKGsZHW33u ZRtt6QyHkU1OgkS1EskUeR9YbkR4bGohiguNh1ll7X7ZTGlM8V22vKjETdKucI0TcIsW0D ULmhsD3K0u2YatCohXzoEKrJD0pkUuP+KW9oEivh3/acM8qwhaK3B75KASaP+4sdoDu33N ELgTz0jNQmGNEP+TA2+wqC8uJ3ltYuodcDkHuuw6veATQ5qP7pxQH13j4xxBAA== 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 A09A824DA4; Thu, 23 Jun 2022 23:48: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 25NNmQbg063755; Thu, 23 Jun 2022 23:48:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25NNmQ0l063754; Thu, 23 Jun 2022 23:48:26 GMT (envelope-from git) Date: Thu, 23 Jun 2022 23:48:26 GMT Message-Id: <202206232348.25NNmQ0l063754@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Olivier Cochard Subject: git: b1deda5bd66b - main - dns/nextdns: Use a cleaner way to manage its configuration file sample. 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: olivier X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1deda5bd66bf361b4e0d90a34e52b5b8d5c1ca1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656028106; 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=LPUj6OHxDlKN7z15hs33lRvHgMJ6tdAne/Sxs6O7pl4=; b=godk73cWSX67U/peTQXZSvhD2O/TOenelGGFC0pVJNCwDIStHGfygTFQxc+OMBtA+pH3xP 49wCGcn/l6hOWB75aPUGX3MgFBlvos+nZAxUGwbla3DereZrU/JWXrboSehLJfShcfKdIe AjYtTDkKoYBXdXRDjVa897W634i/5bRD7kzPW3AlKVYtcb9QgKA954qlDXhuEPRj/uTFu7 HqOFJMEPbV+tWpVLqZbPAQJONAiV5RxrNdP/Cp8WPDeSkY2BSUSzMOWICx8+peA+qLgRd4 W80Qy4K07/n93ZD82g8XPtd/trk5kxatFRxThE8RoRnCSKZs4Awr+E8LEmPDpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656028106; a=rsa-sha256; cv=none; b=RtNvw94r5PqdWMM2ansgXzpeW8uNSYKlnwI7cQH2PPw4Nbn3NsALMGWc2hXXaox75QAAaE 1acfkLrSL/6jNpafrCUjnXwhXp4sNzmZ4J0t51A0Go2xa1LlwQmU4wb6hYukOtpr+vNFVc BRW0EmHyEFqKvYxIN6sR9znOI854QjeDTBlg8b78fWo+v4foLvGYYIDh8pHSCecT9babKx JO1z3L8cOpQIT8AF+uSO+/R1jv+W5C248i9et72wbzFZof1oy36PMDb0xWZqmhQh2euFT4 KfCv0nI9oIWy9x+E7epJBn6Zv4uSAvVDfRkeE9Y2TpD6tLV2pAPyrRjaVscF4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/ports/commit/?id=b1deda5bd66bf361b4e0d90a34e52b5b8d5c1ca1 commit b1deda5bd66bf361b4e0d90a34e52b5b8d5c1ca1 Author: Olivier Cochard AuthorDate: 2022-06-23 23:46:27 +0000 Commit: Olivier Cochard CommitDate: 2022-06-23 23:47:29 +0000 dns/nextdns: Use a cleaner way to manage its configuration file sample. --- dns/nextdns/Makefile | 10 +++++++--- dns/nextdns/pkg-deinstall | 4 ---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dns/nextdns/Makefile b/dns/nextdns/Makefile index 073f5932279b..74903cf037fd 100644 --- a/dns/nextdns/Makefile +++ b/dns/nextdns/Makefile @@ -1,7 +1,7 @@ PORTNAME= nextdns PORTVERSION= 1.37.11 -PORTREVISION= 2 DISTVERSIONPREFIX= v +PORTREVISION= 3 CATEGORIES= dns security MAINTAINER= rs@nextdns.io @@ -23,10 +23,14 @@ GH_TUPLE= \ vishvananda:netlink:v1.1.0:vishvananda_netlink/vendor/github.com/vishvananda/netlink \ vishvananda:netns:2eb08e3e575f:vishvananda_netns/vendor/github.com/vishvananda/netns -GO_TARGET= .:${PREFIX}/sbin/nextdns +GO_TARGET= .:${PREFIX}/sbin/${PORTNAME} SUB_FILES= pkg-message -PLIST_FILES= sbin/nextdns +PLIST_FILES= sbin/${PORTNAME} \ + "@sample etc/${PORTNAME}.conf.sample" + +post-install: + @${STAGEDIR}${PREFIX}/sbin/${PORTNAME} config > ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample .include diff --git a/dns/nextdns/pkg-deinstall b/dns/nextdns/pkg-deinstall index c67e487f45b0..0f9496f07f2f 100644 --- a/dns/nextdns/pkg-deinstall +++ b/dns/nextdns/pkg-deinstall @@ -6,8 +6,4 @@ fi ${PKG_PREFIX}/nextdns uninstall >/dev/null 2>/dev/null -echo "==> If you are uninstalling nextdns permanently," -echo " and you do *NOT* want to retain the configuration file," -echo " you should manually delete ${PKG_PREFIX}/etc/nextdns.conf" - exit 0