Ticket #1138: portfile.2.diff

(a) Portfile-orig vs. (b) Portfile

@@ -20 +20 @@
 depends_build   bin:perl:perl5.8
 depends_run     path:/Library/StartupItems/DarwinPortsStartup:DarwinPortsStartup
 
+
 set exim_user   exim
 patch.pre_args  -p1
 
@@ -46 +47 @@
                 system "touch '${destroot}${prefix}/var/spool/exim/.turd'"
                 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-Makefile-Darwin \
+                                                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 { }
 variant tls { }
@@ -58 +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
         }
 
         if {[variant_isset maildir ]} {