 @@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.95 2009/02/13 15:28:03 abs Exp $
+# $NetBSD: Makefile,v 1.96 2009/11/17 06:39:32 adam Exp $
-DISTNAME=	exim-4.69
+DISTNAME=	exim-4.70
 PKGREVISION=	4
 CATEGORIES=	mail net
 MASTER_SITES=	ftp://ftp.exim.org/pub/exim/exim4/ \
 		ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
 		ftp://ftp.esat.net/pub/networking/mail/mta/exim/exim4/
 EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	abs@NetBSD.org
 HOMEPAGE=	http://www.exim.org/
 COMMENT=	The Exim mail transfer agent, a replacement for sendmail
 CONFLICTS+=	exim-exiscan-[0-9]*
 USE_TOOLS+=	perl:run
 @@ -49,50 +48,48 @@ PLIST_SUBST+=		DISTNAME=${DISTNAME}
 RCD_SCRIPTS=		exim
 OWN_DIRS_PERMS=		${VARBASE}/log/exim ${EXIM_USER} ${EXIM_GROUP} 0750
 OWN_DIRS_PERMS+=	${VARBASE}/spool/exim ${EXIM_USER} ${EXIM_GROUP} 0750
 # XXX: The following will be handled by buildlink3 at some point.
 CFLAGS+=		${_STRIPFLAG_CC}
 # pay attention to CPPFLAGS as well
 CFLAGS+=		${CPPFLAGS}
 .include "options.mk"
 # BDB_TYPE gets set to "db1" if USE_DB185=="yes"
 USE_DB185?=		no
 BDB_ACCEPTED?=		db1 db2 db3 db4
 post-extract:
 	mkdir ${WRKSRC}/Local
 	cp ${WRKSRC}/src/EDITME ${WRKSRC}/Local/Makefile.pkgsrc
 	cp ${WRKSRC}/exim_monitor/EDITME ${WRKSRC}/Local/eximon.conf.pkgsrc
 	cp ${FILESDIR}/Makefile-DragonFly ${FILESDIR}/os.h-DragonFly \
 		${WRKSRC}/OS/
 pre-configure:
 	sed	-e 's:@PREFIX@:${PREFIX}:' \
 		-e 's:@PKG_SYSCONFDIR@:${PKG_SYSCONFDIR}:' \
 		-e 's:@EXIM_USER@:${EXIM_USER}:' \
 		-e 's:@EXIM_GROUP@:${EXIM_GROUP}:' \
 		-e 's:@EXIM_USE_DB_CONFIG@:${EXIM_USE_DB_CONFIG}:' \
 		-e 's:@EXIM_DBMLIB@:${EXIM_DBMLIB}:' \
 		-e 's:@EXIM_INCLUDE@:${EXIM_INCLUDE}:' \
 		-e 's:@LOOKUP_LIBS@:${LOOKUP_LIBS}:' \
 		-e 's:@CHOWN@:${CHOWN}:' \
 		-e 's:@CHGRP@:${CHGRP}:' \
 		-e 's:@CHMOD@:${CHMOD}:' \
 		-e 's:@MV@:${MV}:' \
 		-e 's:@RM@:${RM}:' \
 		-e 's:@TOUCH@:${TOUCH}:' \
 		-e 's:@PERL5@:${PERL5}:' \
 		-e 's:@VARBASE@:${VARBASE}:' \
 	    < ${WRKSRC}/Local/Makefile.pkgsrc \
 	    > ${WRKSRC}/Local/Makefile
 .for opt in ${LOCAL_MAKEFILE_OPTIONS}
 	${ECHO} ${opt} >> ${WRKSRC}/Local/Makefile
 .endfor
 .if !empty(EXIM_MAX_INCLUDE_SIZE)
 	${ECHO} MAX_INCLUDE_SIZE=${EXIM_MAX_INCLUDE_SIZE} >> ${WRKSRC}/Local/Makefile
 .endif
 	sed -e 's:@PREFIX@:${PREFIX}:' \
 		-e 's:@PKG_SYSCONFDIR@:${PKG_SYSCONFDIR}:' \
 	    < ${WRKSRC}/Local/eximon.conf.pkgsrc \
 @@ -105,14 +102,15 @@ pre-configure:
 post-build:
 	sed -e 's:@PREFIX@:${PREFIX}:' \
 	    ${FILESDIR}/mailer.conf.exim \
 	    > ${WRKDIR}/mailer.conf
 INSTALLATION_DIRS =	${PKGMANDIR}/man8 sbin share/examples/exim
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/mailer.conf ${DESTDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/exim.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/exim.8
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,16 +1,16 @@
-$NetBSD: patch-aa,v 1.19 2007/06/24 10:55:41 abs Exp $
+$NetBSD: patch-aa,v 1.20 2009/11/17 06:39:32 adam Exp $
---- Local/Makefile.pkgsrc.orig	2007-06-24 11:43:28.000000000 +0100
+--- Local/Makefile.pkgsrc.orig	2009-11-16 07:56:01.000000000 +0100
 +++ Local/Makefile.pkgsrc
 @@ -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=@PREFIX@/sbin
  #------------------------------------------------------------------------------
 @@ -116,7 +116,7 @@ BIN_DIRECTORY=/usr/exim/bin
  # don't exist. It will also install a default runtime configuration if this
  # file does not exist.
 @@ -37,83 +37,87 @@ $NetBSD: patch-aa,v 1.19 2007/06/24 10:5
 +EXIM_GROUP=ref:@EXIM_GROUP@
  # Many sites define a user called "exim", with an appropriate default group,
  # and use
 @@ -176,7 +176,7 @@ EXIM_USER=
  # Almost all installations choose this:
 -SPOOL_DIRECTORY=/var/spool/exim
 +SPOOL_DIRECTORY=@VARBASE@/spool/exim
-@@ -320,7 +320,7 @@ LOOKUP_LSEARCH=yes
+@@ -333,7 +333,7 @@ PCRE_LIBS=-lpcre
  # files are defaulted in the OS/Makefile-Default file, but can be overridden in
  # local OS-specific make files.
 -EXIM_MONITOR=eximon.bin
 +# EXIM_MONITOR=eximon.bin
  #------------------------------------------------------------------------------
-@@ -473,11 +473,11 @@ FIXED_NEVER_USERS=root
+@@ -486,11 +486,11 @@ FIXED_NEVER_USERS=root
  # included in the Exim binary. You will then need to set up the run time
  # configuration to make use of the mechanism(s) selected.
 -# AUTH_CRAM_MD5=yes
 +AUTH_CRAM_MD5=yes
  # AUTH_CYRUS_SASL=yes
  # AUTH_DOVECOT=yes
 -# AUTH_PLAINTEXT=yes
 -# AUTH_SPA=yes
 +AUTH_PLAINTEXT=yes
 +AUTH_SPA=yes
  #------------------------------------------------------------------------------
-@@ -643,7 +643,7 @@ HEADERS_CHARSET="ISO-8859-1"
+@@ -656,7 +656,7 @@ HEADERS_CHARSET="ISO-8859-1"
  # %s. This will be replaced by one of the strings "main", "panic", or "reject"
  # to form the final file names. Some installations may want something like this:
 -# LOG_FILE_PATH=/var/log/exim_%slog
 +LOG_FILE_PATH=@VARBASE@/log/exim/%s
  # which results in files with names /var/log/exim_mainlog, etc. The directory
  # in which the log files are placed must exist; Exim does not try to create
-@@ -884,11 +884,11 @@ SYSTEM_ALIASES_FILE=/etc/aliases
+@@ -897,13 +897,13 @@ SYSTEM_ALIASES_FILE=/etc/aliases
  # haven't got Perl, Exim will still build and run; you just won't be able to
  # use those utilities.
 -# 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
 +CHOWN_COMMAND=@CHOWN@
 +CHGRP_COMMAND=@CHGRP@
 +CHMOD_COMMAND=@CHMOD@
 +MV_COMMAND=@MV@
 +RM_COMMAND=@RM@
 +TOUCH_COMMAND=@TOUCH@
 +PERL_COMMAND=@PERL5@
  #------------------------------------------------------------------------------
-@@ -1082,7 +1082,7 @@ TMPDIR="/tmp"
+@@ -1097,7 +1097,7 @@ TMPDIR="/tmp"
  # (process id) to a file so that it can easily be identified. The path of the
  # file can be specified here. Some installations may want something like this:
 -# PID_FILE_PATH=/var/lock/exim.pid
 +PID_FILE_PATH=/var/run/exim.pid
  # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
  # using the name "exim-daemon.pid".
-@@ -1134,3 +1134,10 @@ TMPDIR="/tmp"
+@@ -1149,3 +1149,10 @@ TMPDIR="/tmp"
  # ENABLE_DISABLE_FSYNC=yes
  # End of EDITME for Exim 4.
++
 +EXTRALIBS_EXIM=-liconv
++
 +@EXIM_USE_DB_CONFIG@
 +@EXIM_DBMLIB@
 +INCLUDE=@EXIM_INCLUDE@
 +LOOKUP_LIBS=@LOOKUP_LIBS@

 @@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.41 2009/02/13 15:28:03 abs Exp $
+$NetBSD: distinfo,v 1.42 2009/11/17 06:39:32 adam Exp $
-SHA1 (exim-4.69.tar.bz2) = 321e238b6e6b32498110511ce72a911538305a39
+SHA1 (exim-4.70.tar.bz2) = 012d32acb63342f60d50f8905e20acb2f73f59b0
-RMD160 (exim-4.69.tar.bz2) = ae97c807c63f858ba4a0ab402677225da9337d05
+RMD160 (exim-4.70.tar.bz2) = 4b216099bb4a3c9ba084729a47611d1df09344e0
-Size (exim-4.69.tar.bz2) = 1658939 bytes
+Size (exim-4.70.tar.bz2) = 1560329 bytes
-SHA1 (patch-aa) = 93dca43408fb837deb95d2b22502c64559780f7c
+SHA1 (patch-aa) = cf514f31626cde31747342a2d50edd1dbf7f195f
-SHA1 (patch-ab) = 1c6e7882346974390c22e7b9e09a76c5ed670d1d
+SHA1 (patch-ab) = f5be62c134b1a2d0870a14546ec0bb62090d498a
 SHA1 (patch-ac) = de96032a9cf5450101cc73d615d374ddf6817fee
 SHA1 (patch-ad) = 804ab58f454f7e100c117f2cec9cf478375c1752
 SHA1 (patch-ae) = 33573e3d02edbca0c44ed54d1aadd2db50fa1fe6
 SHA1 (patch-ag) = 8512795060ad913f4699c277867fd24e7a785519

 @@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.13 2006/08/08 15:24:01 abs Exp $
+$NetBSD: patch-ab,v 1.14 2009/11/17 06:39:32 adam Exp $
---- OS/Makefile-Default.orig	2006-04-28 11:32:21.000000000 +0100
+--- OS/Makefile-Default.orig	2009-10-16 09:30:54.000000000 +0200
 +++ OS/Makefile-Default
-@@ -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
 +# CC=gcc
  # CFLAGS contains flags to be passed to the compiler. Nothing is defaulted