Update 3.13 -> 3.14:

	New pgsql lookup!
	Bugfixes.

Port-related changes:

	Conditionalize embedded Perl interpreter on WITH_PERL.
	Fix SMTP AUTH support.
	Sync up files/Makefile.

3 files changed, 130 insertions, 58 deletions

diff --git a/mail/exim-devel/Makefile b/mail/exim-devel/Makefile
index 36b5178bf84b..d6df561973aa 100644
--- a/mail/exim-devel/Makefile
+++ b/mail/exim-devel/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	exim
-PORTVERSION= 	3.13
+PORTVERSION= 	3.14
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/ \
 		http://www.exim.org/ftp/ \
 		ftp://ftp.is.co.za/networking/mail/transport/exim/
-DISTFILES=	exim-3.13.tar.gz exim-texinfo-3.10.tar.gz
+DISTFILES=	exim-3.14.tar.gz exim-texinfo-3.10.tar.gz
 
 MAINTAINER=	sheldonh@FreeBSD.org
 
@@ -25,21 +25,23 @@ USE_PERL5=	yes
 
 MAKE_ENV+=	OSTYPE=${OPSYS} ARCHTYPE=${MACHINE_ARCH}
 
-# Uncomment the WITH_MYSQL and WITH_PAM definitions to link against
-# libmysqlclient and libpam respectively.  The libpam linkage is
-# required for SMTP AUTH support.
+# Uncomment the WITH_LDAP, WITH_MYSQL, WITH_PAM and WITH_PGSQL definitions
+# to link against libmysqlclient, libpam and libpq respectively.
+# The libpam linkage is required for SMTP AUTH support.
+#WITH_LDAP=	yes
 #WITH_MYSQL=	yes
 #WITH_PAM=	yes
+#WITH_PGSQL=	yes
+
+# Enable the embedded Perl interpreter, allowing Perl subroutines to be
+# called during string expansion.
+WITH_PERL=	yes
 
 # If WITH_PAM is defined then one or more of PAM_CRAM_MD5 and PAM_PLAINTEXT
 # must be left uncommented.
 PAM_CRAM_MD5=	yes
 PAM_PLAINTEXT=	yes
 
-# Uncommment the WITH_LDAP definition to enable LDAP lookups (requires
-# the openldap port.
-#WITH_LDAP=	yes
-
 # If WITH_LDAP is defined, LDAP_LIB_TYPE must be one of UMICHIGAN,
 # NETSCAPE or SOLARIS7.
 LDAP_LIB_TYPE=UMICHIGAN
@@ -54,7 +56,11 @@ LDAP_LIB_TYPE=UMICHIGAN
 SEDLIST=	-e 's,XX_PREFIX_XX,${PREFIX},' \
 		-e 's,XX_BINOWN_XX,${BINOWN},'
 .if !defined(USE_XLIB)
-SEDLIST+=	-e 's/^EXIM_MONITOR/\#EXIM_MONITOR/'
+SEDLIST+=	-e 's,^EXIM_MONITOR,\#EXIM_MONITOR,'
+.endif
+
+.if !defined(WITH_PERL)
+SEDLIST+=	-e 's,^EXIM_PERL,\#EXIM_PERL,'
 .endif
 
 .if defined(WITH_LDAP)
@@ -77,34 +83,45 @@ SEDLIST+=	-e 's,XX_MYSQL_LIBS_XX,-L${PREFIX}/lib/mysql -lmysqlclient,' \
 SEDLIST+=	-e 's,XX_MYSQL_[^ ]*_XX,,'
 .endif
 
-.if !defined(WITH_MYSQL)
-SEDLIST+=	-e 's/^LOOKUP_LIBS/\#LOOKUP_LIBS/' \
-		-e 's/^LOOKUP_INCLUDE/\#LOOKUP_INCLUDE/'
-.endif
-
-.if !defined(WITH_PAM)
-SEDLIST+=	-e 's/^SUPPORT_PAM/\#SUPPORT_PAM/' \
-		-e 's/^PAM_LIBS/\#PAM_LIBS/'
+.if defined(WITH_PAM)
+SEDLIST+=	-e 's,XX_PAM_LIBS_XX,-lpam,'
+.else
+SEDLIST+=	-e 's,XX_PAM_LIBS_XX,,' \
+		-e 's,^SUPPORT_PAM,\#SUPPORT_PAM,' 
 .endif
 
 .if !defined(WITH_PAM) || !defined(PAM_CRAM_MD5)
