aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/exim/Makefile8
-rw-r--r--mail/exim/distinfo4
2 files changed, 4 insertions, 8 deletions
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 2f4b830ace7d..052bbb637770 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -25,7 +25,7 @@ MAINTAINER= eik@FreeBSD.org
COMMENT?= High performance MTA for Unix systems on the Internet
EXIM_VERSION= 4.32
-EXISCAN_VERSION=18
+EXISCAN_VERSION=19
.if !defined(EXIMON_ONLY)
.if defined(PKGNAMESUFFIX)
@@ -132,7 +132,7 @@ 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 12, 20, 21 and 22.
+# OpenLDAP to use. Valid values are currently 21 and 22.
# 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.
@@ -249,11 +249,7 @@ WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER}
.if defined(WITH_OPENLDAP)
USE_OPENLDAP= yes
-.if defined(WANT_OPENLDAP_VER) && ${WANT_OPENLDAP_VER} == 12
-LDAP_LIB_TYPE= OPENLDAP1
-.else
LDAP_LIB_TYPE= OPENLDAP2
-.endif
SEDLIST+= -e 's,XX_LDAP_LIBS_XX,-L${LOCALBASE}/lib -llber -lldap,' \
-e 's,XX_LDAP_INCLUDE_XX,-I${LOCALBASE}/include,' \
-e 's,XX_LDAP_TYPE_XX,${LDAP_LIB_TYPE},' \
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index 0cbbfeaaced4..56208d425b5f 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,4 +1,4 @@
MD5 (exim/exim-4.32.tar.bz2) = f2dcbca57a8051c4d89d2cc8d96efd94
SIZE (exim/exim-4.32.tar.bz2) = 1321711
-MD5 (exim/exiscan-acl-4.32-18.patch.bz2) = 6704112506aa9b8a7b28fa68094a2931
-SIZE (exim/exiscan-acl-4.32-18.patch.bz2) = 72288
+MD5 (exim/exiscan-acl-4.32-19.patch.bz2) = d1a3e095ab8c0733bc242155437d1729
+SIZE (exim/exiscan-acl-4.32-19.patch.bz2) = 73403