From nobody Sun Feb 6 01:09:21 2022 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 BFF9A19B7E19; Sun, 6 Feb 2022 01:09:21 +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 4JrrlP4wBLz3nGJ; Sun, 6 Feb 2022 01:09:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644109761; 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=dBxcWtdfIyL5ZDpBYavKxyA0GszgDBflFYoIO9Q4hzY=; b=icGvqCe9mIRj00hgivtIsQjg1MIlpWbAkMUgNvWOem2n1WXGwmdsmgCehKl7BLg51u0DLS o4nswyEsC3eGp7/yTps60LR3QliKw2piOcg0ntzEUH9GNwc/JHS8YxhnM8ShCXs0VYr5VX o4sPattIPxj+gh2bmoYxio808S13DgKFYFkIPl+8mhOvb5QoI0sdH7ddAz4IZqtIZDTPZ8 vSG19O68/q5tt28R4V9CXlZqdDSmAQpwvGujgS7/XsRJuib8GkT688YAJn6GeihFDFe8Dj qRUqADKg8kRQ42BqfGNrnxaitlXZAbjgHyNoVykp01Mo7aKSJO/BV3BUjNcntA== 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 89EF31350; Sun, 6 Feb 2022 01:09:21 +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 21619Lro035929; Sun, 6 Feb 2022 01:09:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21619LiK035928; Sun, 6 Feb 2022 01:09:21 GMT (envelope-from git) Date: Sun, 6 Feb 2022 01:09:21 GMT Message-Id: <202202060109.21619LiK035928@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 7e56934afa47 - main - mail/nmh*: Register conflicts 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: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7e56934afa4718ea5aaed06ef2a734f93c61bf0b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644109761; 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=dBxcWtdfIyL5ZDpBYavKxyA0GszgDBflFYoIO9Q4hzY=; b=t6i+RazNHMa/CjiPzwfVqVswbZfx+MtnnKaI1YKISDhLho4M9Ed4ZZD+VSJYacnuQmNzXR PWFmgsN6O1+P5hwacMOrrP4+5aQ4corrNOMsBUFkjVJNpUjan+79I9JK3GTUK6BGKbhWZ6 w24bOaxpTeuFvieOmQWi7YVg+zmNkWYtEiwO/PntCOWxVpIxM+zszMcPGYC5xOk9X2HeID ZjYWOHckTZDpU9JYapClLTPznFCRQ9uD4XWYnvNUD3NvAuxlIlDf49E2moNKacsQDvILv6 Ki0b7SaLgLDpPzxKrXf1usToEHkVTzCOFeqsrrqMm8S4tac0XjTRZXNjW+Xx9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644109761; a=rsa-sha256; cv=none; b=Yu+fG4AJry0Vs4OY9/l1ucNkqoN3jb7zl75GAjjtEZVJ9xsmIJwE966hR5FyuQFrl0gIFE caStPI+REmdqpqD7vbMEBikNv+CzSM5xGwSk1arSGuAxauQQRzQvrs2CfNghkR3jzlGN/L f1sb5vK+u+Yto9nbIlKUELBhc8fyktBghdNDeC6YMQZ5DLTW3jfW+t67RR+skB0yNkwKGL Jw9FzXoi3f6RsdaPPQMfjv3z36Te3tN0qWqWLY132HLdjJX9tODfT+MFs2LtQC1b40v3xC 43Ik37cPW2CZ9PpYqemmv/psvS2twtkUCUZnnZqfMNze6s72QFxDfso5EgC7uA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=7e56934afa4718ea5aaed06ef2a734f93c61bf0b commit 7e56934afa4718ea5aaed06ef2a734f93c61bf0b Author: Cy Schubert AuthorDate: 2022-02-06 01:08:24 +0000 Commit: Cy Schubert CommitDate: 2022-02-06 01:08:24 +0000 mail/nmh*: Register conflicts Register install conflicts between the two nmh ports. --- mail/nmh-devel/Makefile | 2 +- mail/nmh/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mail/nmh-devel/Makefile b/mail/nmh-devel/Makefile index bc8bf2c0e5f4..bf128f1d416a 100644 --- a/mail/nmh-devel/Makefile +++ b/mail/nmh-devel/Makefile @@ -98,7 +98,7 @@ LDFLAGS+= -g DEBUG_FLAGS+= -O0 -Wall -Wextra -g .endif -CONFLICTS_INSTALL= ali ja-mh pixie p5-Dist-Joseki +CONFLICTS_INSTALL= ali ja-mh pixie p5-Dist-Joseki nmh-1.* pre-configure: cd ${WRKSRC} && ./autogen.sh diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile index c38e26d044f4..268df2193668 100644 --- a/mail/nmh/Makefile +++ b/mail/nmh/Makefile @@ -93,7 +93,7 @@ LDFLAGS+= -g DEBUG_FLAGS+= -O0 -Wall -Wextra -g .endif -CONFLICTS_INSTALL= ali ja-mh pixie p5-Dist-Joseki +CONFLICTS_INSTALL= ali ja-mh pixie p5-Dist-Joseki nmh-devel post-install: @${FIND} ${STAGEDIR}${ETCDIR} -type f -exec ${MV} {} {}-dist \;