diff --git a/app-arch/libarchive/libarchive-3.5.1.recipe b/app-arch/libarchive/libarchive-3.7.1.recipe similarity index 84% rename from app-arch/libarchive/libarchive-3.5.1.recipe rename to app-arch/libarchive/libarchive-3.7.1.recipe index 216734e95..31a686cee 100644 --- a/app-arch/libarchive/libarchive-3.5.1.recipe +++ b/app-arch/libarchive/libarchive-3.7.1.recipe @@ -11,6 +11,7 @@ entry sizes depend on particular formats. * Growing test suite ? to verify correctness of new ports. * Works on most POSIX-like systems * Supports Windows, including Cygwin, MinGW, and Visual Studio. + The bsdtar and bscpio command-line utilities are feature- and \ performance-competitive with other tar and cpio implementations: * Reads a variety of formats, including tar, pax, cpio, zip, xar, lha, ar, \ @@ -20,12 +21,11 @@ cab, mtree, rar, and ISO images. or compress. * Unique format conversion feature." HOMEPAGE="http://www.libarchive.org/" -COPYRIGHT="2003-2013 Tim Kientzle" +COPYRIGHT="2003-2018 Tim Kientzle" LICENSE="BSD (2-clause)" -REVISION="2" +REVISION="1" SOURCE_URI="http://www.libarchive.org/downloads/libarchive-$portVersion.tar.gz" -CHECKSUM_SHA256="9015d109ec00bb9ae1a384b172bf2fc1dff41e2c66e5a9eeddf933af9db37f5a" -PATCHES="1481.patch" #from upstream +CHECKSUM_SHA256="5d24e40819768f74daf846b99837fc53a3a9dcdf3ce1c2003fe0596db850f0f0" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" @@ -38,12 +38,16 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then commandBinDir=$prefix/bin fi +libVersion="13.7.1" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + PROVIDES=" libarchive$secondaryArchSuffix = $portVersion compat >= 3.0 cmd:bsdcat$commandSuffix = $portVersion compat >= 3.0 cmd:bsdcpio$commandSuffix = $portVersion compat >= 3.0 cmd:bsdtar$commandSuffix = $portVersion compat >= 3.0 - lib:libarchive$secondaryArchSuffix = 13.5.1 compat >= 13 + cmd:bsdunzip$commandSuffix = $portVersion compat >= 3.0 + lib:libarchive$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -57,10 +61,10 @@ REQUIRES=" PROVIDES_devel=" libarchive${secondaryArchSuffix}_devel = $portVersion compat >= 3.0 - devel:libarchive$secondaryArchSuffix = 13.5.1 compat >= 13 + devel:libarchive$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" - libarchive$secondaryArchSuffix == $portVersion + libarchive$secondaryArchSuffix == $portVersion base " BUILD_REQUIRES=" @@ -77,7 +81,7 @@ BUILD_PREREQUIRES=" cmd:autoconf cmd:automake cmd:gcc$secondaryArchSuffix - cmd:libtoolize + cmd:libtoolize$secondaryArchSuffix cmd:make cmd:pkg_config$secondaryArchSuffix cmd:xml2_config$secondaryArchSuffix @@ -101,7 +105,10 @@ INSTALL() prepareInstalledDevelLib libarchive fixPkgconfig - packageEntries devel $developDir $manDir/man3 + + packageEntries devel \ + $developDir \ + $manDir/man3 } TEST() diff --git a/app-arch/libarchive/patches/1481.patch b/app-arch/libarchive/patches/1481.patch deleted file mode 100644 index 9b9055186..000000000 --- a/app-arch/libarchive/patches/1481.patch +++ /dev/null @@ -1,47 +0,0 @@ -From b4c5bf51436d876631e12ed8533e86405f8581d7 Mon Sep 17 00:00:00 2001 -From: Alexandre Janniaux -Date: Mon, 11 Jan 2021 12:31:53 +0100 -Subject: [PATCH 1/2] configure.ac: add AC_PROG_CPP - -Otherwise, the preprocessor is not detected and it leads to failure with -empty $CPP variable being used on la_TYPE_UID_T, leading to a cascade of -detection errors and redefinition of some types. ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index 3b4602f5e..d51fa19cc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -107,6 +107,7 @@ AC_SUBST(PLATFORMCPPFLAGS) - AC_PROG_CC - AC_PROG_CC_C99 - AM_PROG_CC_C_O -+AC_PROG_CPP - AC_USE_SYSTEM_EXTENSIONS - AC_LIBTOOL_WIN32_DLL - AC_PROG_LIBTOOL - -From 057c8b91a8d91008b85a9cbd5553c4b03dfcb8c0 Mon Sep 17 00:00:00 2001 -From: Alexandre Janniaux -Date: Mon, 11 Jan 2021 12:34:30 +0100 -Subject: [PATCH 2/2] configure.ac: remove trailing characters - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index d51fa19cc..dd10e7e4d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -381,7 +381,7 @@ if test "x$with_iconv" != "xno"; then - AC_CHECK_FUNCS([locale_charset]) - LIBS="${am_save_LIBS}" - if test "x$ac_cv_func_locale_charset" != "xyes"; then -- # If locale_charset() is not in libiconv, we have to find libcharset. -+ # If locale_charset() is not in libiconv, we have to find libcharset. - AC_CHECK_LIB(charset,locale_charset) - fi - fi