-SEDLIST+=	-e 's/^AUTH_CRAM_MD5/\#AUTH_CRAM_MD5/'
+SEDLIST+=	-e 's,^AUTH_CRAM_MD5,\#AUTH_CRAM_MD5,'
 .endif
 
 .if !defined(WITH_PAM) || !defined(PAM_PLAINTEXT)
-SEDLIST+=	-e 's/^AUTH_PLAINTEXT/\#AUTH_PLAINTEXT/'
+SEDLIST+=	-e 's,^AUTH_PLAINTEXT,\#AUTH_PLAINTEXT,'
+.endif
+
+.if defined(WITH_PGSQL)
+LIB_DEPENDS+=	libpq.2:${PORTSDIR}/databases/postgresql
+SEDLIST+=	-e 's,XX_PGSQL_LIBS_XX,-L${PREFIX}/pgsql/lib -lpq,' \
+		-e 's,XX_PGSQL_INCLUDE_XX,-I${PREFIX}/pgsql/include,' \
+		-e 's,^\# LOOKUP_PGSQL,LOOKUP_PGSQL,'
+.else
+SEDLIST+=	-e 's,XX_PGSQL_[^ ]*_XX,,'
+.endif
+
+.if !defined(WITH_PGSQL) && !defined(WITH_MYSQL) && !defined(WITH_LDAP)
+SEDLIST+=	-e 's,^LOOKUP_LIBS,\#LOOKUP_LIBS,' \
+		-e 's,^LOOKUP_INCLUDE,\#LOOKUP_INCLUDE,'
 .endif
 
 .if defined(WITH_MAILDIR)
-SEDLIST+=	-e 's/^\# SUPPORT_MAILDIR/SUPPORT_MAILDIR/'
+SEDLIST+=	-e 's,^\# SUPPORT_MAILDIR,SUPPORT_MAILDIR,'
 .endif
 
 .if defined(WITH_MAILSTORE)
-SEDLIST+=	-e 's/^\# SUPPORT_MAILSTORE/SUPPORT_MAILSTORE/'
+SEDLIST+=	-e 's,^\# SUPPORT_MAILSTORE,SUPPORT_MAILSTORE,'
 .endif
 
 .if defined(WITH_MBX)
-SEDLIST+=	-e 's/^\# SUPPORT_MBX/SUPPORT_MBX/'
+SEDLIST+=	-e 's,^\# SUPPORT_MBX,SUPPORT_MBX,'
 .endif
 
 do-configure:
diff --git a/mail/exim-devel/distinfo b/mail/exim-devel/distinfo
index 837eb016a70d..de3418b77e5d 100644
--- a/mail/exim-devel/distinfo
+++ b/mail/exim-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (exim-3.13.tar.gz) = d4821c12e75814ddeb9a304d58c1e248
+MD5 (exim-3.14.tar.gz) = 271b4b7f5a2e6c292d0c69f1d44dc013
 MD5 (exim-texinfo-3.10.tar.gz) = c8c2596e6a303f774e0a627e61b4dffc
diff --git a/mail/exim-devel/files/Makefile b/mail/exim-devel/files/Makefile
index cfb2d153222c..63021a5cd58a 100644
--- a/mail/exim-devel/files/Makefile
+++ b/mail/exim-devel/files/Makefile
@@ -35,14 +35,14 @@
 # (dynamic run-time library).
 
 # Another area of variability between systems is the type and location of the
-# dbm library package. Exim has support for ndbm, gdbm, and Berkeley db. By
-# default it assumes ndbm; this often works with gdbm or db, provided they
+# dbm library package. Exim has support for ndbm, gdbm, and Berkeley DB. By
+# default it assumes ndbm; this often works with gdbm or DB, provided they
 # are correctly installed, via their compatibility interfaces. However, Exim
-# can also be configured to use the native calls for Berkeley db 1.85, and
-# this is defaulted for some operating systems. The defaults are set in
-# OS/Makefile-Default, and can be changed by putting things into an OS-specific
-# Makefile, or indeed into the main Local/Makefile if Exim is being compiled
-# for a single OS only.
+# can also be configured to use the native calls for Berkeley DB 1.85 or
+# Berkeley DB version 2.x, and this is defaulted for some operating systems.
+# The defaults are set in OS/Makefile-Default, and can be changed by putting
+# things into an OS-specific Makefile, or indeed into the main Local/Makefile
+# if Exim is being compiled for a single OS only.
 
 # See also the file doc/dbm.discuss.txt for discussion about different dbm
 # libraries.
