Changeset 4332 for trunk/dports

Timestamp:

Dec 28, 2003, 12:34:49 PM (20 years ago)

Author:

fkr

Message:

Bug: #1138
Submitted by: bchesneau@… (Benoit Chesneau)
Reviewed by:
Approved by:
Obtained from:
Port: exim
Version: 4.30

• bump to version 4.30
• includes Benoit's fix (submitted for earlier revision) to properly support

mysql

Location:

trunk/dports/mail/exim

Files:

• Portfile (modified) (4 diffs)
• files/patch-EDITME (modified) (1 diff)
• files/patch-Makefile-Darwin (deleted)

trunk/dports/mail/exim/Portfile

@@ -1 @@
-# $Id: Portfile,v 1.19 2003/11/11 21:52:19 fkr Exp $
+# $Id: Portfile,v 1.20 2003/12/28 12:34:49 fkr Exp $
 
 PortSystem 1.0
 name            exim
-version         4.24
+version         4.30
 categories      mail
 description     complete replacement for sendmail
@@ -17 +17 @@
 master_sites    ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
                 ftp://ftp.exim.org/pub/exim/exim4/
-checksums       md5 74f4116be9b71991b54b91abd7c99eec
+checksums       md5 ba8fe22a527172bc3cf6481ba26712cb
 depends_build   bin:perl:perl5.8
 depends_run     path:/Library/StartupItems/DarwinPortsStartup:DarwinPortsStartup
+
 
 set exim_user   exim
@@ -47 +48 @@
                 reinplace "s|__PREFIX|${prefix}|g" ${destroot}${prefix}/etc/rc.d/exim.sh }
 
-platform darwin 7 {     patchfiles-append       patch-EDITME \
-                                                patch-Makefile-Darwin }
+
+platform darwin 6 {
+
+        if {[variant_isset mysql] || [variant_isset mysql4]} {
+                patchfiles-append patch-EDITME
+                reinplace "s|LOOKUP_LIBS=-lresolv|LOOKUP_LIBS=-L${prefix}/lib/mysql -L${prefix}/lib -L/usr/lib -lmysqlclient|g" ${filespath}/patch-EDITME
+        }
+}
+
+platform darwin 7 {     
+        patchfiles-append       patch-EDITME
+                                                
+        if {[variant_isset mysql] || [variant_isset mysql4]} {
+                reinplace "s|LOOKUP_LIBS=-lresolv|LOOKUP_LIBS=-L${prefix}/lib/mysql -L${prefix}/lib -L/usr/lib -lresolv -lmysqlclient|g" ${filespath}/patch-EDITME
+        }
+        
+}
 
 variant smtp-auth { }
@@ -59 +75 @@
 variant mysql { depends_lib-append      lib:libmysqlclient:mysql }
 
+variant mysql4 { depends_lib-append      lib:libmysqlclient:mysql4 }
+
 variant maildir { }
 
 post-configure {
-        
-        if {[variant_isset mysql]} {
+        if {[variant_isset mysql] || [variant_isset mysql4]} {
                 reinplace "s|# LOOKUP_MYSQL=yes|LOOKUP_MYSQL=yes|g" Local/Makefile
                 reinplace "s|# LOOKUP_INCLUDE=.*|LOOKUP_INCLUDE=-I ${prefix}/include/mysql -I ${prefix}/include -I /usr/include|g" Local/Makefile
-                reinplace "s|# LOOKUP_LIBS=.*|LOOKUP_LIBS=-L${prefix}/lib/mysql -L${prefix}/lib -L/usr/lib -lmysqlclient|g" Local/Makefile
         }
 

trunk/dports/mail/exim/files/patch-EDITME

@@ -5 +5 @@
  # LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include
  # LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds
-+LOOKUP_LIBS=-lresolv
++LOOKUP_LIBS=-L/opt/local/lib/mysql -L/opt/local/lib -L/usr/lib -lresolv -lmysqlclient
  
  #------------------------------------------------------------------------------