aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--archivers/arc/Makefile2
-rw-r--r--devel/arcanist/Makefile2
2 files changed, 4 insertions, 0 deletions
diff --git a/archivers/arc/Makefile b/archivers/arc/Makefile
index 5db38476f2b9..4b234d299aad 100644
--- a/archivers/arc/Makefile
+++ b/archivers/arc/Makefile
@@ -11,6 +11,8 @@ COMMENT= Create & extract files from DOS .ARC files
LICENSE= GPLv2
+CONFLICTS= php5-arcanist-*
+
PLIST_FILES= bin/arc bin/marc man/man1/arc.1.gz
PORTDOCS= Arc521.doc
diff --git a/devel/arcanist/Makefile b/devel/arcanist/Makefile
index ecf1bbf4d026..ef2fd599123a 100644
--- a/devel/arcanist/Makefile
+++ b/devel/arcanist/Makefile
@@ -11,6 +11,8 @@ COMMENT= Command line interface for Phabricator
LICENSE= APACHE20
+CONFLICTS= arc-*
+
PHP_DESTDIR= lib/php/arcanist
RUN_DEPENDS= php5-libphutil>0:${PORTSDIR}/devel/libphutil \
bash:${PORTSDIR}/shells/bash