git: 7e56934afa47 - main - mail/nmh*: Register conflicts
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 06 Feb 2022 01:09:21 UTC
The branch main has been updated by cy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=7e56934afa4718ea5aaed06ef2a734f93c61bf0b
commit 7e56934afa4718ea5aaed06ef2a734f93c61bf0b
Author: Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2022-02-06 01:08:24 +0000
Commit: Cy Schubert <cy@FreeBSD.org>
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 \;