From d3d151cd725134721a6149ce28df9f661f186596 Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Sat, 11 Oct 2003 06:14:55 +0000 Subject: [PATCH] balsa and balsa2 conflict with each other. Submitted by: Oliver Eikemeier --- mail/balsa/Makefile | 2 ++ mail/balsa2/Makefile | 2 ++ 2 files changed, 4 insertions(+) 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 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