most recent changes, diff for lua

Index: lang/lua/Portfile --- lang/lua/Portfile (revision 36853) +++ lang/lua/Portfile (revision 36854) @@ -4,7 +4,7 @@ name lua version 5.1.3 -revision 2 +revision 3 categories lang platforms darwin maintainers pmq openmaintainer @@ -32,18 +32,13 @@ reinplace "s|/usr/local|${prefix}|g" ${worksrcpath}/src/luaconf.h reinplace "s|/man/man1|/share/man/man1|g" ${worksrcpath}/Makefile - # to complement the use_readline patch - reinplace "s|MYLDFLAGS=|MYLDFLAGS=-L${prefix}/lib|" ${worksrcpath}/src/Makefile # for the pkgconfig file reinplace "s|/usr/local|${prefix}|g" ${worksrcpath}/etc/lua.pc } -# "use_configure no" nullifies the configure.universal_* hooks configure { - if {[variant_isset universal]} { - reinplace "s|MYCFLAGS=|MYCFLAGS=\"${configure.universal_cflags} \"|g" ${worksrcpath}/src/Makefile - reinplace "s|MYLDFLAGS=|MYLDFLAGS=${configure.universal_ldflags} |g" ${worksrcpath}/src/Makefile - } + reinplace -E "/^MYLDFLAGS=/s|\$| ${configure.ldflags}|" ${worksrcpath}/src/Makefile + reinplace -E "/^CFLAGS=/s|\$| ${configure.cflags} ${configure.cppflags}|" ${worksrcpath}/src/Makefile } use_parallel_build yes