[57752] trunk/dports/mail/exim

[jmr at macports.org]

Revision: 57752
          http://trac.macports.org/changeset/57752
Author:   jmr at macports.org
Date:     2009-09-15 22:14:06 -0700 (Tue, 15 Sep 2009)
Log Message:
-----------
exim: buildfix for snow leopard, apply patch for compatibility with newer openssl (#21369), use correct compiler and X11 prefix

Modified Paths:
--------------
    trunk/dports/mail/exim/Portfile

Added 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	2009-09-16 05:04:20 UTC (rev 57751)
+++ trunk/dports/mail/exim/Portfile	2009-09-16 05:14:06 UTC (rev 57752)
@@ -24,12 +24,13 @@
 depends_build   path:bin/perl:perl5
 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"
 
 set exim_user   exim
-patch.pre_args  -p1
 
 use_parallel_build      no
 
@@ -40,15 +41,17 @@
                 reinplace "s|EXIM_USER=|EXIM_USER=${exim_user}|g" ${worksrcpath}/Local/Makefile
                 reinplace "s|/var/spool/exim|${prefix}/var/spool/exim|g" ${worksrcpath}/Local/Makefile
                 reinplace "s|EXIM_MONITOR=eximon.bin|#EXIM_MONITOR=eximon.bin|g" ${worksrcpath}/Local/Makefile
-                reinplace "s|# WITH_CONTENT_SCAN=yes|WITH_CONTENT_SCAN=yes|g" ${worksrcpath}/Local/Makefile       
+                reinplace "s|# WITH_CONTENT_SCAN=yes|WITH_CONTENT_SCAN=yes|g" ${worksrcpath}/Local/Makefile
                 reinplace "s|# LOOKUP_PASSWD=yes|LOOKUP_PASSWD=yes|g" ${worksrcpath}/Local/Makefile
                 reinplace "s|# LOOKUP_CDB=yes|LOOKUP_CDB=yes|g" ${worksrcpath}/Local/Makefile
                 reinplace "s|# LOOKUP_DSEARCH=yes|LOOKUP_DSEARCH=yes|g" ${worksrcpath}/Local/Makefile
-                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|# Exim: OS-specific make file for Darwin (Mac OS X).|INCLUDE=-I${prefix}/include/db44|g" ${worksrcpath}/OS/Makefile-Darwin                
-                reinplace "s|DBMLIB =|DBMLIB=${prefix}/lib/db44/libdb-4.dylib|g" ${worksrcpath}/OS/Makefile-Darwin                
+                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|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
+                reinplace "s|DBMLIB =|DBMLIB=${prefix}/lib/db44/libdb-4.dylib|g" ${worksrcpath}/OS/Makefile-Darwin
                 reinplace "s|/etc/aliases|${destroot}${prefix}/etc/aliases|g" ${worksrcpath}/scripts/exim_install
                 adduser ${exim_user} gid=[existsgroup mail] }
 
@@ -82,3 +85,6 @@
 
 }
 
+platform darwin 10 {
+    patchfiles-append lresolv.diff
+}

Added: trunk/dports/mail/exim/files/lresolv.diff
===================================================================
--- trunk/dports/mail/exim/files/lresolv.diff	                        (rev 0)
+++ trunk/dports/mail/exim/files/lresolv.diff	2009-09-16 05:14:06 UTC (rev 57752)
@@ -0,0 +1,9 @@
+--- 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

Added: trunk/dports/mail/exim/files/patch-tls-openssl.c
===================================================================
--- trunk/dports/mail/exim/files/patch-tls-openssl.c	                        (rev 0)
+++ trunk/dports/mail/exim/files/patch-tls-openssl.c	2009-09-16 05:14:06 UTC (rev 57752)
@@ -0,0 +1,13 @@
+--- 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/20090915/d724d3b5/attachment.html>