On 2009/12/12 20:15, Björn Ketelaars wrote:
> * Update to Exim 4.71 by Bernd;
> * Changed no_x11 flavor to -eximon subpackage. Exim monitor _eximon_
> is depending on X11, therefor PSEUDO_FLAVOR=no_eximon is added for
> those who like to compile in a X11-less environment);
> * Removed no_exiscan flavor, whereby exiscan and demime are enabled
> per default;
> * Removed iconv flavor, whereby libiconv is changed from optional to
> mandatory;
> * Added support for dovecot authentication _without_ creating another
> flavor;
> * Added a bit more information to MESSAGE concerning the use of mailwrapper;
> * Added a bit more information to DESCR concerning the "demime"
> condition (deprecated).
> * Removed information from DESCR concerning converting from Exim 3;
> * Removed Exim 3 converting script from package.
>
> Notes:
>
> * WITH_OLD_DEMIME is still supported and a note is placed in DESCR;
> * Logfiles are placed under /var/spool/exim/logs/;
> * There are still 5 flavors: mysql, postgresql, sqlite3, ldap and
> sasl. Andreas suggested to put all of these flavors into a single
> flavor called "heavy". An alternative could be to make a dependency
> on sasl (used for authentication) and keep the database flavors
> separate. On the other side...why reduce the number of flavors even
> further?
I think it's fine to keep the separate database flavours.
This diff breaks pkg_add updates though, which are very important
to have working - here's a new diff:
- @pkgpath/@conflict markers so that pkg_add updates work
- better license version comment
- trim some unneeded entries in WANTLIB-eximon
- tweak DESCR/MESSAGE wording slightly
- put USE_X11 back
- put old COMMENT back (now with lowercased first letter)
(no point repeating the name of the software that's already in PKGNAME)
- diff is rooted in ports/mail and includes the Makefile part to remove
the old flavours.
(Björn, note that you can 'cvs add' and 'cvs rm' files, even against
anoncvs, and then 'cvs diff -uNp', for a diff which adds/removes files
as necessary)
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/Makefile,v
retrieving revision 1.242
diff -u -p -r1.242 Makefile
--- Makefile 18 Nov 2009 19:10:05 -0000 1.242
+++ Makefile 13 Dec 2009 11:10:57 -0000
@@ -57,15 +57,9 @@
SUBDIR += evolution-plugin-webcal
SUBDIR += exim
SUBDIR += exim,ldap
- SUBDIR += exim,ldap,no_x11
SUBDIR += exim,mysql
- SUBDIR += exim,mysql,no_x11
- SUBDIR += exim,mysql,postgresql,ldap,no_x11
- SUBDIR += exim,no_exiscan
- SUBDIR += exim,no_exiscan,no_x11
- SUBDIR += exim,no_x11
+ SUBDIR += exim,mysql,postgresql,ldap
SUBDIR += exim,postgresql
- SUBDIR += exim,postgresql,no_x11
SUBDIR += exmh2
SUBDIR += extsmail
SUBDIR += faces
Index: exim/Makefile
===================================================================
RCS file: /cvs/ports/mail/exim/Makefile,v
retrieving revision 1.67
diff -u -p -r1.67 Makefile
--- exim/Makefile 10 Aug 2009 06:32:42 -0000 1.67
+++ exim/Makefile 13 Dec 2009 11:10:57 -0000
@@ -1,38 +1,44 @@
# $OpenBSD: Makefile,v 1.67 2009/08/10 06:32:42 kili Exp $
-COMMENT= Flexible mail transfer agent
-DISTNAME= exim-4.69
-PKGNAME= ${DISTNAME}p2
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/ \
- http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/ \
- ftp://mirror.switch.ch/mirror/exim/exim/exim4/
+CATEGORIES= mail
+COMMENT-main= flexible mail transfer agent
+COMMENT-eximon= X11 monitor tool for Exim MTA
+VERSION= 4.71
+DISTNAME= exim-${VERSION}
+PKGNAME-main= exim-${VERSION}
+FULLPKGNAME-eximon= exim-eximon-${VERSION}
+MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/ \
+ http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/ \
+ ftp://mirror.switch.ch/mirror/exim/exim/exim4/
-HOMEPAGE= http://www.exim.org/
+HOMEPAGE= http://www.exim.org/
-MAINTAINER= Felix Kronlage <[email protected]>
+MAINTAINER= Felix Kronlage <[email protected]>
-# GPL
+# GPLv2+, with OpenSSL exemption
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c crypto perl ssl util wrap m
-FLAVORS=no_exiscan no_x11 mysql postgresql sqlite3 ldap iconv sasl
+PSEUDO_FLAVORS= no_eximon
+FLAVORS= mysql postgresql sqlite3 ldap sasl
FLAVOR?=
+MULTI_PACKAGES= -main
-NO_REGRESS=Yes
+MODULES= converters/libiconv
+LIB_DEPENDS= pcre::devel/pcre
+WANTLIB= c m
+WANTLIB-main= ${WANTLIB} crypto perl ssl util wrap
+WANTLIB-eximon= ${WANTLIB} X11 Xaw Xext Xmu Xt
+RUN_DEPENDS-eximon= ::${BASE_PKGPATH},-main
-.if !${FLAVOR:L:Mno_exiscan}
-EXIM_MAKECAT+= "WITH_CONTENT_SCAN=yes\n"
-EXIM_MAKECAT+= "WITH_OLD_DEMIME=yes\n"
-.endif
+NO_REGRESS=Yes
-.if !${FLAVOR:L:Mno_x11}
+.if !${FLAVOR:L:Mno_eximon}
USE_X11= Yes
+MULTI_PACKAGES+= -eximon
EXIM_MAKECAT+= "EXIM_MONITOR=eximon.bin\n"
-WANTLIB+= X11 Xaw Xext Xmu Xt pthread-stubs xcb
.endif
.if ${FLAVOR:L:Mmysql}
@@ -51,7 +57,6 @@ LIB_DEPENDS+= pq.>=2:postgresql-client-
.if ${FLAVOR:L:Msqlite3}
EXIM_MAKECAT+= "LOOKUP_SQLITE=yes\n"
-EXIM_LOOKUP_INCLUDE+= -I${LOCALBASE}/include
EXIM_LOOKUP_LIBS+= -L${LOCALBASE}/lib/ -lsqlite3
LIB_DEPENDS+= sqlite3.>=8::databases/sqlite3
.endif
@@ -59,42 +64,33 @@ LIB_DEPENDS+= sqlite3.>=8::databases/sq
.if ${FLAVOR:L:Mldap}
EXIM_MAKECAT+= "LOOKUP_LDAP=yes\n"
EXIM_MAKECAT+= "LDAP_LIB_TYPE=OPENLDAP2\n"
-EXIM_LOOKUP_INCLUDE+= -I${LOCALBASE}/include
EXIM_LOOKUP_LIBS+= -L${LOCALBASE}/lib -lldap -llber
-LIB_DEPENDS+= ldap.>=2,lber:openldap-client->=2,<3:databases/openldap
-.endif
-
-.if ${FLAVOR:L:Miconv}
-MODULES= converters/libiconv
-EXIM_MAKECAT+= "HAVE_ICONV=yes\n"
-EXIM_EXTRA_LIBS+= -L${LOCALBASE}/lib -liconv
-EXIM_CFLAGS+= -I${LOCALBASE}/include
+LIB_DEPENDS+= ldap.>=2,lber:openldap-client-2.*:databases/openldap
.endif
.if ${FLAVOR:L:Msasl}
EXIM_MAKECAT+= "AUTH_CYRUS_SASL=yes\n"
EXIM_EXTRA_LIBS+= -L${LOCALBASE}/lib -lsasl2
-EXIM_CFLAGS+= -I${LOCALBASE}/include
LIB_DEPENDS+= sasl2::security/cyrus-sasl2
.endif
-EXIM_EXTRA_LIBS+= -lwrap
+EXIM_EXTRA_LIBS+= -lwrap -L${LOCALBASE}/lib -liconv
-EXIM_MAKECAT+= "AUTH_DOVECOT=yes\n"
EXIM_MAKECAT+= "BIN_DIRECTORY=${PREFIX}/bin\n"
EXIM_MAKECAT+= "CONFIGURE_FILE=${SYSCONFDIR}/exim/configure\n"
EXIM_MAKECAT+= "LOOKUP_INCLUDE=${EXIM_LOOKUP_INCLUDE}\n"
EXIM_MAKECAT+= "LOOKUP_LIBS=${EXIM_LOOKUP_LIBS}\n"
EXIM_MAKECAT+= "EXTRALIBS_EXIM=${EXIM_EXTRA_LIBS}\n"
EXIM_MAKECAT+= "CFLAGS=${CFLAGS} ${EXIM_CFLAGS}\n"
+EXIM_MAKECAT+= "INCLUDE=-I${LOCALBASE}/include\n"
+
+MAKE_FLAGS+= FULLECHO=
do-configure:
@mkdir -p ${WRKSRC}/Local
@cp ${FILESDIR}/Makefile ${WRKSRC}/Local
@echo -n ${EXIM_MAKECAT} >> ${WRKSRC}/Local/Makefile
-.if !${FLAVOR:L:Mno_x11}
@cp ${FILESDIR}/eximon.conf ${WRKSRC}/Local
-.endif
pre-fake:
${INSTALL_DATA_DIR} ${WRKINST}${SYSCONFDIR}/mail
@@ -102,7 +98,6 @@ pre-fake:
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/exim
${INSTALL_DATA} ${WRKINST}${SYSCONFDIR}/exim/configure
${PREFIX}/share/examples/exim
- ${INSTALL_DATA} ${WRKSRC}/build-`uname -s`-`uname -m`/convert4r4
${PREFIX}/share/examples/exim
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/exim
${INSTALL_DATA} ${WRKSRC}/doc/spec.txt ${PREFIX}/share/doc/exim
${INSTALL_DATA} ${WRKSRC}/doc/README.SIEVE ${PREFIX}/share/doc/exim
Index: exim/distinfo
===================================================================
RCS file: /cvs/ports/mail/exim/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- exim/distinfo 3 Feb 2008 20:39:11 -0000 1.16
+++ exim/distinfo 13 Dec 2009 11:10:57 -0000
@@ -1,5 +1,5 @@
-MD5 (exim-4.69.tar.gz) = VujbHf4x4O5M74XolAzu3A==
-RMD160 (exim-4.69.tar.gz) = 0lnHZup58qJTknUwIRHJlk5xDf8=
-SHA1 (exim-4.69.tar.gz) = fq4faFvog2/G+1lwqtomVB4UqQ0=
-SHA256 (exim-4.69.tar.gz) = VvkLkngC4LVjaelTXYJs+1VHmq+6ZbaJ7NgP2LFCpgg=
-SIZE (exim-4.69.tar.gz) = 2131237
+MD5 (exim-4.71.tar.gz) = JVU4GNyjPfBvBoyvseDo6A==
+RMD160 (exim-4.71.tar.gz) = jBXMJ1syAD07Vi/L63B5BU8oKK0=
+SHA1 (exim-4.71.tar.gz) = gZjHCJK6jOGhxVCw0ZvHWQgUxTU=
+SHA256 (exim-4.71.tar.gz) = NvdpRKn4mPrSxk4mjVS9dl5hm+BgzbAyBVP8Kh9L8v4=
+SIZE (exim-4.71.tar.gz) = 2002790
Index: exim/files/Makefile
===================================================================
RCS file: /cvs/ports/mail/exim/files/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- exim/files/Makefile 15 Jan 2006 13:06:43 -0000 1.11
+++ exim/files/Makefile 13 Dec 2009 11:10:57 -0000
@@ -1,4 +1,4 @@
-# $Cambridge: exim/exim-src/src/EDITME,v 1.16 2005/10/12 15:45:38 ph10 Exp $
+# $Cambridge: exim/exim-src/src/EDITME,v 1.23 2009/11/20 12:18:19 nm4 Exp $
##################################################
# The Exim mail transport agent #
@@ -100,7 +100,7 @@
# /usr/local/sbin. The installation script will try to create this directory,
# and any superior directories, if they do not exist.
-# BIN_DIRECTORY=/usr/exim/bin
+#BIN_DIRECTORY=/usr/exim/bin
#------------------------------------------------------------------------------
@@ -116,7 +116,7 @@
# don't exist. It will also install a default runtime configuration if this
# file does not exist.
-# CONFIGURE_FILE=/usr/exim/configure
+#CONFIGURE_FILE=/usr/exim/configure
# It is possible to specify a colon-separated list of files for CONFIGURE_FILE.
# In this case, Exim will use the first of them that exists when it is run.
@@ -260,9 +260,9 @@ SUPPORT_MBX=yes
LOOKUP_DBM=yes
LOOKUP_LSEARCH=yes
+LOOKUP_DNSDB=yes
LOOKUP_CDB=yes
-LOOKUP_DNSDB=yes
LOOKUP_DSEARCH=yes
# LOOKUP_IBASE=yes
# LOOKUP_LDAP=yes
@@ -301,6 +301,19 @@ LOOKUP_PASSWD=yes
#------------------------------------------------------------------------------
+# The PCRE library is required for exim. There is no longer an embedded
+# version of the PCRE library included with the source code, instead you
+# must use a system library or build your own copy of PCRE.
+# In either case you must specify the library link info here. If the
+# PCRE header files are not in the standard search path you must also
+# modify the INCLUDE path (above)
+# The default setting of PCRE_LIBS should work on the vast majority of
+# systems
+
+PCRE_LIBS=-lpcre
+
+
+#------------------------------------------------------------------------------
# Additional libraries and include directories may be required for some
# 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
@@ -330,14 +343,14 @@ LOOKUP_PASSWD=yes
# and the MIME ACL. Please read the documentation to learn more about these
# features.
-# WITH_CONTENT_SCAN=yes
+WITH_CONTENT_SCAN=yes
# If you want to use the deprecated "demime" condition in the DATA ACL,
# uncomment the line below. Doing so will also explicitly turn on the
# WITH_CONTENT_SCAN option. If possible, use the MIME ACL instead of
# the "demime" condition.
-# WITH_OLD_DEMIME=yes
+WITH_OLD_DEMIME=yes
#------------------------------------------------------------------------------
# Compiling Exim with experimental features. These are documented in
@@ -475,6 +488,7 @@ ALT_CONFIG_ROOT_ONLY=yes
AUTH_CRAM_MD5=yes
# AUTH_CYRUS_SASL=yes
+AUTH_DOVECOT=yes
AUTH_PLAINTEXT=yes
AUTH_SPA=yes
@@ -513,7 +527,7 @@ HEADERS_CHARSET="ISO-8859-1"
# the Sieve filter support. For those OS where iconv() is known to be installed
# as standard, the file in OS/Makefile-xxxx contains
#
-# HAVE_ICONV=yes
+HAVE_ICONV=yes
#
# If you are not using one of those systems, but have installed iconv(), you
# need to uncomment that line above. In some cases, you may find that iconv()
@@ -535,7 +549,7 @@ HEADERS_CHARSET="ISO-8859-1"
# configuration of an authenticator for use with SMTP AUTH.) At least one
# operating system has an extended function called crypt16(), which uses up to
# 16 characters of a password (the normal crypt() uses only the first 8). Exim
-# supports the use of crypt16() as well as crypt().
+# supports the use of crypt16() as well as crypt() but note the warning below.
# You can always indicate a crypt16-encrypted password by preceding it with
# "{crypt16}". If you want the default handling (without any preceding
@@ -547,10 +561,23 @@ HEADERS_CHARSET="ISO-8859-1"
# an encrypted password with "{crypt}". For more details, see the description
# of the "crypteq" condition in the manual chapter on string expansions.
-# Since most operating systems do not include a crypt16() function (yet?), Exim
-# has one of its own, which it uses unless HAVE_CRYPT16 is defined. Normally,
-# that will be set in an OS-specific Makefile for the OS that have such a
-# function, so you should not need to bother with it.
+# Some operating systems do not include a crypt16() function, so Exim has one
+# of its own, which it uses unless HAVE_CRYPT16 is defined. Normally, that will
+# be set in an OS-specific Makefile for the OS that have such a function, so
+# you should not need to bother with it.
+
+# *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING ***
+# It turns out that the above is not entirely accurate. As well as crypt16()
+# there is a function called bigcrypt() that some operating systems have. This
+# may or may not use the same algorithm, and both of them may be different to
+# Exim's built-in crypt16() that is used unless HAVE_CRYPT16 is defined.
+#
+# However, since there is now a move away from the traditional crypt()
+# functions towards using SHA1 and other algorithms, tidying up this area of
+# Exim is seen as very low priority. In practice, if you need to, you can
+# define DEFAULT_CRYPT to the name of any function that has the same interface
+# as the traditional crypt() function.
+# *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING ***
#------------------------------------------------------------------------------
@@ -845,7 +872,7 @@ SYSTEM_ALIASES_FILE=/etc/mail/aliases
# USE_READLINE=yes
-# You may need to add -ldl to EXTRA_LIBS when you set USE_READLINE=yes.
+# You may need to add -ldl to EXTRALIBS when you set USE_READLINE=yes.
# Note that this option adds to the size of the Exim binary, because the
# dynamic loading library is not otherwise included.
@@ -872,8 +899,10 @@ SYSTEM_ALIASES_FILE=/etc/mail/aliases
# CHOWN_COMMAND=/usr/bin/chown
# CHGRP_COMMAND=/usr/bin/chgrp
+# CHMOD_COMMAND=/usr/bin/chmod
# MV_COMMAND=/bin/mv
# RM_COMMAND=/bin/rm
+# TOUCH_COMMAND=/usr/bin/touch
# PERL_COMMAND=/usr/bin/perl
@@ -1102,5 +1131,21 @@ PID_FILE_PATH=/var/run/exim.pid
# messages become "invisible" to the normal management tools.
# SUPPORT_MOVE_FROZEN_MESSAGES=yes
+
+
+#------------------------------------------------------------------------------
+# Disabling the use of fsync(): DO NOT UNCOMMENT THE FOLLOWING LINE unless you
+# really, really, really know what you are doing. And even then, think again.
+# You should never uncomment this when compiling a binary for distribution.
+# Use it only when compiling Exim for your own use.
+#
+# Uncommenting this line enables the use of a runtime option called
+# disable_fsync, which can be used to stop Exim using fsync() to ensure that
+# files are written to disc before proceeding. When this is disabled, crashes
+# and hardware problems such as power outages can cause data to be lost. This
+# feature should only be used in very exceptional circumstances. YOU HAVE BEEN
+# WARNED.
+
+# ENABLE_DISABLE_FSYNC=yes
# End of EDITME for Exim 4.
Index: exim/patches/patch-OS_Makefile-Default
===================================================================
RCS file: /cvs/ports/mail/exim/patches/patch-OS_Makefile-Default,v
retrieving revision 1.6
diff -u -p -r1.6 patch-OS_Makefile-Default
--- exim/patches/patch-OS_Makefile-Default 3 Feb 2008 20:39:12 -0000
1.6
+++ exim/patches/patch-OS_Makefile-Default 13 Dec 2009 11:10:57 -0000
@@ -1,7 +1,7 @@
--- OS/Makefile-Default.orig Fri Feb 10 15:33:26 2006
+++ OS/Makefile-Default Wed Jan 30 23:03:20 2008
-@@ -71,7 +71,7 @@ PERL_COMMAND=/usr/bin/perl
-
+@@ -73,7 +73,7 @@ PERL_COMMAND=/usr/bin/perl
+
# CC contains the name of the C compiler to be used.
-CC=gcc
@@ -9,3 +9,12 @@
# CFLAGS contains flags to be passed to the compiler. Nothing is defaulted
+@@ -86,7 +86,7 @@ CC=gcc
+ # here; instead each OS-dependent Makefile contains a default setting if one
+ # is needed.
+
+-# LFLAGS=
++LFLAGS=-L$(LOCALBASE)/lib
+
+
+ # PCRE_LIBS contains the library to be linked for PCRE
Index: exim/pkg/DESCR
===================================================================
RCS file: exim/pkg/DESCR
diff -N exim/pkg/DESCR
--- exim/pkg/DESCR 5 May 2006 06:02:30 -0000 1.10
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-Exim is a mail transfer agent (MTA) for hosts that are running Unix or Unix-
-like operating systems. It was designed on the assumption that it would be run
-on hosts that are permanently connected to the Internet. However, it can
-be used on intermittently connected hosts with suitable configuration
-adjustments.
-
-This port can be built with the following flavors:
-
-* no_exiscan - do not build content scanning into the exim4
- ACL system.
-* no_x11 - do not build eximon which requires X11
-* mysql - support mysql queries for lookups
-* postgresql - support postgresql queries for lookups
-* sqlite3 - support for sqlite queries for lookups
-* ldap - support ldap (OpenLDAP) queries for lookups
-* iconv - support character code conversions
-* sasl - support for SASL
-
-All these flavors are independent of each other.
Index: exim/pkg/DESCR-eximon
===================================================================
RCS file: exim/pkg/DESCR-eximon
diff -N exim/pkg/DESCR-eximon
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ exim/pkg/DESCR-eximon 13 Dec 2009 11:10:57 -0000
@@ -0,0 +1,7 @@
+Exim is a mail transfer agent (MTA) for hosts that are running Unix or Unix-
+like operating systems. It was designed on the assumption that it would be run
+on hosts that are permanently connected to the Internet. However, it can
+be used on intermittently connected hosts with suitable configuration
+adjustments.
+
+This is the X11-Exim monitor.
Index: exim/pkg/DESCR-main
===================================================================
RCS file: exim/pkg/DESCR-main
diff -N exim/pkg/DESCR-main
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ exim/pkg/DESCR-main 13 Dec 2009 11:10:57 -0000
@@ -0,0 +1,16 @@
+Exim is a mail transfer agent (MTA) for hosts that are running Unix or Unix-
+like operating systems. It was designed on the assumption that it would be run
+on hosts that are permanently connected to the Internet. However, it can
+be used on intermittently connected hosts with suitable configuration
+adjustments.
+
+This port can be built with any or all of the following flavors:
+
+* mysql - support mysql queries for lookups
+* postgresql - support postgresql queries for lookups
+* sqlite3 - support for sqlite queries for lookups
+* ldap - support ldap (OpenLDAP) queries for lookups
+* sasl - support for SASL
+
+It is possible to use the deprecated "demime" condition in the DATA ACL. If
+possible, use the MIME ACL instead of the "demime" condition.
Index: exim/pkg/MESSAGE
===================================================================
RCS file: exim/pkg/MESSAGE
diff -N exim/pkg/MESSAGE
--- exim/pkg/MESSAGE 18 Nov 2004 23:26:41 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-If you intend replacing sendmail with exim, then don't
-forget to modify /etc/mailer.conf accordingly; see
-mailwrapper(8).
-
-A perl script may help converting from exim-3.xx config
-files and has been installed in
- ${PREFIX}/share/examples/exim/convert4r4
Index: exim/pkg/MESSAGE-main
===================================================================
RCS file: exim/pkg/MESSAGE-main
diff -N exim/pkg/MESSAGE-main
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ exim/pkg/MESSAGE-main 13 Dec 2009 11:10:57 -0000
@@ -0,0 +1,14 @@
+To replace sendmail with exim, change /etc/mailer.conf to:
+
+sendmail /usr/local/bin/exim
+send-mail /usr/local/bin/exim
+mailq /usr/local/bin/exim -bp
+newaliases /usr/bin/true
+
+See mailwrapper(8) for more information.
+
+NOTE: do not forget to add sendmail_flags="-bd -q30m" to
+ /etc/rc.conf.local to startup exim correctly.
+
+NOTE: do not forget to remove the "sendmail clientmqueue runner"
+ from root's crontab.
Index: exim/pkg/PFRAG.no-no_x11
===================================================================
RCS file: exim/pkg/PFRAG.no-no_x11
diff -N exim/pkg/PFRAG.no-no_x11
--- exim/pkg/PFRAG.no-no_x11 22 Jul 2009 10:48:31 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-...@comment $OpenBSD: PFRAG.no-no_x11,v 1.4 2009/07/22 10:48:31 sthen Exp $
-bin/eximon
-...@bin bin/eximon.bin
Index: exim/pkg/PLIST
===================================================================
RCS file: exim/pkg/PLIST
diff -N exim/pkg/PLIST
--- exim/pkg/PLIST 22 Jul 2009 10:48:31 -0000 1.23
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,35 +0,0 @@
-...@comment $OpenBSD: PLIST,v 1.23 2009/07/22 10:48:31 sthen Exp $
-...@newgroup _exim:521
-...@newuser _exim:521:_exim:daemon:Exim Account:/var/spool/exim:/sbin/nologin
-bin/exicyclog
-bin/exigrep
-...@mode 4755
-...@bin bin/exim
-...@mode
-bin/exim_checkaccess
-...@bin bin/exim_dbmbuild
-...@bin bin/exim_dumpdb
-...@bin bin/exim_fixdb
-...@bin bin/exim_lock
-...@bin bin/exim_tidydb
-bin/eximstats
-bin/exinext
-bin/exipick
-bin/exiqgrep
-bin/exiqsumm
-bin/exiwhat
-...@man man/man8/exim.8
-share/doc/exim/
-share/doc/exim/README.SIEVE
-share/doc/exim/filter.txt
-share/doc/exim/spec.txt
-share/examples/exim/
-...@sample ${SYSCONFDIR}/exim/
-share/examples/exim/configure
-...@sample ${SYSCONFDIR}/exim/configure
-share/examples/exim/convert4r4
-!%%no_x11%%
-...@owner _exim
-...@group _exim
-...@sample /var/spool/exim/
-...@extraunexec rm -rf /var/spool/exim/
Index: exim/pkg/PLIST-eximon
===================================================================
RCS file: exim/pkg/PLIST-eximon
diff -N exim/pkg/PLIST-eximon
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ exim/pkg/PLIST-eximon 13 Dec 2009 11:10:57 -0000
@@ -0,0 +1,4 @@
+...@comment $OpenBSD$
+...@conflict exim-<4.71
+bin/eximon
+bin/eximon.bin
Index: exim/pkg/PLIST-main
===================================================================
RCS file: exim/pkg/PLIST-main
diff -N exim/pkg/PLIST-main
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ exim/pkg/PLIST-main 13 Dec 2009 11:10:57 -0000
@@ -0,0 +1,37 @@
+...@comment $OpenBSD: PLIST,v 1.23 2009/07/22 10:48:31 sthen Exp $
+...@pkgpath mail/exim
+...@pkgpath mail/exim,no_exiscan
+...@pkgpath mail/exim,no_exiscan,no_x11
+...@pkgpath mail/exim,no_x11
+...@newgroup _exim:521
+...@newuser _exim:521:_exim:daemon:Exim Account:/var/spool/exim:/sbin/nologin
+bin/exicyclog
+bin/exigrep
+...@mode 4755
+...@bin bin/exim
+...@mode
+bin/exim_checkaccess
+...@bin bin/exim_dbmbuild
+...@bin bin/exim_dumpdb
+...@bin bin/exim_fixdb
+...@bin bin/exim_lock
+...@bin bin/exim_tidydb
+bin/eximstats
+bin/exinext
+bin/exipick
+bin/exiqgrep
+bin/exiqsumm
+bin/exiwhat
+...@man man/man8/exim.8
+share/doc/exim/
+share/doc/exim/README.SIEVE
+share/doc/exim/filter.txt
+share/doc/exim/spec.txt
+share/examples/exim/
+...@sample ${SYSCONFDIR}/exim/
+share/examples/exim/configure
+...@sample ${SYSCONFDIR}/exim/configure
+...@owner _exim
+...@group _exim
+...@sample /var/spool/exim/
+...@extraunexec rm -rf /var/spool/exim/
