Christian Weisgerber <[email protected]> wrote: > This is an updated port of XZ Utils, the successor to archivers/lzma, > i.e. a Unix-style compression tool that implements 7-Zip's LZMA.
A number of ports currently depend on archivers/lzma and need to be changed when xz replaces lzma. archivers/libarchive LIB_DEPENDS -> xz (+ update) print/texlive/base BUILD_DEPENDS -> xz print/texlive/texmf BUILD_DEPENDS -> xz x11/gnome/file-roller RUN_DEPENDS -> xz x11/gnome/yelp LIB_DEPENDS drop yelp currently links against liblzmadec, which will be gone. xz's liblzma doesn't (yet) have a gzopen(), gzread() -style interface. The easiest course is to just drop .lzma support for the time being and wait for either upstream to implement something liblzma-based or for liblzma to grow simple I/O functions, whichever comes first. Yes? No? Index: archivers/libarchive/Makefile =================================================================== RCS file: /cvs/ports/archivers/libarchive/Makefile,v retrieving revision 1.10 diff -u -p -r1.10 Makefile --- archivers/libarchive/Makefile 18 Apr 2009 18:22:49 -0000 1.10 +++ archivers/libarchive/Makefile 9 Sep 2009 19:14:19 -0000 @@ -2,9 +2,9 @@ COMMENT= library for reading and writing streaming archives -V= 2.7.0 +V= 2.7.1 DISTNAME= libarchive-$V -SHARED_LIBS += archive 4.0 # .9.0 +SHARED_LIBS += archive 5.0 # .9.1 CATEGORIES= archivers HOMEPAGE= http://code.google.com/p/libarchive/ @@ -23,12 +23,12 @@ DISTFILES= libarchive-$V.tar.gz \ WANTLIB= c crypto z LIB_DEPENDS= bz2.>=10::archivers/bzip2 \ - lzmadec.>=0::archivers/lzma + lzma.>=0::archivers/xz USE_LIBTOOL= Yes CONFIGURE_STYLE=gnu CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --without-lzma # xz, liblzma + --without-lzmadec # old LZMA utils CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/build/autoconf Index: archivers/libarchive/distinfo =================================================================== RCS file: /cvs/ports/archivers/libarchive/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- archivers/libarchive/distinfo 18 Apr 2009 18:22:49 -0000 1.10 +++ archivers/libarchive/distinfo 9 Sep 2009 19:14:19 -0000 @@ -1,10 +1,10 @@ -MD5 (libarchive-2.7.0.tar.gz) = ohA8ozQDdWKtMn6zrtVIaQ== -MD5 (libarchive-catpages-2.7.0.tar.gz) = KZDL/o/VTQpzafXIBk/NaA== -RMD160 (libarchive-2.7.0.tar.gz) = mX8oCcuR64RwdxTLWPSEDe4KnqA= -RMD160 (libarchive-catpages-2.7.0.tar.gz) = 3CHvQgofaLHFNW8vLjZ4n2i9kL8= -SHA1 (libarchive-2.7.0.tar.gz) = YlNHdmeXkphzqOMYGaFMQFvLInU= -SHA1 (libarchive-catpages-2.7.0.tar.gz) = bCKugNUbPnwpZTiRPu5WE+Plsh0= -SHA256 (libarchive-2.7.0.tar.gz) = riH/yBYCQQAey8evB1H/Zc/Fzv+uihuc9oIjKPTAR04= -SHA256 (libarchive-catpages-2.7.0.tar.gz) = ko5frOIlbArW22X5Wl7uKya/r9lPfd4KCvpJ1NjxAog= -SIZE (libarchive-2.7.0.tar.gz) = 1243793 -SIZE (libarchive-catpages-2.7.0.tar.gz) = 57705 +MD5 (libarchive-2.7.1.tar.gz) = 9DOCQTtEV9DhkncbEApm5w== +MD5 (libarchive-catpages-2.7.1.tar.gz) = QvfVxh4PXM+y2ED4L8EpQA== +RMD160 (libarchive-2.7.1.tar.gz) = egtXR1aUUvAV6U5Ur6kMqF39fMo= +RMD160 (libarchive-catpages-2.7.1.tar.gz) = HmlXQFxqMnCZ5zvF862kJwkrkmI= +SHA1 (libarchive-2.7.1.tar.gz) = OBDe0JstJI6rl1TQCPDPFE8nhI0= +SHA1 (libarchive-catpages-2.7.1.tar.gz) = Qtqv95xxNtVhfeYT9TkD9qUTjYo= +SHA256 (libarchive-2.7.1.tar.gz) = p+Bm74V9PbAhHi2RbKFKr8SKR3bE+hCP1nCSzoYqe6g= +SHA256 (libarchive-catpages-2.7.1.tar.gz) = OUT0d+rkak6/m20p4Tr8EuTVkHSVqsO8JIPFBXt1cR0= +SIZE (libarchive-2.7.1.tar.gz) = 1248222 +SIZE (libarchive-catpages-2.7.1.tar.gz) = 57716 Index: print/texlive/base/Makefile =================================================================== RCS file: /cvs/ports/print/texlive/base/Makefile,v retrieving revision 1.25 diff -u -p -r1.25 Makefile --- print/texlive/base/Makefile 10 Aug 2009 06:34:09 -0000 1.25 +++ print/texlive/base/Makefile 9 Sep 2009 19:14:19 -0000 @@ -13,7 +13,7 @@ WANTLIB = m X11 ICE freetype Xt pthread EXTRACT_SUFX = .tar.lzma -BUILD_DEPENDS = :lzma-*:archivers/lzma +BUILD_DEPENDS = ::archivers/xz RUN_DEPENDS = :ghostscript-*:print/ghostscript/gnu \ :detex-*:print/detex \ :dvi2tty-*:print/dvi2tty \ @@ -74,7 +74,7 @@ SUBST_VARS += TRUEPREFIX # Also annoyingly loads of .orig files confuse update-patches do-extract: cd ${WRKDIR} && \ - lzma -dc ${FULLDISTDIR}/${DISTNAME}${EXTRACT_SUFX} | ${TAR} xf - + xz -dc ${FULLDISTDIR}/${DISTNAME}${EXTRACT_SUFX} | ${TAR} xf - find ${WRKDIST} -name '*.orig' | xargs rm post-install: Index: print/texlive/texmf/Makefile =================================================================== RCS file: /cvs/ports/print/texlive/texmf/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- print/texlive/texmf/Makefile 23 Apr 2009 00:18:18 -0000 1.6 +++ print/texlive/texmf/Makefile 9 Sep 2009 19:14:19 -0000 @@ -17,7 +17,7 @@ NO_BUILD = Yes NO_REGRESS = Yes PKG_ARCH = * -BUILD_DEPENDS = ::archivers/lzma +BUILD_DEPENDS = ::archivers/xz RUN_DEPENDS-full = :texlive_texmf-minimal-${V}:print/texlive/texmf,-main \ :texlive_base-${V}:print/texlive/base RUN_DEPENDS-docs = :texlive_base-${V}:print/texlive/base @@ -27,7 +27,7 @@ MULTI_PACKAGES = -main -full -docs # Could do with bsd.port.mk understanding lzma do-extract: cd ${WRKDIR} && \ - lzma -dc ${FULLDISTDIR}/${DISTNAME}${EXTRACT_SUFX} | ${TAR} xf - + xz -dc ${FULLDISTDIR}/${DISTNAME}${EXTRACT_SUFX} | ${TAR} xf - do-install: mv ${WRKDIST}/texmf ${PREFIX}/share Index: x11/gnome/file-roller/Makefile =================================================================== RCS file: /cvs/ports/x11/gnome/file-roller/Makefile,v retrieving revision 1.27 diff -u -p -r1.27 Makefile --- x11/gnome/file-roller/Makefile 11 Aug 2009 08:39:38 -0000 1.27 +++ x11/gnome/file-roller/Makefile 9 Sep 2009 19:14:19 -0000 @@ -4,7 +4,7 @@ COMMENT= archive manager for GNOME GNOME_PROJECT= file-roller GNOME_VERSION= 2.24.3 -PKGNAME= ${DISTNAME}p8 +PKGNAME= ${DISTNAME}p9 CATEGORIES= archivers @@ -30,10 +30,10 @@ MODULES= devel/gettext \ x11/gnome \ devel/gconf2 -RUN_DEPENDS= :gtar-*:archivers/gtar \ - :lzma-*:archivers/lzma \ - :unzip-*:archivers/unzip \ - :zip-*:archivers/zip \ +RUN_DEPENDS= ::archivers/gtar \ + ::archivers/xz \ + ::archivers/unzip \ + ::archivers/zip \ ::archivers/gcpio \ :rpm2cpio-*|rpm-*:converters/rpm2cpio LIB_DEPENDS= gnomeui-2.>=1800::x11/gnome/libgnomeui \ Index: x11/gnome/yelp/Makefile =================================================================== RCS file: /cvs/ports/x11/gnome/yelp/Makefile,v retrieving revision 1.44 diff -u -p -r1.44 Makefile --- x11/gnome/yelp/Makefile 11 Aug 2009 08:39:39 -0000 1.44 +++ x11/gnome/yelp/Makefile 9 Sep 2009 19:14:19 -0000 @@ -4,7 +4,7 @@ COMMENT= GNOME help browser GNOME_PROJECT= yelp GNOME_VERSION= 2.24.0 -PKGNAME= ${DISTNAME}p9 +PKGNAME= ${DISTNAME}p10 # GPLv2 PERMIT_PACKAGE_CDROM= Yes @@ -38,7 +38,6 @@ LIB_DEPENDS= startup-notification-1::de xulrunner/gtkembedmoz,xulrunner/xpcom,xulrunner/xul::devel/xulrunner/1.8,-main \ gnomeui-2::x11/gnome/libgnomeui \ exslt,xslt::textproc/libxslt \ - lzmadec::archivers/lzma \ rarian::textproc/rarian USE_X11= Yes -- Christian "naddy" Weisgerber [email protected]
