most recent changes, diff for zlib

Index: archivers/zlib/Portfile
--- archivers/zlib/Portfile (revision 31397)
+++ archivers/zlib/Portfile (revision 31398)
@@ -26,13 +26,11 @@
rmd160 cfba9984b354dcc38da49331457e6bfc861c6f51

patchfiles patch-Makefile-static.diff
-if {[variant_isset universal]} {
- patchfiles-append patch-Makefile-universal.diff
-}

-post-patch {
- # Add the universal CFLAGS, if they're needed
- reinplace s|@UNIVERSAL_CFLAGS@|${configure.universal_cflags}|g ${worksrcpath}/Makefile.in
+post-configure {
+ if {[variant_isset universal]} {
+ reinplace -E "/^LDSHARED=/s|\$| ${configure.universal_cflags}|" ${worksrcpath}/Makefile
+ }
}

configure.args --shared
@@ -45,7 +43,7 @@
destroot.destdir prefix=${destroot}${prefix}

post-destroot {
- xinstall -m 0755 -d ${destroot}${docdir}
+ xinstall -d ${destroot}${docdir}
xinstall -m 0644 -W ${worksrcpath} ChangeLog FAQ README ${destroot}${docdir}
}

@@ -53,7 +51,7 @@
post-destroot {
set examplesdir ${docdir}/examples

- xinstall -m 0755 -d ${destroot}${examplesdir}
+ xinstall -d ${destroot}${examplesdir}
eval xinstall -m 0644 [glob ${worksrcpath}/example{.c,s/*}] ${destroot}${examplesdir}
}
}