@@ -53,8 +53,11 @@
 #
 # EXIM_GID=42   # the "mail" group
 #
-# Consequently, it is not possible to have the # character present in any
-# setting, but I can't think of any cases where this would be wanted.
+# However, with some versions of "make" this works only if there is no white
+# space between the end of the setting and the #, so it is probably best
+# avoided. However, a consequence of this facility is that it is not possible
+# to have the # character present in any setting, but I can't think of any
+# cases where this would be wanted.
 ###############################################################################
 
 
@@ -85,6 +88,15 @@
 # AR=ar cq
 
 
+# Exim has some support for the AUTH extension of SMTP (RFC 2554). If you want
+# to use this you must uncomment at least one of the following macros so that
+# appropriate code is included in the binary. You then need to set up the
+# runtime configuration to make use of the mechanism(s) selected.
+
+AUTH_CRAM_MD5=yes
+AUTH_PLAINTEXT=yes
+
+
 # The binary directory: This variable defines where the exim binary will be
 # installed by "make install" or "exim_install". It is also used internally
 # by exim when it needs to re-invoke itself, either to send an error message,
@@ -114,6 +126,12 @@ COMPRESS_COMMAND=/usr/bin/gzip
 COMPRESS_SUFFIX=gz
 
 
+# If the exigrep utility is fed compressed log files, it tries to uncompress
+# them using this command.
+
+ZCAT_COMMAND=/usr/bin/zcat
+
+
 # The runtime configuration file: This variable defines where Exim's runtime
 # configuration file is. There is no default built into the source files, so
 # there must be a setting in one of the local configuration files. The
@@ -196,11 +214,13 @@ EXICYCLOG_MAX=10
 
 
 # Running Exim without it being root all the time: A uid and gid for Exim can
-# be specified here. These values are compiled into the binary. It is possible
-# to change them by settings in the runtime configuration file, but setting
-# them here is preferred. If EXIM_UID is not defined, the default in the code
-# is to run as root unless specified otherwise at run time. Specifying 0 at
-# run time has the effect of unsetting the values build into the binary.
+# be specified here, and this is strongly recommended. These values are
+# compiled into the binary. It is possible to change them by settings in the
+# runtime configuration file, but setting them here is preferred. If EXIM_UID
+# is not defined, the default in the code is to run as root (unless specified
+# otherwise at run time) except when doing local deliveries, when it always
+# runs as the appropriate local user. Specifying 0 at run time has the effect
+# of unsetting the values build into the binary.
 
 # The settings here must be numeric; the run time file allows names to
 # be used. When this uid and gid are set, the Exim binary still has to be
@@ -248,7 +268,7 @@ EXIM_PERL=perl.o
 # port, start off a header line, and then just pump junk at it for ever. The
 # message_size_limit option would also catch this, but it may not be set.
 
-# HEADER_MAXSIZE=(1024*1024)
+# HEADER_MAXSIZE="(1024*1024)"
 
 
 # The mode of the input directory: The input directory is where messages are
@@ -262,8 +282,8 @@ EXIM_PERL=perl.o
 # single log directory. You can define the directory and the form of the
 # log file name here, by setting LOG_FILE_PATH to a path name containing one
 # occurrence of %s. This will be replaced by one of the strings "main",
-# "panic", "process" or "reject" to form the final file name. For example,
-# some installations may want something like this:
+# "panic", or "reject" to form the final file name. For example, some
+# installations may want something like this:
 
 LOG_FILE_PATH=/var/log/exim_%slog
 
@@ -274,6 +294,15 @@ LOG_FILE_PATH=/var/log/exim_%slog
 # EXIM_GID above, then that uid and gid must be able to create files in the
 # directory you have specified.
 
+# You can also configure Exim to use syslog, instead of or as well as log
+# files, by settings such as these
+
+# LOG_FILE_PATH=syslog
+# LOG_FILE_PATH=syslog:/var/log/exim_%slog
+
+# Do not include white space in such a setting as it messes up the building
+# process.
+
 # You do not have to define the log file path here; an option in the runtime
 # configuration file can also set it, and that overrides any setting here.
 # However, it is recommended that you set it here if it is a fixed path, so
@@ -312,17 +341,18 @@ LOOKUP_LSEARCH=yes
 # LOOKUP_MYSQL=yes
 # LOOKUP_NIS=yes
 # LOOKUP_NISPLUS=yes
+# LOOKUP_PGSQL=yes
 
 # Additional libraries and include directories may be required for some
