diff --git a/common/shlibs b/common/shlibs index 9cc9fd93f4..b8adf44d27 100644 --- a/common/shlibs +++ b/common/shlibs @@ -40,6 +40,7 @@ libBrokenLocale.so.1 glibc-2.8_1 libz.so.1 zlib-1.2.3_1 libbz2.so.1 bzip2-1.0.5_1 libarchive.so.12 libarchive-3.0.2_1 +libarchive.so.13 libarchive-3.1.2_1 libgcc_s.so.1 libgcc-4.4.0_1 libperl.so perl-5.12.0_1 libmp.so.3 gmp-5.0.1_1 diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template index ba1a600ede..845b5b55be 100644 --- a/srcpkgs/libarchive/template +++ b/srcpkgs/libarchive/template @@ -1,30 +1,23 @@ # Template file for 'libarchive' pkgname=libarchive -version=3.0.4 -revision=2 +version=3.1.2 +revision=1 subpackages="bsdtar bsdcpio $pkgname-devel" build_style=gnu-configure configure_args="--without-xml2 --without-nettle" makedepends="acl-devel openssl-devel liblzma-devel expat-devel" short_desc="Library to read/write several different streaming archive formats" maintainer="Juan RP " -homepage="http://libarchive.github.com/" +homepage="http://www.libarchive.org/" license="BSD" -distfiles="https://github.com/downloads/libarchive/libarchive/libarchive-$version.tar.gz" -checksum=76e8d7c7b100ec4071e48c1b7d3f3ea1d22b39db3e45b7189f75b5ff4df90fac - -crossmakedepends="zlib-devel bzip2-devel acl-devel openssl-devel liblzma-devel expat-devel" +distfiles="http://www.libarchive.org/downloads/libarchive-${version}.tar.gz" +checksum=eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e if [ -n "${XBPS_CROSS_TRIPLET}" ]; then makedepends="automake" - -pre_configure() { - ./build/autogen.sh -} - -pre_build() { - # XXX remove las for now. - rm -f /usr/${XBPS_CROSS_TRIPLET}/lib/*.la -} - + crossmakedepends="zlib-devel bzip2-devel acl-devel openssl-devel + liblzma-devel expat-devel" + pre_configure() { + ./build/autogen.sh + } fi