summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mail/horde-imp/Makefile6
-rw-r--r--mail/horde-mimp/Makefile2
-rw-r--r--mail/horde4-imp/Makefile6
-rw-r--r--mail/imp/Makefile6
-rw-r--r--mail/mimp/Makefile2
5 files changed, 11 insertions, 11 deletions
diff --git a/mail/horde-imp/Makefile b/mail/horde-imp/Makefile
index 540c7d1eaf50..ea79cd4b9d0d 100644
--- a/mail/horde-imp/Makefile
+++ b/mail/horde-imp/Makefile
@@ -42,7 +42,7 @@ COMMENT= A webmail system which accesses mail over IMAP
#
# - WITH_HTML : enable HTML composition mode;
#
-# - WITHOUT_IMAPSERVER : if your IMAP server runs on another machine;
+# - WITH_IMAPSERVER : if you to depend on an IMAP server;
#
# or you can select to work with one of these servers:
#
@@ -138,11 +138,11 @@ PATCH2RM= prefs.php.dist.orig servers.php.dist.orig conf.xml.orig \
# else we shall install imap-uw.
# IMAP servers are ordered according to my tastes, if several are
# installed, we just record the first one.
-.if !defined(WITHOUT_IMAPSERVER)
+.if defined(WITH_IMAPSERVER)
. if defined(WITH_IMAP-UW) || exists(${LOCALBASE}/libexec/imapd)
RUN_DEPENDS+= ${LOCALBASE}/libexec/imapd:${PORTSDIR}/mail/imap-uw
. elif defined(WITH_CYRUS-IMAPD) || exists(${LOCALBASE}/lib/libacap.a)
-RUN_DEPENDS+= ${LOCALBASE}/lib/libacap.a:${PORTSDIR}/mail/cyrus-imapd2
+RUN_DEPENDS+= ${LOCALBASE}/lib/libacap.a:${PORTSDIR}/mail/cyrus-imapd23
. elif defined(WITH_COURIER-IMAP) || exists(${LOCALBASE}/bin/deliverquota)
RUN_DEPENDS+= ${LOCALBASE}/bin/deliverquota:${PORTSDIR}/mail/courier-imap
. elif defined(WITH_DOVECOT) || exists(${LOCALBASE}/libexec/dovecot/imap)
diff --git a/mail/horde-mimp/Makefile b/mail/horde-mimp/Makefile
index a505604ccc1e..f3474a94edf4 100644
--- a/mail/horde-mimp/Makefile
+++ b/mail/horde-mimp/Makefile
@@ -98,7 +98,7 @@ PATCH2RM= prefs.php.dist.orig servers.php.dist.orig
. if defined(WITH_IMAP-UW) || exists(${LOCALBASE}/libexec/imapd)
RUN_DEPENDS+= ${LOCALBASE}/libexec/imapd:${PORTSDIR}/mail/imap-uw
. elif defined(WITH_CYRUS-IMAPD) || exists(${LOCALBASE}/lib/libacap.a)
-RUN_DEPENDS+= ${LOCALBASE}/lib/libacap.a:${PORTSDIR}/mail/cyrus-imapd2
+RUN_DEPENDS+= ${LOCALBASE}/lib/libacap.a:${PORTSDIR}/mail/cyrus-imapd23
. elif defined(WITH_COURIER-IMAP) || exists(${LOCALBASE}/bin/deliverquota)
RUN_DEPENDS+= ${LOCALBASE}/bin/deliverquota:${PORTSDIR}/mail/courier-imap
. elif defined(WITH_DOVECOT) || exists(${LOCALBASE}/libexec/dovecot/imap)
diff --git a/mail/horde4-imp/Makefile b/mail/horde4-imp/Makefile
index 540c7d1eaf50..ea79cd4b9d0d 100644
--- a/mail/horde4-imp/Makefile
+++ b/mail/horde4-imp/Makefile
@@ -42,7 +42,7 @@ COMMENT= A webmail system which accesses mail over IMAP
#
# - WITH_HTML : enable HTML composition mode;
#
-# - WITHOUT_IMAPSERVER : if your IMAP server runs on another machine;
+# - WITH_IMAPSERVER : if you to depend on an IMAP server;
#
# or you can select to work with one of these servers:
#
@@ -138,11 +138,11 @@ PATCH2RM= prefs.php.dist.orig servers.php.dist.orig conf.xml.orig \
# else we shall install imap-uw.
# IMAP servers are ordered according to my tastes, if several are
# installed, we just record the first one.
-.if !defined(WITHOUT_IMAPSERVER)
+.if defined(WITH_IMAPSERVER)
. if defined(WITH_IMAP-UW) || exists(${LOCALBASE}/libexec/imapd)
RUN_DEPENDS+= ${LOCALBASE}/libexec/imapd:${PORTSDIR}/mail/imap-uw
. elif defined(WITH_CYRUS-IMAPD) || exists(${LOCALBASE}/lib/libacap.a)
-RUN_DEPENDS+= ${LOCALBASE}/lib/libacap.a:${PORTSDIR}/mail/cyrus-imapd2
+RUN_DEPENDS+= ${LOCALBASE}/lib/libacap.a:${PORTSDIR}/mail/cyrus-imapd23
. elif defined(WITH_COURIER-IMAP) || exists(${LOCALBASE}/bin/deliverquota)
RUN_DEPENDS+= ${LOCALBASE}/bin/deliverquota:${PORTSDIR}/mail/courier-imap
. elif defined(WITH_DOVECOT) || exists(${LOCALBASE}/libexec/dovecot/imap)
diff --git a/mail/imp/Makefile b/mail/imp/Makefile
index 540c7d1eaf50..ea79cd4b9d0d 100644
--- a/mail/imp/Makefile
+++ b/mail/imp/Makefile
@@ -42,7 +42,7 @@ COMMENT= A webmail system which accesses mail over IMAP
#
# - WITH_HTML : enable HTML composition mode;
#
-# - WITHOUT_IMAPSERVER : if your IMAP server runs on another machine;
+# - WITH_IMAPSERVER : if you to depend on an IMAP server;
#
# or you can select to work with one of these servers:
#
@@ -138,11 +138,11 @@ PATCH2RM= prefs.php.dist.orig servers.php.dist.orig conf.xml.orig \
# else we shall install imap-uw.
# IMAP servers are ordered according to my tastes, if several are
# installed, we just record the first one.
-.if !defined(WITHOUT_IMAPSERVER)
+.if defined(WITH_IMAPSERVER)
. if defined(WITH_IMAP-UW) || exists(${LOCALBASE}/libexec/imapd)
RUN_DEPENDS+= ${LOCALBASE}/libexec/imapd:${PORTSDIR}/mail/imap-uw
. elif defined(WITH_CYRUS-IMAPD) || exists(${LOCALBASE}/lib/libacap.a)
-RUN_DEPENDS+= ${LOCALBASE}/lib/libacap.a:${PORTSDIR}/mail/cyrus-imapd2
+RUN_DEPENDS+= ${LOCALBASE}/lib/libacap.a:${PORTSDIR}/mail/cyrus-imapd23
. elif defined(WITH_COURIER-IMAP) || exists(${LOCALBASE}/bin/deliverquota)
RUN_DEPENDS+= ${LOCALBASE}/bin/deliverquota:${PORTSDIR}/mail/courier-imap
. elif defined(WITH_DOVECOT) || exists(${LOCALBASE}/libexec/dovecot/imap)
diff --git a/mail/mimp/Makefile b/mail/mimp/Makefile
index a505604ccc1e..f3474a94edf4 100644
--- a/mail/mimp/Makefile
+++ b/mail/mimp/Makefile
@@ -98,7 +98,7 @@ PATCH2RM= prefs.php.dist.orig servers.php.dist.orig
. if defined(WITH_IMAP-UW) || exists(${LOCALBASE}/libexec/imapd)
RUN_DEPENDS+= ${LOCALBASE}/libexec/imapd:${PORTSDIR}/mail/imap-uw
. elif defined(WITH_CYRUS-IMAPD) || exists(${LOCALBASE}/lib/libacap.a)
-RUN_DEPENDS+= ${LOCALBASE}/lib/libacap.a:${PORTSDIR}/mail/cyrus-imapd2
+RUN_DEPENDS+= ${LOCALBASE}/lib/libacap.a:${PORTSDIR}/mail/cyrus-imapd23
. elif defined(WITH_COURIER-IMAP) || exists(${LOCALBASE}/bin/deliverquota)
RUN_DEPENDS+= ${LOCALBASE}/bin/deliverquota:${PORTSDIR}/mail/courier-imap
. elif defined(WITH_DOVECOT) || exists(${LOCALBASE}/libexec/dovecot/imap)