jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

libarchive: rename mtree.5 to libarchive-mtree.5.

Browse source 
Fixes file conflict with the mtree pkg.
This commit is contained in:
Juan RP 2014-12-25 19:44:33 +01:00
parent 5e7b65066e
commit 24d259ee1f
1 changed files with 9 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
srcpkgs/libarchive/template
View file

@ -1,11 +1,15 @@
# Template file for 'libarchive' # Template file for 'libarchive'
pkgname=libarchive pkgname=libarchive
version=3.1.2 version=3.1.2
revision=9 revision=10
bootstrap=yes bootstrap=yes
build_style=gnu-configure build_style=gnu-configure
configure_args="--without-xml2 --without-nettle --disable-rpath ac_cv_func_lchmod=no" configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
makedepends="zlib-devel bzip2-devel liblzma-devel" $(vopt_with expat) $(vopt_with lzo lzo2) $(vopt_with ssl openssl)
--without-xml2 --without-nettle --disable-rpath ac_cv_func_lchmod=no"
makedepends="zlib-devel bzip2-devel liblzma-devel
$(vopt_if acl acl-devel) $(vopt_if expat expat-devel)
$(vopt_if lzo lzo-devel) $(vopt_if openssl libressl-devel)"
short_desc="Library to read/write several different streaming archive formats" short_desc="Library to read/write several different streaming archive formats"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.libarchive.org/" homepage="http://www.libarchive.org/"
@ -30,34 +34,6 @@ build_options="acl expat lzo ssl"
# Enable acl and ssl by default. # Enable acl and ssl by default.
build_options_default="acl ssl" build_options_default="acl ssl"
if [ "$build_option_acl" ]; then
configure_args+=" --enable-xattr --enable-acl"
makedepends+=" acl-devel"
else
configure_args+=" --disable-xattr --disable-acl"
fi
if [ "$build_option_expat" ]; then
configure_args+=" --with-expat"
makedepends+=" expat-devel"
else
configure_args+=" --without-expat"
fi
if [ "$build_option_lzo" ]; then
configure_args+=" --with-lzo2"
makedepends+=" lzo-devel"
else
configure_args+=" --without-lzo2"
fi
if [ "$build_option_ssl" ]; then
configure_args+=" --with-openssl"
makedepends+=" libressl-devel"
else
configure_args+=" --without-openssl"
fi
bsdtar_package() { bsdtar_package() {
short_desc="BSD tar(1) using libarchive" short_desc="BSD tar(1) using libarchive"
pkg_install() { pkg_install() {
@ -66,7 +42,6 @@ bsdtar_package() {
vmove usr/share/man/man5/tar.5 vmove usr/share/man/man5/tar.5
} }
} }
bsdcpio_package() { bsdcpio_package() {
short_desc="BSD cpio(1) using libarchive" short_desc="BSD cpio(1) using libarchive"
pkg_install() { pkg_install() {
@ -75,7 +50,6 @@ bsdcpio_package() {
vmove usr/share/man/man5/cpio.5 vmove usr/share/man/man5/cpio.5
} }
} }
libarchive-devel_package() { libarchive-devel_package() {
depends="${makedepends} libarchive>=${version}_${revision}" depends="${makedepends} libarchive>=${version}_${revision}"
short_desc+=" - development files" short_desc+=" - development files"
@ -85,5 +59,7 @@ libarchive-devel_package() {
vmove "usr/lib/*.so" vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig vmove usr/lib/pkgconfig
vmove usr/share vmove usr/share
# Conflicts with mtree.
mv ${PKGDESTDIR}/usr/share/man/man5/{mtree.5,libarchive-mtree.5}
} }
} }