diff --git a/app-arch/libarchive/libarchive-3.1.2.recipe b/app-arch/libarchive/libarchive-3.3.0.recipe similarity index 85% rename from app-arch/libarchive/libarchive-3.1.2.recipe rename to app-arch/libarchive/libarchive-3.3.0.recipe index ddc8fffa5..f6a072265 100644 --- a/app-arch/libarchive/libarchive-3.1.2.recipe +++ b/app-arch/libarchive/libarchive-3.3.0.recipe @@ -20,12 +20,12 @@ cab, mtree, rar, and ISO images. or compress. * Unique format conversion feature." HOMEPAGE="http://www.libarchive.org/" -SOURCE_URI="http://www.libarchive.org/downloads/libarchive-3.1.2.tar.gz" -CHECKSUM_SHA256="eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e" -PATCHES="libarchive-3.1.2.patchset" LICENSE="BSD (2-clause)" COPYRIGHT="2003-2013 Tim Kientzle" REVISION="1" +SOURCE_URI="http://www.libarchive.org/downloads/libarchive-$portVersion.tar.gz" +CHECKSUM_SHA256="f9c80dece299c04dd5f601b523f6518ad90fef1575db9b278e81616cc860e20c" +PATCHES="libarchive-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -40,51 +40,50 @@ fi PROVIDES=" libarchive$secondaryArchSuffix = $portVersion compat >= 3.0 - cmd:bsdtar$commandSuffix = $portVersion compat >= 3.0 + cmd:bsdcat$commandSuffix = $portVersion compat >= 3.0 cmd:bsdcpio$commandSuffix = $portVersion compat >= 3.0 - lib:libarchive$secondaryArchSuffix = $portVersion compat >= 3.0 + cmd:bsdtar$commandSuffix = $portVersion compat >= 3.0 + lib:libarchive$secondaryArchSuffix = 13.3.0 compat >= 13 " REQUIRES=" haiku$secondaryArchSuffix - lib:liblzma$secondaryArchSuffix - lib:libxml2$secondaryArchSuffix - lib:libssl$secondaryArchSuffix - lib:libcrypto$secondaryArchSuffix - lib:libz$secondaryArchSuffix lib:libbz2$secondaryArchSuffix + lib:libcrypto$secondaryArchSuffix + lib:liblzma$secondaryArchSuffix + lib:libssl$secondaryArchSuffix + lib:libxml2$secondaryArchSuffix + lib:libz$secondaryArchSuffix " PROVIDES_devel=" libarchive${secondaryArchSuffix}_devel = $portVersion compat >= 3.0 - devel:libarchive$secondaryArchSuffix = $portVersion compat >= 3.0 + devel:libarchive$secondaryArchSuffix = 13.3.0 compat >= 13 " REQUIRES_devel=" libarchive$secondaryArchSuffix == $portVersion " BUILD_REQUIRES=" - devel:liblzma$secondaryArchSuffix - devel:libxml2$secondaryArchSuffix - devel:libssl$secondaryArchSuffix - devel:libcrypto$secondaryArchSuffix - devel:libz$secondaryArchSuffix + haiku${secondaryArchSuffix}_devel devel:libbz2$secondaryArchSuffix + devel:libcrypto$secondaryArchSuffix + devel:liblzma$secondaryArchSuffix + devel:libssl$secondaryArchSuffix + devel:libxml2$secondaryArchSuffix + devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel - cmd:libtoolize cmd:aclocal cmd:autoconf cmd:automake + cmd:libtoolize cmd:make cmd:gcc$secondaryArchSuffix - cmd:xml2_config + cmd:pkg_config$secondaryArchSuffix + cmd:xml2_config$secondaryArchSuffix " BUILD() { - libtoolize -fci - aclocal -I build/autoconf - automake --add-missing - autoconf + autoreconf -fi runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir make $jobArgs } diff --git a/app-arch/libarchive/patches/libarchive-3.1.2.patchset b/app-arch/libarchive/patches/libarchive-3.3.0.patchset similarity index 63% rename from app-arch/libarchive/patches/libarchive-3.1.2.patchset rename to app-arch/libarchive/patches/libarchive-3.3.0.patchset index 59fb64998..ccbe55f9c 100644 --- a/app-arch/libarchive/patches/libarchive-3.1.2.patchset +++ b/app-arch/libarchive/patches/libarchive-3.3.0.patchset @@ -1,21 +1,22 @@ -From e3947009a6fee8dfd0ac635812df2825cdc8c338 Mon Sep 17 00:00:00 2001 +From 7d93c99a1f9c94682d8918a588298dd2ce3fa321 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Sat, 26 Oct 2013 18:36:43 -0600 Subject: Check libgnu for xattr functions on Haiku diff --git a/configure.ac b/configure.ac -index 73944d3..9bfdaa2 100644 +index b8904de..374bbd8 100644 --- a/configure.ac +++ b/configure.ac -@@ -569,6 +569,7 @@ if test "x$enable_xattr" != "xno"; then +@@ -660,7 +660,7 @@ AC_ARG_ENABLE([xattr], + if test "x$enable_xattr" != "xno"; then AC_CHECK_HEADERS([attr/xattr.h]) AC_CHECK_HEADERS([sys/xattr.h sys/ea.h]) - AC_CHECK_LIB(attr,setxattr) -+ AC_CHECK_LIB(gnu,setxattr) +- AC_SEARCH_LIBS([setxattr], [attr]) ++ AC_SEARCH_LIBS([setxattr], [attr gnu]) AC_CHECK_FUNCS([extattr_get_file extattr_list_file]) AC_CHECK_FUNCS([extattr_set_fd extattr_set_file]) AC_CHECK_FUNCS([fgetxattr flistxattr fsetxattr getxattr]) -- -1.8.3.4 +2.10.2