update to 3.1.2; with jasper@

This commit is contained in:
naddy 2015-04-04 11:05:19 +00:00
parent 3b255997b4
commit 074951595a
4 changed files with 45 additions and 17 deletions

View File

@ -1,23 +1,23 @@
# $OpenBSD: Makefile,v 1.25 2013/04/04 16:03:55 brad Exp $
# $OpenBSD: Makefile,v 1.26 2015/04/04 11:05:19 naddy Exp $
COMMENT= multi-format archive and compression library
DISTNAME= libarchive-3.0.4
REVISION= 0
SHARED_LIBS= archive 8.0 # .12.4
DISTNAME= libarchive-3.1.2
SHARED_LIBS= archive 8.1 # 14.2
CATEGORIES= archivers
HOMEPAGE= http://libarchive.github.com/
HOMEPAGE= http://www.libarchive.org/
MAINTAINER= Christian Weisgerber <naddy@openbsd.org>
# BSD
PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= https://github.com/downloads/libarchive/libarchive/
MASTER_SITES= http://www.libarchive.org/downloads/
MODULES= converters/libiconv
WANTLIB= bz2 c expat lzma z
WANTLIB= bz2 c expat lzma lzo2 pthread z
LIB_DEPENDS= archivers/bzip2 \
archivers/lzo2 \
archivers/xz
SEPARATE_BUILD= Yes
@ -30,7 +30,18 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/build/autoconf
# Regression tests:
# libarchive/test_entry fails due to lacking locale/widechar support
# Regression tests known to fail due to locale issues
# (see /tmp/libarchive_test.* for detailed logs):
#
# test_gnutar_filename_encoding
# test_pax_filename_encoding
# test_read_format_cpio_filename
# test_read_format_gtar_filename
# test_read_format_rar_unicode_CP932
# test_read_format_tar_filename
# test_read_format_ustar_filename
# test_read_format_zip_filename
# test_ustar_filename_encoding
# test_zip_filename_encoding
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (libarchive-3.0.4.tar.gz) = dujXx7EA7EBx5IwbfT8+odIrOds+RbcYn3W1/035D6w=
SIZE (libarchive-3.0.4.tar.gz) = 3632806
SHA256 (libarchive-3.1.2.tar.gz) = 64fqzY/kno2QyP3BiYEwI8zDGcXnUrAftq0Mx7LFPV4=
SIZE (libarchive-3.1.2.tar.gz) = 4527540

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-tar_bsdtar_1,v 1.8 2012/04/01 10:50:47 naddy Exp $
--- tar/bsdtar.1.orig Sat Mar 31 21:50:32 2012
+++ tar/bsdtar.1 Sat Mar 31 21:51:27 2012
$OpenBSD: patch-tar_bsdtar_1,v 1.9 2015/04/04 11:05:19 naddy Exp $
--- tar/bsdtar.1.orig Mon Jan 14 02:43:45 2013
+++ tar/bsdtar.1 Sat Mar 23 00:24:09 2013
@@ -28,7 +28,7 @@
.Dt TAR 1
.Os
@ -10,7 +10,7 @@ $OpenBSD: patch-tar_bsdtar_1,v 1.8 2012/04/01 10:50:47 naddy Exp $
.Nd manipulate tape archives
.Sh SYNOPSIS
.Nm
@@ -194,11 +194,8 @@ The filename can be
@@ -214,11 +214,8 @@ The filename can be
for standard input or standard output.
The default varies by system;
on

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.9 2013/04/04 16:03:55 brad Exp $
@comment $OpenBSD: PLIST,v 1.10 2015/04/04 11:05:19 naddy Exp $
@bin bin/bsdcpio
@bin bin/bsdtar
include/archive.h
@ -6,7 +6,6 @@ include/archive_entry.h
lib/libarchive.a
lib/libarchive.la
@lib lib/libarchive.so.${LIBarchive_VERSION}
lib/pkgconfig/
lib/pkgconfig/libarchive.pc
@man man/man1/bsdcpio.1
@man man/man1/bsdtar.1
@ -18,13 +17,31 @@ lib/pkgconfig/libarchive.pc
@man man/man3/archive_entry_stat.3
@man man/man3/archive_entry_time.3
@man man/man3/archive_read.3
@man man/man3/archive_read_data.3
@man man/man3/archive_read_disk.3
@man man/man3/archive_read_extract.3
@man man/man3/archive_read_filter.3
@man man/man3/archive_read_format.3
@man man/man3/archive_read_free.3
@man man/man3/archive_read_header.3
@man man/man3/archive_read_new.3
@man man/man3/archive_read_open.3
@man man/man3/archive_read_set_options.3
@man man/man3/archive_util.3
@man man/man3/archive_write.3
@man man/man3/archive_write_blocksize.3
@man man/man3/archive_write_data.3
@man man/man3/archive_write_disk.3
@man man/man3/archive_write_filter.3
@man man/man3/archive_write_finish_entry.3
@man man/man3/archive_write_format.3
@man man/man3/archive_write_free.3
@man man/man3/archive_write_header.3
@man man/man3/archive_write_new.3
@man man/man3/archive_write_open.3
@man man/man3/archive_write_set_options.3
@man man/man3/libarchive.3
@man man/man3/libarchive_changes.3
@man man/man3/libarchive_internals.3
@man man/man5/cpio.5
@man man/man5/libarchive-formats.5