From owner-svn-ports-head@freebsd.org Sat Jul 6 16:40:57 2019
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0D20D15CC56E;
Sat, 6 Jul 2019 16:40:57 +0000 (UTC) (envelope-from cy@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)
server-signature RSA-PSS (4096 bits)
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id A259B6C1BE;
Sat, 6 Jul 2019 16:40:56 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7D76224358;
Sat, 6 Jul 2019 16:40:56 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x66GeuvG048905;
Sat, 6 Jul 2019 16:40:56 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id x66Geu1B048904;
Sat, 6 Jul 2019 16:40:56 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201907061640.x66Geu1B048904@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org
using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Sat, 6 Jul 2019 16:40:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-head@freebsd.org
Subject: svn commit: r506003 - head/mail/nmh
X-SVN-Group: ports-head
X-SVN-Commit-Author: cy
X-SVN-Commit-Paths: head/mail/nmh
X-SVN-Commit-Revision: 506003
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: A259B6C1BE
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-2.92 / 15.00];
local_wl_from(0.00)[FreeBSD.org];
NEURAL_HAM_MEDIUM(-1.00)[-0.999,0];
NEURAL_HAM_SHORT(-0.92)[-0.925,0];
ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US];
NEURAL_HAM_LONG(-1.00)[-1.000,0]
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree for head
<svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>,
<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Jul 2019 16:40:57 -0000
Author: cy
Date: Sat Jul 6 16:40:56 2019
New Revision: 506003
URL: https://svnweb.freebsd.org/changeset/ports/506003
Log:
All conflicts are actually install, not build, conflicts.
Modified:
head/mail/nmh/Makefile
Modified: head/mail/nmh/Makefile
==============================================================================
--- head/mail/nmh/Makefile Sat Jul 6 16:39:55 2019 (r506002)
+++ head/mail/nmh/Makefile Sat Jul 6 16:40:56 2019 (r506003)
@@ -94,8 +94,7 @@ LDFLAGS+= -g
DEBUG_FLAGS+= -O0 -Wall -Wextra -g
.endif
-CONFLICTS= ja-mh-[0-9]*
-CONFLICTS_INSTALL= pixie-* p5-Dist-Joseki-*
+CONFLICTS_INSTALL= ja-mh-[0-9]* pixie-* p5-Dist-Joseki-*
post-install:
@${FIND} ${STAGEDIR}${ETCDIR} -type f -exec ${MV} {} {}-dist \;