diff options
| -rw-r--r-- | mail/exim-html/Makefile | 4 | ||||
| -rw-r--r-- | mail/exim-html/distinfo | 8 | ||||
| -rw-r--r-- | mail/exim/Makefile | 9 | ||||
| -rw-r--r-- | mail/exim/distinfo | 10 | ||||
| -rw-r--r-- | mail/exim/patches/patch-lookups_Makefile | 12 |
5 files changed, 21 insertions, 22 deletions
diff --git a/mail/exim-html/Makefile b/mail/exim-html/Makefile index 9b20a704026..f665e4d6b7d 100644 --- a/mail/exim-html/Makefile +++ b/mail/exim-html/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.26 2014/05/29 09:30:12 adam Exp $ +# $NetBSD: Makefile,v 1.27 2014/07/23 14:09:52 adam Exp $ -DISTNAME= exim-html-4.82.1 +DISTNAME= exim-html-4.83 CATEGORIES= mail net MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/ \ ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \ diff --git a/mail/exim-html/distinfo b/mail/exim-html/distinfo index be86383bda3..7eefa0facca 100644 --- a/mail/exim-html/distinfo +++ b/mail/exim-html/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.20 2014/05/29 09:30:12 adam Exp $ +$NetBSD: distinfo,v 1.21 2014/07/23 14:09:52 adam Exp $ -SHA1 (exim-html-4.82.1.tar.bz2) = f2b154e98cce24976c30ade528d39e1019a7520a -RMD160 (exim-html-4.82.1.tar.bz2) = 41ffd29e38dc5c303250f1dc218e5c1770bd9c93 -Size (exim-html-4.82.1.tar.bz2) = 458569 bytes +SHA1 (exim-html-4.83.tar.bz2) = 405c395a84c32172e6c5180800d367fe962cee36 +RMD160 (exim-html-4.83.tar.bz2) = 65ccb8ef5f83c5f7c5cdbd4181ccf80571a9c7f9 +Size (exim-html-4.83.tar.bz2) = 464789 bytes diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 3705b5e7941..83aff67ead8 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.133 2014/06/14 10:18:05 wiedi Exp $ +# $NetBSD: Makefile,v 1.134 2014/07/23 14:09:52 adam Exp $ -DISTNAME= exim-4.82.1 -PKGREVISION= 1 +DISTNAME= exim-4.83 CATEGORIES= mail net MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/ \ http://dl.ambiweb.de/mirrors/ftp.exim.org/exim/exim4/ @@ -36,8 +35,8 @@ PKG_GECOS.${EXIM_USER}= Exim mail server user PKG_HOME.${EXIM_USER}= ${VARBASE}/mail PKG_SHELL.${EXIM_USER}= ${NOLOGIN} -FILES_SUBST+= EXIM_GROUP=${EXIM_GROUP:Q} -FILES_SUBST+= EXIM_USER=${EXIM_USER:Q} +FILES_SUBST+= EXIM_GROUP=${EXIM_GROUP} +FILES_SUBST+= EXIM_USER=${EXIM_USER} PKG_SYSCONFSUBDIR= exim EXAMPLESDIR= ${PREFIX}/share/examples/exim diff --git a/mail/exim/distinfo b/mail/exim/distinfo index e62f5e4d5f6..02ab928ded8 100644 --- a/mail/exim/distinfo +++ b/mail/exim/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.58 2014/05/29 09:27:37 adam Exp $ +$NetBSD: distinfo,v 1.59 2014/07/23 14:09:52 adam Exp $ -SHA1 (exim-4.82.1.tar.bz2) = bfb5ae3ab2444d494cdee650983a35dcc10243f5 -RMD160 (exim-4.82.1.tar.bz2) = 2caa80ed8b5fef07fd0449dc5ac7958681466a2d -Size (exim-4.82.1.tar.bz2) = 1722912 bytes +SHA1 (exim-4.83.tar.bz2) = 75a2fece694f0c8f8f4eadb1719b1779f662a9b6 +RMD160 (exim-4.83.tar.bz2) = 1f8b2c3f5c9f33b98948c886ffeb562097f465dd +Size (exim-4.83.tar.bz2) = 1761169 bytes SHA1 (patch-aa) = 24a12631b7df17930349b8a0d03adc80d27efbe2 SHA1 (patch-ab) = 6af17f036ed02a3bc37c1f303269eea447fcb691 SHA1 (patch-ae) = 7daf63727e222bbaa7e5b8289c4fcb6a8c0272cf SHA1 (patch-ag) = dd93bb718c996f18b4e985806eb6d4ff5f25a67f -SHA1 (patch-lookups_Makefile) = 57a8ab00e5f3c6891c74fdfe457adc1d73bc06ce +SHA1 (patch-lookups_Makefile) = cfc40dba3f75ef37b9887f7767139ad50cf9d4e5 diff --git a/mail/exim/patches/patch-lookups_Makefile b/mail/exim/patches/patch-lookups_Makefile index a612a4cc9a0..24cd80b2f91 100644 --- a/mail/exim/patches/patch-lookups_Makefile +++ b/mail/exim/patches/patch-lookups_Makefile @@ -1,10 +1,10 @@ -$NetBSD: patch-lookups_Makefile,v 1.2 2014/04/02 17:36:00 wiedi Exp $ +$NetBSD: patch-lookups_Makefile,v 1.3 2014/07/23 14:09:52 adam Exp $ Avoid use of non-portable "local" keyword. ---- scripts/lookups-Makefile.orig 2013-10-25 00:46:27.000000000 +0000 +--- scripts/lookups-Makefile.orig 2014-07-21 14:28:07.000000000 +0000 +++ scripts/lookups-Makefile -@@ -61,16 +61,16 @@ fi +@@ -87,16 +87,16 @@ fi # command-line, not just check the Makefile. want_dynamic() { @@ -25,7 +25,7 @@ Avoid use of non-portable "local" keyword. env | grep -q "^$re" if [ $? -eq 0 ]; then return 0; fi grep -q "^[ $tab]*$re" "$defs_source" -@@ -78,8 +78,8 @@ want_at_all() { +@@ -104,8 +104,8 @@ want_at_all() { # Adapted want_at_all above to work for EXPERIMENTAL features want_experimental() { @@ -36,7 +36,7 @@ Avoid use of non-portable "local" keyword. env | grep -q "^$re" if [ $? -eq 0 ]; then return 0; fi grep -q "^[ $tab]*$re" "$defs_source" -@@ -91,8 +91,7 @@ MODS="" +@@ -117,8 +117,7 @@ MODS="" OBJ="" emit_module_rule() { @@ -45,4 +45,4 @@ Avoid use of non-portable "local" keyword. + lookup_name="$1" if [ "${lookup_name%:*}" = "$lookup_name" ] then - mod_name=$(echo $lookup_name | tr A-Z a-z) + # Square brackets are redundant but benign for POSIX compliant tr, |