From f654bcc80dbeb2df1ffda1153b9293c447936b66 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 7 Sep 2011 11:17:19 +0200 Subject: [PATCH] libarchive: update to 2.8.5. --- srcpkgs/libarchive/bsdcpio.template | 13 +++---------- srcpkgs/libarchive/bsdtar.template | 14 +++----------- srcpkgs/libarchive/libarchive-devel.template | 11 ++++------- srcpkgs/libarchive/template | 8 ++++---- 4 files changed, 14 insertions(+), 32 deletions(-) diff --git a/srcpkgs/libarchive/bsdcpio.template b/srcpkgs/libarchive/bsdcpio.template index cdbe821519..4ba799a90d 100644 --- a/srcpkgs/libarchive/bsdcpio.template +++ b/srcpkgs/libarchive/bsdcpio.template @@ -26,8 +26,6 @@ long_desc=" * GNU tar support. Libarchive reads most GNU tar archives. If there is demand, this can be improved further." -revision=4 - Add_dependency run glibc Add_dependency run zlib Add_dependency run bzip2 @@ -39,12 +37,7 @@ Add_dependency run liblzma do_install() { - install -d ${DESTDIR}/usr/share/man/man1 - install -d ${DESTDIR}/usr/share/man/man5 - - mv ${SRCPKGDESTDIR}/usr/bin ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/share/man/man1/bsdcpio.1 \ - ${DESTDIR}/usr/share/man/man1 - mv ${SRCPKGDESTDIR}/usr/share/man/man5/cpio.5 \ - ${DESTDIR}/usr/share/man/man5 + vmove usr/bin usr + vmove usr/share/man/man1/bsdcpio.1 usr/share/man/man1 + vmove usr/share/man/man5/cpio.5 usr/share/man/man5 } diff --git a/srcpkgs/libarchive/bsdtar.template b/srcpkgs/libarchive/bsdtar.template index f5a7061c08..51320e3a29 100644 --- a/srcpkgs/libarchive/bsdtar.template +++ b/srcpkgs/libarchive/bsdtar.template @@ -27,8 +27,6 @@ long_desc=" * GNU tar support. Libarchive reads most GNU tar archives. If there is demand, this can be improved further." -revision=4 - Add_dependency run glibc Add_dependency run zlib Add_dependency run bzip2 @@ -40,13 +38,7 @@ Add_dependency run liblzma do_install() { - install -d ${DESTDIR}/usr/bin - install -d ${DESTDIR}/usr/share/man/man1 - install -d ${DESTDIR}/usr/share/man/man5 - - mv ${SRCPKGDESTDIR}/usr/bin/bsdtar ${DESTDIR}/usr/bin - mv ${SRCPKGDESTDIR}/usr/share/man/man1/bsdtar.1 \ - ${DESTDIR}/usr/share/man/man1 - mv ${SRCPKGDESTDIR}/usr/share/man/man5/tar.5 \ - ${DESTDIR}/usr/share/man/man5 + vmove usr/bin/bsdtar usr/bin + vmove usr/share/man/man1/bsdtar.1 usr/share/man/man1 + vmove usr/share/man/man5/tar.5 usr/share/man/man5 } diff --git a/srcpkgs/libarchive/libarchive-devel.template b/srcpkgs/libarchive/libarchive-devel.template index d90c7fe2a0..ae44e8c38b 100644 --- a/srcpkgs/libarchive/libarchive-devel.template +++ b/srcpkgs/libarchive/libarchive-devel.template @@ -5,8 +5,6 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -revision=1 - Add_dependency run acl-devel Add_dependency run zlib-devel Add_dependency run bzip2-devel @@ -17,9 +15,8 @@ Add_dependency run libarchive do_install() { - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/libarchive.*a ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr + vmove usr/include usr + vmove "usr/lib/*.a" usr/lib + vmove usr/lib/pkgconfig usr/lib + vmove usr/share usr } diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template index e557b684ac..30007c6539 100644 --- a/srcpkgs/libarchive/template +++ b/srcpkgs/libarchive/template @@ -1,13 +1,14 @@ # Template file for 'libarchive' pkgname=libarchive -version=2.8.4 -revision=2 +version=2.8.5 distfiles="http://libarchive.googlecode.com/files/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--without-xml2" short_desc="Library to read/write several different streaming archive formats" maintainer="Juan RP " -checksum=86cffa3eaa28d3116f5d0b20284026c3762cf4a2b52b9844df2b494d4a89f688 +homepage="http://code.google.com/p/libarchive" +license="BSD" +checksum=13993e0ffbd121ccda46ea226b1f8eac218de0fa8da7d8b1f998093d5c32a72d long_desc=" Libarchive is a programming library that can create and read several different streaming archive formats, including most popular tar variants, @@ -26,7 +27,6 @@ Add_dependency run expat Add_dependency build bzip2-devel Add_dependency build zlib-devel -Add_dependency build attr-devel Add_dependency build acl-devel Add_dependency build openssl-devel Add_dependency build liblzma-devel