aboutsummaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2019-07-06 16:40:56 +0000
committerCy Schubert <cy@FreeBSD.org>2019-07-06 16:40:56 +0000
commit9a95c6a0d1e15a4b272e9e1654ccc2625784cab8 (patch)
treebced848b75546deef60f9aa870b06556c48e0f57 /mail
parentd4143022217d27c334aece74ab151a23151d06c5 (diff)
All conflicts are actually install, not build, conflicts.
Notes
Notes: svn path=/head/; revision=506003
Diffstat (limited to 'mail')
-rw-r--r--mail/nmh/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index ffd8ba2cf9f1..a39d7460a2fc 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -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 \;