summaryrefslogtreecommitdiffstats
path: root/mail/exim
diff options
context:
space:
mode:
authoreik <eik@FreeBSD.org>2005-02-03 03:55:00 +0000
committereik <eik@FreeBSD.org>2005-02-03 03:55:00 +0000
commitf59ce43e4fc51a3908d953e9ef9b230f14130a4b (patch)
tree1ccae439ca31db0a99abff423a4ee94cc4e95fdc /mail/exim
parent15d0a96d47f6b08abdc88ee22503a17426af6ce2 (diff)
downloadFreeBSD-ports-f59ce43e4fc51a3908d953e9ef9b230f14130a4b.zip
FreeBSD-ports-f59ce43e4fc51a3908d953e9ef9b230f14130a4b.tar.gz
- update SA-Exim to 4.2
- add support for Berkeley DB 4.3 Thanks to Sergey Matveychuk <sem@FreeBSD.org> for committing PR 76273.
Diffstat (limited to 'mail/exim')
-rw-r--r--mail/exim/Makefile15
-rw-r--r--mail/exim/distinfo4
-rw-r--r--mail/exim/options8
3 files changed, 15 insertions, 12 deletions
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 54a701e..e61e9b0 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -38,7 +38,7 @@ DISTFILES+= sa-exim-${SA_EXIM_VERSION}.tar.gz:sa_exim
EXIM_VERSION= 4.44
EXISCAN_VERSION=28
-SA_EXIM_VERSION=4.1
+SA_EXIM_VERSION=4.2
IGNOREFILES= FAQ.txt.bz2
@@ -159,16 +159,16 @@ PLIST_SUB= EXIM_VERSION="${EXIM_VERSION}-${PORTREVISION}" \
# Define WITH_OPENLDAP or WITH_OPENLDAP_VER to link against libldap.
# Define WITH_OPENLDAP_VER to specify a particular version of
-# OpenLDAP to use. Valid values are currently 21 and 22.
+# OpenLDAP to use. Valid values are currently 21, 22 and 23.
# Defining WITH_OPENLDAP_VER implies WITH_OPENLDAP.
# Exim also supports NETSCAPE and SOLARIS7 lookup types, but no
# client libraries exist for these in the ports tree.
#WITH_OPENLDAP= yes
-#WITH_OPENLDAP_VER= 21
+#WITH_OPENLDAP_VER= 22
# WITH_BDB_VER is the version of the Berkeley DB library to use, and
# may be 1, which corresponds to version 1.85 in the base system, 4,
-# 41 or 42 which depends on the databases/db4[12] ports.
+# 41, 42 or 43 which depends on the databases/db4[123] ports.
WITH_BDB_VER?=1
# When Exim is decoding MIME "words" in header lines it converts any foreign
@@ -345,8 +345,12 @@ LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41
DB_LIBS= -L${LOCALBASE}/lib -ldb-4.2
DB_INCLUDES= -I${LOCALBASE}/include/db42
LIB_DEPENDS+= db-4.2.2:${PORTSDIR}/databases/db42
+.elif (${WITH_BDB_VER} == 43)
+DB_LIBS= -L${LOCALBASE}/lib -ldb-4.3
+DB_INCLUDES= -I${LOCALBASE}/include/db43
+LIB_DEPENDS+= db-4.3.0:${PORTSDIR}/databases/db43
.else
-BROKEN= WITH_BDB_VER must be either 1, 4, 41 or 42
+BROKEN= WITH_BDB_VER must be either 1, 4, 41, 42 or 43
.endif
SEDLIST+= -e 's,XX_DB_LIBS_XX,${DB_LIBS},' \
-e 's,XX_DB_INCLUDES_XX,${DB_INCLUDES},'
@@ -580,7 +584,6 @@ do-configure:
@${CP} ${WRKDIR}/sa-exim-${SA_EXIM_VERSION}/sa-exim.c ${WRKSRC}/Local
@{ \
${ECHO_CMD} "char *version=\"${SA_EXIM_VERSION}\";"; \
- ${ECHO_CMD} "#define DLOPEN_LOCAL_SCAN 1"; \
${ECHO_CMD} "#define SPAMC_LOCATION \"${LOCALBASE}/bin/spamc\""; \
${ECHO_CMD} "#define SPAMASSASSIN_CONF \"${PREFIX}/etc/exim/sa-exim.conf\""; \
} > ${WRKSRC}/Local/sa-exim.h
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index 7d4b662..ea0f7e0 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,7 +1,7 @@
MD5 (exim/exim-4.44.tar.bz2) = 7487274e013b598d97445987d38b2071
SIZE (exim/exim-4.44.tar.bz2) = 1364290
-MD5 (exim/sa-exim-4.1.tar.gz) = e2ab67741daa08f7df5bc2152bc4aef5
-SIZE (exim/sa-exim-4.1.tar.gz) = 59441
+MD5 (exim/sa-exim-4.2.tar.gz) = ad76f73c6b3d01caa88078e3e622745a
+SIZE (exim/sa-exim-4.2.tar.gz) = 66575
MD5 (exim/exiscan-acl-4.44-28.patch.bz2) = 72ef5567106e89e6cef1cc742ab52525
SIZE (exim/exiscan-acl-4.44-28.patch.bz2) = 83434
MD5 (exim/FAQ.txt.bz2) = IGNORE
diff --git a/mail/exim/options b/mail/exim/options
index bc811be..3a8d5dc 100644
--- a/mail/exim/options
+++ b/mail/exim/options
@@ -13,10 +13,10 @@
#WITHOUT_SA_EXIM
# SA-Exim support (<http://marc.merlins.org/linux/exim/sa.html>)
-#WITH_BDB_VER= 1, 4, 41, 42
+#WITH_BDB_VER= 1, 4, 41, 42, 43
# BDB_VER is the version of the Berkeley DB library to use, and
# may be 1, which corresponds to version 1.85 in the base system, 4,
-# 41 or 42 which depends on the databases/db4[12] ports.
+# 41, 42 or 43 which depends on the databases/db4[123] ports.
#WITH_DEFAULT_CHARSET= ISO-8859-1, *
# When Exim is decoding MIME "words" in header lines it converts any foreign
@@ -30,10 +30,10 @@
#! lookup types
#WITHOUT_OPENLDAP
-#WITH_OPENLDAP_VER= auto, 21, 22
+#WITH_OPENLDAP_VER= auto, 21, 22, 23
# Link against libldap.
# Define OPENLDAP_VER to specify a particular version of
-# OpenLDAP to use. Valid values are currently auto, 21 and 22.
+# OpenLDAP to use. Valid values are currently auto, 21, 22 and 23.
# The use of `auto' is recommended to avoid conflicting with
# other ports that use the OpenLDAP client libraries.
# Exim also supports NETSCAPE and SOLARIS7 lookup types, but no
OpenPOWER on IntegriCloud