diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/exim/Makefile | 5 | ||||
| -rw-r--r-- | mail/exim/distinfo | 12 | ||||
| -rw-r--r-- | mail/exim/patches/patch-ae | 17 |
3 files changed, 17 insertions, 17 deletions
diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 4f972e34ed6..be7a41baad3 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.150 2016/12/04 05:17:32 ryoon Exp $ +# $NetBSD: Makefile,v 1.151 2016/12/25 11:29:54 wiedi Exp $ -DISTNAME= exim-4.87 -PKGREVISION= 5 +DISTNAME= exim-4.88 CATEGORIES= mail net MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/ \ http://dl.ambiweb.de/mirrors/ftp.exim.org/exim/exim4/ diff --git a/mail/exim/distinfo b/mail/exim/distinfo index ddd177880da..e3c6d5fcbda 100644 --- a/mail/exim/distinfo +++ b/mail/exim/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.65 2016/04/09 10:49:39 adam Exp $ +$NetBSD: distinfo,v 1.66 2016/12/25 11:29:54 wiedi Exp $ -SHA1 (exim-4.87.tar.bz2) = ca1c1aba63be80ca70ccfdc704ba9b899b77ec22 -RMD160 (exim-4.87.tar.bz2) = 4a2cc7c35d02bff5cdd175d8dd0538f1fef5af43 -SHA512 (exim-4.87.tar.bz2) = 2b0d5c82133315c444e29abd182e0866482c904db1abe5ffe9a3008c2174f52eca850a433c069b4102874dc32bbe4af112beac94ffa154f1c06615c24deb47a4 -Size (exim-4.87.tar.bz2) = 1801422 bytes +SHA1 (exim-4.88.tar.bz2) = f77cd027284ebf5bdf5fb7a7bd2755238722bfde +RMD160 (exim-4.88.tar.bz2) = cbcacf3f8f45975c68a450f2fa595b802c76b345 +SHA512 (exim-4.88.tar.bz2) = ea094bf703628c201de119fc5f09539475e52158e935f8f2a9e4138c4a1bfe885017145c3cc5e22aa9087b195091955c69385ebf1ea0baec64ed5c1b8e3b1caf +Size (exim-4.88.tar.bz2) = 1824610 bytes SHA1 (patch-aa) = 4df21c2497e9fee8dfbcd4386bb1b70d69ca2932 SHA1 (patch-ab) = 6af17f036ed02a3bc37c1f303269eea447fcb691 -SHA1 (patch-ae) = 7daf63727e222bbaa7e5b8289c4fcb6a8c0272cf +SHA1 (patch-ae) = aa0a31e77d5f76e33bc92140c14d39c79f710b95 SHA1 (patch-lookups_Makefile) = cfc40dba3f75ef37b9887f7767139ad50cf9d4e5 diff --git a/mail/exim/patches/patch-ae b/mail/exim/patches/patch-ae index d70cd07bd31..f909da33e39 100644 --- a/mail/exim/patches/patch-ae +++ b/mail/exim/patches/patch-ae @@ -1,6 +1,6 @@ -$NetBSD: patch-ae,v 1.12 2012/06/11 11:41:25 adam Exp $ +$NetBSD: patch-ae,v 1.13 2016/12/25 11:29:55 wiedi Exp $ ---- scripts/exim_install.orig 2012-05-31 00:40:15.000000000 +0000 +--- scripts/exim_install.orig 2016-12-18 14:02:28.000000000 +0000 +++ scripts/exim_install @@ -83,6 +83,8 @@ if [ "${SYSTEM_ALIASES_FILE}" = "" ] ; t SYSTEM_ALIASES_FILE=/etc/aliases @@ -11,17 +11,17 @@ $NetBSD: patch-ae,v 1.12 2012/06/11 11:41:25 adam Exp $ # Allow INST_xx to over-ride xx case "$INST_BIN_DIRECTORY" in ?*) BIN_DIRECTORY="$INST_BIN_DIRECTORY";; esac case "$INST_CONFIGURE_FILE" in ?*) CONFIGURE_FILE="$INST_CONFIGURE_FILE";; esac -@@ -219,6 +221,9 @@ while [ $# -gt 0 ]; do - if [ $name = exim${EXE} ]; then - version=exim-`./exim -bV -C /dev/null | \ +@@ -220,6 +222,9 @@ while [ $# -gt 0 ]; do + exim="./exim -bV -C /dev/null" + version=exim-`$exim 2>/dev/null | \ awk '/Exim version/ { OFS=""; print $3,"-",substr($4,2,length($4)-1) }'`${EXE} -+ # only for pkgsrc: ./exim cannot run during install to DESTDIR because ++ # only for pkgsrc: ./exim cannot run during install to DESTDIR because + # EXIM_USER may not exist at this time, so we fake the version information + version=@PKGSRC_EXIM_VERSION@${EXE} if [ "${version}" = "exim-${EXE}" ]; then echo $com "" -@@ -414,15 +419,8 @@ elif [ ! -f ${CONFIGURE_FILE} ]; then +@@ -416,16 +421,8 @@ elif [ ! -f ${CONFIGURE_FILE} ]; then echo $com "*** Exim installation ${ver}failed ***" exit 1 fi @@ -34,8 +34,9 @@ $NetBSD: patch-ae,v 1.12 2012/06/11 11:41:25 adam Exp $ - echo ${CP} ../src/aliases.default ${SYSTEM_ALIASES_FILE} - ${real} ${CP} ../src/aliases.default ${SYSTEM_ALIASES_FILE} - fi +- + echo ${CP} ../src/aliases.default ${DESTDIR}${PREFIX}/share/examples/exim/aliases + ${real} ${CP} ../src/aliases.default ${DESTDIR}${PREFIX}/share/examples/exim/aliases - else echo $com Configuration file ${CONFIGURE_FILE} already exists + fi |