summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2003-10-11 06:14:55 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2003-10-11 06:14:55 +0000
commitd3d151cd725134721a6149ce28df9f661f186596 (patch)
tree0771871c6e8e665ee00380e240d79329cac443ef /mail
parentgaleon and galeon2 conflict with each other. (diff)
balsa and balsa2 conflict with each other.
Submitted by: Oliver Eikemeier <eikemeier@fillmore-labs.com>
Notes
Notes: svn path=/head/; revision=90836
Diffstat (limited to 'mail')
-rw-r--r--mail/balsa/Makefile2
-rw-r--r--mail/balsa2/Makefile2
2 files changed, 4 insertions, 0 deletions
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index d4c62f93766a..6585e651a684 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -37,4 +37,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
MAN1= balsa.1
+CONFLICTS= balsa2-*
+
.include <bsd.port.mk>
diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index f2bdac3700b6..84aa6036275c 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -36,6 +36,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
MAN1= balsa.1
+CONFLICTS= balsa-*
+
.if defined(WITH_GPG)
LIB_DEPENDS+= gpgme.9:${PORTSDIR}/security/gpgme
CONFIGURE_ARGS+= --enable-gpgme