-# lookup styles, e.g. LDAP or MYSQL. LOOKUP_LIBS is included only on the
-# command for linking Exim itself, not on any auxiliary programs. You
+# lookup styles, e.g. LDAP, MYSQL or PGSQL. LOOKUP_LIBS is included only on
+# the command for linking Exim itself, not on any auxiliary programs. You
 # don't need to set LOOKUP_INCLUDE if the relevant directories are already
 # specified in INCLUDE.
 
-# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include
-# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient
-LOOKUP_INCLUDE=XX_MYSQL_INCLUDE_XX
-LOOKUP_LIBS=XX_MYSQL_LIBS_XX
+# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include
+# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq
+LOOKUP_INCLUDE=XX_MYSQL_INCLUDE_XX XX_PGSQL_INCLUDE_XX XX_LDAP_INCLUDE_XX
+LOOKUP_LIBS=XX_MYSQL_LIBS_XX XX_PGSQL_LIBS_XX XX_LDAP_LIBS_XX
 
 # If you have set LDAP=yes, you should set LDAP_LIB_TYPE to indicate which LDAP
 # library you have. Unfortunately, though most of their functions are the
@@ -334,7 +364,7 @@ LOOKUP_LIBS=XX_MYSQL_LIBS_XX
 # LDAP_LIB_TYPE=UMICHIGAN
 # LDAP_LIB_TYPE=NETSCAPE
 # LDAP_LIB_TYPE=SOLARIS7
-#LDAP_LIB_TYPE=XX_LDAP_TYPE_XX
+LDAP_LIB_TYPE=XX_LDAP_TYPE_XX
 
 # If you don't set any of these, Exim applies a heuristic to distinguish the
 # University of Michigan library, but it cannot distinguish between the other
@@ -347,6 +377,19 @@ LOOKUP_LIBS=XX_MYSQL_LIBS_XX
 # LOOKUP_TESTDB=yes
 
 
+# Network interfaces: Unless you set the local_interfaces option in the runtime
+# configuration file to restrict Exim to certain interfaces only, it will run
+# code to find all the interfaces there are on your host. Unfortunately,
+# the call to the OS that does this requires a buffer large enough to hold
+# data for all the interfaces - it was designed of course in the days when a
+# host rarely had more than three or four at most. Nowadays hosts can have
+# very many virtual interfaces running on the same hardware. If you have more
+# than 250 virtual interfaces, you will need to uncomment this setting and
+# increase the value.
+
+# MAXINTERFACES=250
+
+
 # Per-message logs: While a message is in the process of being delivered,
 # comments on its progress are written to a message log, for the benefit of
 # human administrators. These logs are held in a directory called "msglog"
@@ -454,6 +497,27 @@ SPOOL_DIRECTORY=/var/spool/exim
 # SUPPORT_MBX=yes
 
 
+# Moving frozen messages: If the following is uncommented, Exim is compiled
+# with support for automatically moving frozen messages out of the main spool
+# directory, a facility that is found useful by some large installations. A
+# runtime option is required to cause the moving actually to occur. Such
+# messages become "invisible" to the normal management tools.
+
+# SUPPORT_MOVE_FROZEN_MESSAGES=yes
+
+
+# Support for PAM (Pluggable Authentication Modules), a facility
+# which is available in the latest releases of Solaris and in some GNU/Linux
+# distributions (see http://ftp.at.kernel.org/pub/linux/libs/pam/). The Exim
+# support, which is intended for use in conjunction with the SMTP AUTH
+# facilities, is included only when requested by the following setting:
+
+SUPPORT_PAM=yes
+
+# You probably need to add -lpam to EXTRALIBS, and in some releases of
+# GNU/Linux -ldl is also needed.
+
+
 # Included transports: These variables determine which individual transport
 # drivers are included in the Exim binary. There are no defaults; those that
 # are wanted must be defined here by setting the appropriate variables to the
@@ -473,15 +537,6 @@ TRANSPORT_SMTP=yes
 # chapter on building and installing Exim.
 
 USE_TCP_WRAPPERS=yes
-EXTRALIBS=-lwrap
-
-
-# Experimental SMTP AUTH support, untested by the maintainer of the FreeBSD
-# port of Exim.
-
-AUTH_CRAM_MD5=yes
-AUTH_PLAINTEXT=yes
-SUPPORT_PAM=yes
-PAM_LIBS=-lpam
+EXTRALIBS=-lwrap XX_PAM_LIBS_XX
 
 # End of EDITME