Import of pkgsrc-2014Q1

mail/exim/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.124 2013/05/31 12:41:13 wiz Exp $
+# $NetBSD: Makefile,v 1.128 2014/02/12 23:18:07 tron Exp $
 
-DISTNAME=	exim-4.80.1
-PKGREVISION=	6
+DISTNAME=	exim-4.82
+PKGREVISION=	1
 CATEGORIES=	mail net
 MASTER_SITES=	ftp://ftp.exim.org/pub/exim/exim4/ \
 		http://dl.ambiweb.de/mirrors/ftp.exim.org/exim/exim4/

mail/exim/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2009/12/30 13:24:50 abs Exp $
+@comment $NetBSD: PLIST,v 1.14 2014/03/11 14:05:03 jperkin Exp $
 man/man8/exim.8
 sbin/${DISTNAME}-1
 sbin/exicyclog
@@ -20,4 +20,3 @@ share/doc/exim/spec.txt
 share/examples/exim/aliases
 share/examples/exim/configure
 share/examples/exim/mailer.conf
-share/examples/rc.d/exim

mail/exim/distinfo

@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.54 2012/10/30 20:12:20 abs Exp $
+$NetBSD: distinfo,v 1.56 2013/10/30 07:30:03 adam Exp $
 
-SHA1 (exim-4.80.1.tar.bz2) = 714e40d440641050a1d9946cd937aad0d1a6b746
-RMD160 (exim-4.80.1.tar.bz2) = 48f79c244b8e3573dd7c898580ea903ac23852e0
-Size (exim-4.80.1.tar.bz2) = 1650082 bytes
+SHA1 (exim-4.82.tar.bz2) = 47b74986bd7c258030b3451d4c5e2723dd29d6cc
+RMD160 (exim-4.82.tar.bz2) = b3dc58373576e299a85245df93bbd9cde34c2078
+Size (exim-4.82.tar.bz2) = 1722771 bytes
 SHA1 (patch-aa) = 24a12631b7df17930349b8a0d03adc80d27efbe2
 SHA1 (patch-ab) = 6af17f036ed02a3bc37c1f303269eea447fcb691
 SHA1 (patch-ae) = 7daf63727e222bbaa7e5b8289c4fcb6a8c0272cf
 SHA1 (patch-ag) = dd93bb718c996f18b4e985806eb6d4ff5f25a67f
+SHA1 (patch-lookups_Makefile) = ea62db47ea2a09f6abf1dc1db8fb2dae23717396

mail/exim/options.mk

@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.19 2012/06/12 15:45:57 wiz Exp $
+# $NetBSD: options.mk,v 1.20 2013/07/15 02:02:25 ryoon Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.exim
 PKG_SUPPORTED_OPTIONS=	exim-appendfile-maildir exim-appendfile-mailstore
@@ -152,6 +152,5 @@ LOOKUP_LIBS+=		-lspf2
 .if !empty(PKG_OPTIONS:Mreadline)
 LOCAL_MAKEFILE_OPTIONS+=USE_READLINE=yes
 LOOKUP_LIBS+=		-lreadline
-USE_GNU_READLINE=	yes
 .  include "../../devel/readline/buildlink3.mk"
 .endif

mail/exim/patches/patch-lookups_Makefile

@@ -0,0 +1,37 @@
+$NetBSD: patch-lookups_Makefile,v 1.1 2013/09/02 16:04:13 jperkin Exp $
+
+Avoid use of non-portable "local" keyword.
+
+--- scripts/lookups-Makefile.orig	2012-10-25 03:37:38.000000000 +0000
++++ scripts/lookups-Makefile
+@@ -62,16 +62,16 @@ tmp="$target.t"
+ # command-line, not just check the Makefile.
+ 
+ want_dynamic() {
+-  local dyn_name="$1"
+-  local re="LOOKUP_${dyn_name}[ $tab]*=[ $tab]*2"
++  dyn_name="$1"
++  re="LOOKUP_${dyn_name}[ $tab]*=[ $tab]*2"
+   env | grep -q "^$re"
+   if [ $? -eq 0 ]; then return 0; fi
+   grep -q "^[ $tab]*$re" "$defs_source"
+ }
+ 
+ want_at_all() {
+-  local want_name="$1"
+-  local re="LOOKUP_${want_name}[ $tab]*=[ $tab]*."
++  want_name="$1"
++  re="LOOKUP_${want_name}[ $tab]*=[ $tab]*."
+   env | grep -q "^$re"
+   if [ $? -eq 0 ]; then return 0; fi
+   grep -q "^[ $tab]*$re" "$defs_source"
+@@ -83,8 +83,7 @@ MODS=""
+ OBJ=""
+ 
+ emit_module_rule() {
+-  local lookup_name="$1"
+-  local mod_name pkgconf
++  lookup_name="$1"
+   if [ "${lookup_name%:*}" = "$lookup_name" ]
+   then
+     mod_name=$(echo $lookup_name | tr A-Z a-z)