Revision: 94838 https://trac.macports.org/changeset/94838 Author: afb@macports.org Date: 2012-07-01 05:55:56 -0700 (Sun, 01 Jul 2012) Log Message: ----------- xz: upgrade to 5.0.4 Stop splitting the port into a static xz and a shared liblzma, include everything in the "xz" port like done with bzip2 etc. Ignore the license and bloat issues that this brings, for now. Mark the "liblzma" port as being replaced_by the new xz port. Modified Paths: -------------- trunk/dports/archivers/xz/Portfile trunk/dports/devel/liblzma/Portfile Modified: trunk/dports/archivers/xz/Portfile =================================================================== --- trunk/dports/archivers/xz/Portfile 2012-07-01 12:03:55 UTC (rev 94837) +++ trunk/dports/archivers/xz/Portfile 2012-07-01 12:55:56 UTC (rev 94838) @@ -3,7 +3,7 @@ PortSystem 1.0 name xz -version 5.0.3 +version 5.0.4 categories archivers # some executables are GPL, libs and everything else are public domain license {public-domain GPL-2+} @@ -20,30 +20,19 @@ master_sites ${homepage} use_bzip2 yes -checksums sha1 79661fd1c24603437e325d76732046b1da683b32 \ - rmd160 10127da6e2e35e5e92b3125f6088c756b80931e5 +checksums sha1 7dd986aa42e0181cad3af236826f65514d2f7c19 \ + rmd160 25463b22fb24156a5d6c62450265ebe1b29e670e depends_lib port:libiconv port:gettext configure.args --with-libiconv-prefix=${prefix} --with-libintl-prefix=${prefix} -# previous version defaulted to static liblzma (through --enable-dynamic=mixed) -configure.args-append --disable-shared - # document that we always need legacy symlinks now that "lzmautils" refers here configure.args-append --enable-lzma-links # the internal "check.h" header conflicts with port check's <check.h> configure.cppflags -I${worksrcpath}/src/liblzma/check -I${prefix}/include -# the library is being provided by the liblzma port instead -post-destroot { - file delete -force ${destroot}${prefix}/include/lzma.h - file delete -force ${destroot}${prefix}/include/lzma - foreach lib [glob ${destroot}${prefix}/lib/liblzma*] { file delete $lib } - file delete ${destroot}${prefix}/lib/pkgconfig/liblzma.pc -} - livecheck.url ${homepage} livecheck.regex xz-(\[0-9.a-z\]*)\.tar\.gz livecheck.type regexm Modified: trunk/dports/devel/liblzma/Portfile =================================================================== --- trunk/dports/devel/liblzma/Portfile 2012-07-01 12:03:55 UTC (rev 94837) +++ trunk/dports/devel/liblzma/Portfile 2012-07-01 12:55:56 UTC (rev 94838) @@ -21,6 +21,8 @@ distname xz-${version} dist_subdir xz +replaced_by xz + checksums sha1 79661fd1c24603437e325d76732046b1da683b32 \ rmd160 10127da6e2e35e5e92b3125f6088c756b80931e5