aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mail/cyrus-imapd2/Makefile11
-rw-r--r--mail/cyrus-imapd2/distinfo2
-rw-r--r--mail/cyrus-imapd22/Makefile8
-rw-r--r--mail/cyrus-imapd22/distinfo1
-rw-r--r--mail/cyrus-imapd23/Makefile8
-rw-r--r--mail/cyrus-imapd23/distinfo1
-rw-r--r--mail/cyrus-imapd24/Makefile8
-rw-r--r--mail/cyrus-imapd24/distinfo1
8 files changed, 15 insertions, 25 deletions
diff --git a/mail/cyrus-imapd2/Makefile b/mail/cyrus-imapd2/Makefile
index efc8feed3d34..16b8ba9cd8ff 100644
--- a/mail/cyrus-imapd2/Makefile
+++ b/mail/cyrus-imapd2/Makefile
@@ -50,15 +50,12 @@ USE_BDB_VER= ${WITH_BDB_VER}
.else
USE_BDB_VER= 3
.endif
-.if ${USE_BDB_VER} == 3
-LIB_DEPENDS+= db3.3:${PORTSDIR}/databases/db3
-.elif ${USE_BDB_VER} == 4
-LIB_DEPENDS+= db4.0:${PORTSDIR}/databases/db4
-.elif ${USE_BDB_VER} == 41
-LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41
-.else
+.if ${USE_BDB_VER} == 4
+USE_BDB= 40
+.elif ${USE_BDB_VER} != 3 && ${USE_BDB_VER} != 41
BROKEN= "WITH_BDB_VER must be 3, 4 or 41"
.endif
+USE_BDB?= ${USE_BDB_VER}
CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db${USE_BDB_VER} \
--with-bdb=db${USE_BDB_VER}
diff --git a/mail/cyrus-imapd2/distinfo b/mail/cyrus-imapd2/distinfo
index 843ae86f844d..6a9c266dbdcf 100644
--- a/mail/cyrus-imapd2/distinfo
+++ b/mail/cyrus-imapd2/distinfo
@@ -1,4 +1,6 @@
MD5 (cyrus-imapd-2.1.18.tar.gz) = 52e4849e6cfea03c89bc3ab6d5b4e85b
+SHA256 (cyrus-imapd-2.1.18.tar.gz) = dbf0df884014b409145e927b822c8dd98b92a6c5fedb06fa440a034597225031
SIZE (cyrus-imapd-2.1.18.tar.gz) = 1711522
MD5 (cyrus-imapd-2.1.16-ipv6-20031121.diff.gz) = 1a0afe2b9b4980ff7a2406c8a29e5d64
+SHA256 (cyrus-imapd-2.1.16-ipv6-20031121.diff.gz) = 1187f3e61e151c679ac0e9b85a4fc31294d31b2e5dad19d53f8890988b2c79c7
SIZE (cyrus-imapd-2.1.16-ipv6-20031121.diff.gz) = 33500
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index d137aefb38fe..e12ca954a4c6 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -115,24 +115,20 @@ BROKEN= "Multiple BDB versions selected. Run 'make config' again!"
.endif
.if defined(WITH_BDB_3)
BDB_VER= 3
-BDB_MAJOR= 3
.elif defined(WITH_BDB_4)
BDB_VER= 4
-BDB_MAJOR= 0
+USE_BDB= 40
.elif defined(WITH_BDB_41)
BDB_VER= 41
-BDB_MAJOR= 1
.elif defined(WITH_BDB_42)
BDB_VER= 42
BDB_SUFFIX= -4.2
-BDB_MAJOR= 2
.elif defined(WITH_BDB_43)
BDB_VER= 43
BDB_SUFFIX= -4.3
-BDB_MAJOR= 0
.endif
+USE_BDB?= ${BDB_VER}
BDB_SUFFIX?= ${BDB_VER}
-LIB_DEPENDS+= db${BDB_SUFFIX}.${BDB_MAJOR}:${PORTSDIR}/databases/db${BDB_VER}
CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db${BDB_VER} \
--with-bdb=db${BDB_SUFFIX}
diff --git a/mail/cyrus-imapd22/distinfo b/mail/cyrus-imapd22/distinfo
index ac5f81216c54..4fb77feecc25 100644
--- a/mail/cyrus-imapd22/distinfo
+++ b/mail/cyrus-imapd22/distinfo
@@ -1,2 +1,3 @@
MD5 (cyrus-imapd-2.2.12.tar.gz) = 70b3bba526a8d36d3bb23a87d37e9188
+SHA256 (cyrus-imapd-2.2.12.tar.gz) = 3c6f41255ba15d8b2ea78320dd5e0c98e07fe0b5c3c4b84bc20f503427bd1b7b
SIZE (cyrus-imapd-2.2.12.tar.gz) = 1961161
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index d137aefb38fe..e12ca954a4c6 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -115,24 +115,20 @@ BROKEN= "Multiple BDB versions selected. Run 'make config' again!"
.endif
.if defined(WITH_BDB_3)
BDB_VER= 3
-BDB_MAJOR= 3
.elif defined(WITH_BDB_4)
BDB_VER= 4
-BDB_MAJOR= 0
+USE_BDB= 40
.elif defined(WITH_BDB_41)
BDB_VER= 41
-BDB_MAJOR= 1
.elif defined(WITH_BDB_42)
BDB_VER= 42
BDB_SUFFIX= -4.2
-BDB_MAJOR= 2
.elif defined(WITH_BDB_43)
BDB_VER= 43
BDB_SUFFIX= -4.3
-BDB_MAJOR= 0
.endif
+USE_BDB?= ${BDB_VER}
BDB_SUFFIX?= ${BDB_VER}
-LIB_DEPENDS+= db${BDB_SUFFIX}.${BDB_MAJOR}:${PORTSDIR}/databases/db${BDB_VER}
CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db${BDB_VER} \
--with-bdb=db${BDB_SUFFIX}
diff --git a/mail/cyrus-imapd23/distinfo b/mail/cyrus-imapd23/distinfo
index ac5f81216c54..4fb77feecc25 100644
--- a/mail/cyrus-imapd23/distinfo
+++ b/mail/cyrus-imapd23/distinfo
@@ -1,2 +1,3 @@
MD5 (cyrus-imapd-2.2.12.tar.gz) = 70b3bba526a8d36d3bb23a87d37e9188
+SHA256 (cyrus-imapd-2.2.12.tar.gz) = 3c6f41255ba15d8b2ea78320dd5e0c98e07fe0b5c3c4b84bc20f503427bd1b7b
SIZE (cyrus-imapd-2.2.12.tar.gz) = 1961161
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index d137aefb38fe..e12ca954a4c6 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -115,24 +115,20 @@ BROKEN= "Multiple BDB versions selected. Run 'make config' again!"
.endif
.if defined(WITH_BDB_3)
BDB_VER= 3
-BDB_MAJOR= 3
.elif defined(WITH_BDB_4)
BDB_VER= 4
-BDB_MAJOR= 0
+USE_BDB= 40
.elif defined(WITH_BDB_41)
BDB_VER= 41
-BDB_MAJOR= 1
.elif defined(WITH_BDB_42)
BDB_VER= 42
BDB_SUFFIX= -4.2
-BDB_MAJOR= 2
.elif defined(WITH_BDB_43)
BDB_VER= 43
BDB_SUFFIX= -4.3
-BDB_MAJOR= 0
.endif
+USE_BDB?= ${BDB_VER}
BDB_SUFFIX?= ${BDB_VER}
-LIB_DEPENDS+= db${BDB_SUFFIX}.${BDB_MAJOR}:${PORTSDIR}/databases/db${BDB_VER}
CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db${BDB_VER} \
--with-bdb=db${BDB_SUFFIX}
diff --git a/mail/cyrus-imapd24/distinfo b/mail/cyrus-imapd24/distinfo
index ac5f81216c54..4fb77feecc25 100644
--- a/mail/cyrus-imapd24/distinfo
+++ b/mail/cyrus-imapd24/distinfo
@@ -1,2 +1,3 @@
MD5 (cyrus-imapd-2.2.12.tar.gz) = 70b3bba526a8d36d3bb23a87d37e9188
+SHA256 (cyrus-imapd-2.2.12.tar.gz) = 3c6f41255ba15d8b2ea78320dd5e0c98e07fe0b5c3c4b84bc20f503427bd1b7b
SIZE (cyrus-imapd-2.2.12.tar.gz) = 1961161