[65872] trunk/dports/mail/exim
ryandesign at macports.org
ryandesign at macports.org
Fri Apr 2 03:51:29 PDT 2010
Revision: 65872
http://trac.macports.org/changeset/65872
Author: ryandesign at macports.org
Date: 2010-04-02 03:51:27 -0700 (Fri, 02 Apr 2010)
Log Message:
-----------
exim: update to 4.71; add variants mysql4, mysql5, ldap, macports_ldap; disable universal variant; fix livecheck; see #24323
Modified Paths:
--------------
trunk/dports/mail/exim/Portfile
Removed Paths:
-------------
trunk/dports/mail/exim/files/lresolv.diff
trunk/dports/mail/exim/files/patch-tls-openssl.c
Modified: trunk/dports/mail/exim/Portfile
===================================================================
--- trunk/dports/mail/exim/Portfile 2010-04-02 10:28:01 UTC (rev 65871)
+++ trunk/dports/mail/exim/Portfile 2010-04-02 10:51:27 UTC (rev 65872)
@@ -2,8 +2,7 @@
PortSystem 1.0
name exim
-version 4.66
-revision 1
+version 4.71
categories mail
description complete replacement for sendmail
long_description Exim is a mail transfer agent (MTA) developed \
@@ -15,17 +14,16 @@
homepage http://www.exim.org/
platforms darwin
maintainers nomaintainer
-master_sites ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
- ftp://ftp.exim.org/pub/exim/exim4/
+master_sites ftp://ftp.exim.org/pub/exim/exim4/ \
+ ftp://ftp.easynet.be/exim/exim/exim4/
use_bzip2 yes
-checksums md5 01288e44919d8abdde5a7bd2c200449b \
- sha1 4a2ac2cd51865b57610e2b153e20c305b7f9f504 \
- rmd160 4481c9ca4932be9ab5f4f0a66b99f3e2f8e6c5fa
-depends_build path:bin/perl:perl5
+checksums md5 f9c5a2d94b5bb132d06e2fff85bef75e \
+ sha1 4b8f853843edcfa4f3bfbb4bef45d8dcff2fc990 \
+ rmd160 22e4ad1d43693d61fa1f2f2de40dda647599a087
+depends_build path:bin/perl:perl5 \
+ port:pcre
depends_lib port:db44 port:openssl port:sqlite3
-patchfiles patch-tls-openssl.c
-
startupitem.create yes
startupitem.start "${prefix}/share/exim/exim.sh start"
startupitem.stop "${prefix}/share/exim/exim.sh stop"
@@ -34,6 +32,8 @@
use_parallel_build no
+universal_variant no
+
configure {
copy ${worksrcpath}/src/EDITME ${worksrcpath}/Local/Makefile
reinplace "s|/usr/exim/bin|${prefix}/sbin|g" ${worksrcpath}/Local/Makefile
@@ -48,6 +48,8 @@
reinplace "s|# SUPPORT_MAILDIR=yes|SUPPORT_MAILDIR=yes|g" ${worksrcpath}/Local/Makefile
reinplace "s|# TLS_LIBS=-L/usr/local/openssl/lib|TLS_LIBS=-L${prefix}/lib|g" ${worksrcpath}/Local/Makefile
reinplace "s|# TLS_INCLUDE=-I/usr/local/openssl/include|TLS_INCLUDE=-I${prefix}/include/openssl|g" ${worksrcpath}/Local/Makefile
+ reinplace "s|# INCLUDE=.*|INCLUDE=-I${prefix}/include|g" ${worksrcpath}/Local/Makefile
+ reinplace "s|PCRE_LIBS=-lpcre|PCRE_LIBS=-L${prefix}/lib -lpcre|g" ${worksrcpath}/Local/Makefile
reinplace "s|CC=cc|CC=${configure.cc}|g" ${worksrcpath}/OS/Makefile-Darwin
reinplace "s|X11=/usr/X11R6|X11=${prefix}|g" ${worksrcpath}/OS/Makefile-Darwin
reinplace "s|# Exim: OS-specific make file for Darwin (Mac OS X).|INCLUDE=-I${prefix}/include/db44|g" ${worksrcpath}/OS/Makefile-Darwin
@@ -67,8 +69,22 @@
${portpath}/files/exim.sh ${destroot}${prefix}/share/exim
reinplace "s|__PREFIX|${prefix}|g" ${destroot}${prefix}/share/exim/exim.sh }
-variant mysql4 { depends_lib-append lib:libmysqlclient:mysql4 }
+variant mysql4 conflicts mysql5 description {build exim with support for mysql4 lookups} {
+ depends_lib-append port:mysql4
+}
+variant mysql5 conflicts mysql4 description {build exim with support for mysql5 lookups} {
+ depends_lib-append path:bin/mysql_config5:mysql5
+}
+
+variant ldap conflicts macports_ldap description {build exim with support for ldap lookups using the shipped ldap} {
+ # do nothing .. until post-configure
+}
+
+variant macports_ldap conflicts ldap description {install exim with support for ldap lookups using macports ldap} {
+ depends_lib-append port:openldap
+}
+
post-configure {
reinplace "s|# AUTH_CRAM_MD5=yes|AUTH_CRAM_MD5=yes|g" ${worksrcpath}/Local/Makefile
reinplace "s|# AUTH_PLAINTEXT=yes|AUTH_PLAINTEXT=yes|g" ${worksrcpath}/Local/Makefile
@@ -76,15 +92,40 @@
reinplace "s|# SUPPORT_TLS=yes|SUPPORT_TLS=yes|g" ${worksrcpath}/Local/Makefile
reinplace "s|# TLS_LIBS=-lssl -lcrypto|TLS_LIBS=-lssl -lcrypto|g" ${worksrcpath}/Local/Makefile
reinplace "s|# LDAP_LIB_TYPE=OPENLDAP2|LDAP_LIB_TYPE=OPENLDAP2|g" ${worksrcpath}/Local/Makefile
- reinplace "s|# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds|LOOKUP_LIBS=-lldap|g" ${worksrcpath}/Local/Makefile
- if {[variant_isset mysql] || [variant_isset mysql4]} {
- reinplace "s|# LOOKUP_MYSQL=yes|LOOKUP_MYSQL=yes|g" ${worksrcpath}/Local/Makefile
- reinplace "s|# LOOKUP_INCLUDE=.*|LOOKUP_INCLUDE=-I ${prefix}/include/mysql -I ${prefix}/include -I /usr/include|g" ${worksrcpath}/Local/Makefile
+ # settings common to any lookup
+ if {[variant_isset mysql4]
+ || [variant_isset mysql5]
+ || [variant_isset ldap]
+ || [variant_isset macports_ldap]
+ } then {
+ reinplace "s|^# LOOKUP_INCLUDE=.*|LOOKUP_INCLUDE=|g" ${worksrcpath}/Local/Makefile
+ reinplace "s|^# LOOKUP_LIBS=.*|LOOKUP_LIBS=-L${prefix}/lib|g" ${worksrcpath}/Local/Makefile
+ # lookup specific settings
+ if {[variant_isset mysql4]} {
+ reinplace "s|^# LOOKUP_MYSQL=yes|LOOKUP_MYSQL=yes|g" ${worksrcpath}/Local/Makefile
+ reinplace "s|^LOOKUP_LIBS=.*|& -L${prefix}/lib/mysql -lmysqlclient|g" ${worksrcpath}/Local/Makefile
+ reinplace "s|^LOOKUP_INCLUDE=.*|& -I${prefix}/include/mysql -I ${prefix}/include|g" ${worksrcpath}/Local/Makefile
}
+ if {[variant_isset mysql5]} {
+ reinplace "s|^# LOOKUP_MYSQL=yes|LOOKUP_MYSQL=yes|g" ${worksrcpath}/Local/Makefile
+ reinplace "s|^LOOKUP_LIBS=.*|& -L${prefix}/lib/mysql5/mysql -lmysqlclient |g" ${worksrcpath}/Local/Makefile
+ reinplace "s|^LOOKUP_INCLUDE=.*|& -I${prefix}/include/mysql5/mysql |g" ${worksrcpath}/Local/Makefile
+ }
+ if {[variant_isset ldap]} {
+ reinplace "s|^# LOOKUP_LDAP=yes|LOOKUP_LDAP=yes|g" ${worksrcpath}/Local/Makefile
+ reinplace "s|^LOOKUP_LIBS=.*|& -L/usr/lib -lldap -llber |g" ${worksrcpath}/Local/Makefile
+ reinplace "s|^LOOKUP_INCLUDE=.*|& -I/usr/include |g" ${worksrcpath}/Local/Makefile
+ }
+ if {[variant_isset macports_ldap]} {
+ reinplace "s|^# LOOKUP_LDAP=yes|LOOKUP_LDAP=yes|g" ${worksrcpath}/Local/Makefile
+ reinplace "s|^LOOKUP_LIBS=.*|& -L${prefix}/lib -lldap -llber |g" ${worksrcpath}/Local/Makefile
+ reinplace "s|^LOOKUP_INCLUDE=.*|& -I${prefix}/include |g" ${worksrcpath}/Local/Makefile
+}
}
+}
-platform darwin 10 {
- patchfiles-append lresolv.diff
-}
+livecheck.type regex
+livecheck.url ${homepage}version.html
+livecheck.regex "The latest release is <b>(\\d+\\.\\d+)</b>"
Deleted: trunk/dports/mail/exim/files/lresolv.diff
===================================================================
--- trunk/dports/mail/exim/files/lresolv.diff 2010-04-02 10:28:01 UTC (rev 65871)
+++ trunk/dports/mail/exim/files/lresolv.diff 2010-04-02 10:51:27 UTC (rev 65872)
@@ -1,9 +0,0 @@
---- OS/Makefile-Darwin.orig 2007-01-09 01:25:36.000000000 +1100
-+++ OS/Makefile-Darwin 2009-09-16 15:08:12.000000000 +1000
-@@ -26,4 +26,6 @@
- EXIWHAT_EGREP_ARG='/exim( |$$)'
- EXIWHAT_KILL_SIGNAL=-USR1
-
-+LIBRESOLV=-lresolv
-+
- # End
Deleted: trunk/dports/mail/exim/files/patch-tls-openssl.c
===================================================================
--- trunk/dports/mail/exim/files/patch-tls-openssl.c 2010-04-02 10:28:01 UTC (rev 65871)
+++ trunk/dports/mail/exim/files/patch-tls-openssl.c 2010-04-02 10:51:27 UTC (rev 65872)
@@ -1,13 +0,0 @@
---- src/tls-openssl.c.orig 2007-01-09 01:25:37.000000000 +1100
-+++ src/tls-openssl.c 2009-09-16 14:45:26.000000000 +1000
-@@ -343,8 +343,8 @@
- /* Set up the information callback, which outputs if debugging is at a suitable
- level. */
-
--if (!(SSL_CTX_set_info_callback(ctx, (void (*)())info_callback)))
-- return tls_error(US"SSL_CTX_set_info_callback", host);
-+/* This function returns no diagnostic information! */
-+SSL_CTX_set_info_callback(ctx, (void (*)())info_callback);
-
- /* The following patch was supplied by Robert Roselius */
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100402/9d89708a/attachment.html>
More information about the macports-changes
mailing list