Ticket #1138: portfile.2.diff

File portfile.2.diff, 1.8 KB (added by bchesneau@…, 21 years ago)

correct diff

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

    a b  
    2020depends_build   bin:perl:perl5.8
    2121depends_run     path:/Library/StartupItems/DarwinPortsStartup:DarwinPortsStartup
    2222
     23
    2324set exim_user   exim
    2425patch.pre_args  -p1
    2526
     
    4647                system "touch '${destroot}${prefix}/var/spool/exim/.turd'"
    4748                reinplace "s|__PREFIX|${prefix}|g" ${destroot}${prefix}/etc/rc.d/exim.sh }
    4849
    49 platform darwin 7 {     patchfiles-append       patch-EDITME \
    50                                                 patch-Makefile-Darwin }
     50
     51platform darwin 6 {
     52
     53        if {[variant_isset mysql] || [variant_isset mysql4]} {
     54                patchfiles-append patch-EDITME
     55                reinplace "s|LOOKUP_LIBS=-lresolv|LOOKUP_LIBS=-L${prefix}/lib/mysql -L${prefix}/lib -L/usr/lib -lmysqlclient|g" ${filespath}/patch-EDITME
     56        }
     57}
     58
     59platform darwin 7 {     
     60        patchfiles-append       patch-Makefile-Darwin \
     61                                                patch-EDITME
     62                                               
     63        if {[variant_isset mysql] || [variant_isset mysql4]} {
     64                reinplace "s|LOOKUP_LIBS=-lresolv|LOOKUP_LIBS=-L${prefix}/lib/mysql -L${prefix}/lib -L/usr/lib -lresolv -lmysqlclient|g" ${filespath}/patch-EDITME
     65        }
     66       
     67}
    5168
    5269variant smtp-auth { }
    5370variant tls { }
     
    5875
    5976variant mysql { depends_lib-append      lib:libmysqlclient:mysql }
    6077
     78variant mysql4 { depends_lib-append      lib:libmysqlclient:mysql4 }
     79
    6180variant maildir { }
    6281
    6382post-configure {
    64        
    65         if {[variant_isset mysql]} {
     83        if {[variant_isset mysql] || [variant_isset mysql4]} {
    6684                reinplace "s|# LOOKUP_MYSQL=yes|LOOKUP_MYSQL=yes|g" Local/Makefile
    6785                reinplace "s|# LOOKUP_INCLUDE=.*|LOOKUP_INCLUDE=-I ${prefix}/include/mysql -I ${prefix}/include -I /usr/include|g" Local/Makefile
    68                 reinplace "s|# LOOKUP_LIBS=.*|LOOKUP_LIBS=-L${prefix}/lib/mysql -L${prefix}/lib -L/usr/lib -lmysqlclient|g" Local/Makefile
    6986        }
    7087
    7188        if {[variant_isset maildir ]} {