From ac9ab783ffe93c37dcdef4d8603352e586b5ce14 Mon Sep 17 00:00:00 2001
From: xtraeme <xtraeme>
Date: Mon, 1 May 2006 09:02:38 +0000
Subject: Update to 1.2.53:

* Incorporated Jaakko Heinonen's still-experimental support for extended
  attributes (Currently Linux-only.).
* Reorganized distribution package: There is now one tar.gz file that
  builds both libarchive and bsdtar.
* correctly read cpio device entries, write Pax attribute entry names.
* Experimental 'tp' format support in libarchive. Feedback appreciated;
  this is not enabled by archive_read_support_format_all()
---
 archivers/libarchive/Makefile         |  4 +--
 archivers/libarchive/PLIST            |  3 +--
 archivers/libarchive/distinfo         | 11 ++++----
 archivers/libarchive/patches/patch-aa |  6 ++---
 archivers/libarchive/patches/patch-ab | 51 +++++++++++++++++++++++++++++++++++
 5 files changed, 63 insertions(+), 12 deletions(-)
 create mode 100644 archivers/libarchive/patches/patch-ab

(limited to 'archivers/libarchive')

diff --git a/archivers/libarchive/Makefile b/archivers/libarchive/Makefile
index f98b7810346..91667989cc0 100644
--- a/archivers/libarchive/Makefile
+++ b/archivers/libarchive/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2006/03/04 21:28:53 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/05/01 09:02:38 xtraeme Exp $
 #
 
-DISTNAME=	libarchive-1.02.036
+DISTNAME=	libarchive-1.2.53
 CATEGORIES=	archivers
 MASTER_SITES=	http://people.freebsd.org/~kientzle/libarchive/src/
 
diff --git a/archivers/libarchive/PLIST b/archivers/libarchive/PLIST
index 0d21afe5c57..a5a52d6460f 100644
--- a/archivers/libarchive/PLIST
+++ b/archivers/libarchive/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2005/10/13 21:34:16 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/05/01 09:02:38 xtraeme Exp $
 include/archive.h
 include/archive_entry.h
 lib/libarchive.la
@@ -8,4 +8,3 @@ man/man3/archive_util.3
 man/man3/archive_write.3
 man/man3/libarchive.3
 man/man5/libarchive-formats.5
-man/man5/tar.5
diff --git a/archivers/libarchive/distinfo b/archivers/libarchive/distinfo
index a0d68ace8b6..18755f41c3e 100644
--- a/archivers/libarchive/distinfo
+++ b/archivers/libarchive/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.9 2005/10/31 14:36:08 tv Exp $
+$NetBSD: distinfo,v 1.10 2006/05/01 09:02:38 xtraeme Exp $
 
-SHA1 (libarchive-1.02.036.tar.gz) = 419ae3956732a54242db52336d7a989d61a01de6
-RMD160 (libarchive-1.02.036.tar.gz) = f89201b412421051cc392f620189e84451e46455
-Size (libarchive-1.02.036.tar.gz) = 418581 bytes
-SHA1 (patch-aa) = 8ce5cce439a541a8e8986a3012a23fd902bae3bc
+SHA1 (libarchive-1.2.53.tar.gz) = 24c960b57ac7502944c95daedf265a333ee347af
+RMD160 (libarchive-1.2.53.tar.gz) = 651d5b93d36b2a2c3f3cb781669e368e83a73964
+Size (libarchive-1.2.53.tar.gz) = 522540 bytes
+SHA1 (patch-aa) = 4bb8b211b8088be1ccaf5963dc01f48b55714668
+SHA1 (patch-ab) = 3fc681863e142ee2a150dd992c9209708c508937
diff --git a/archivers/libarchive/patches/patch-aa b/archivers/libarchive/patches/patch-aa
index d183839258c..ba7408fa28b 100644
--- a/archivers/libarchive/patches/patch-aa
+++ b/archivers/libarchive/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2005/10/31 14:36:08 tv Exp $
+$NetBSD: patch-aa,v 1.5 2006/05/01 09:02:38 xtraeme Exp $
 
---- archive.h.in.orig	2005-10-13 01:35:04.000000000 -0400
-+++ archive.h.in
+--- libarchive/archive.h.in.orig	2005-10-13 01:35:04.000000000 -0400
++++ libarchive/archive.h.in
 @@ -36,7 +36,10 @@
   */
  
diff --git a/archivers/libarchive/patches/patch-ab b/archivers/libarchive/patches/patch-ab
new file mode 100644
index 00000000000..15e0aa96d60
--- /dev/null
+++ b/archivers/libarchive/patches/patch-ab
@@ -0,0 +1,51 @@
+$NetBSD: patch-ab,v 1.1 2006/05/01 09:02:38 xtraeme Exp $
+
+Don't install bsdtar, just libarchive.
+
+--- Makefile.in.orig	2006-03-23 18:05:56.000000000 +0100
++++ Makefile.in	2006-05-01 10:59:03.000000000 +0200
+@@ -39,7 +39,7 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-bin_PROGRAMS = bsdtar$(EXEEXT)
++bin_PROGRAMS =
+ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
+ 	$(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ 	$(srcdir)/config.h.in $(top_srcdir)/configure \
+@@ -158,8 +158,8 @@
+ YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
+ LTYACCCOMPILE = $(LIBTOOL) --mode=compile $(YACC) $(YFLAGS) \
+ 	$(AM_YFLAGS)
+-SOURCES = $(libarchive_la_SOURCES) $(bsdtar_SOURCES)
+-DIST_SOURCES = $(libarchive_la_SOURCES) $(bsdtar_SOURCES)
++SOURCES = $(libarchive_la_SOURCES)
++DIST_SOURCES = $(libarchive_la_SOURCES)
+ man1dir = $(mandir)/man1
+ man3dir = $(mandir)/man3
+ man5dir = $(mandir)/man5
+@@ -284,12 +284,10 @@
+ target_alias = @target_alias@
+ AUTOMAKE_OPTIONS = foreign subdir-objects
+ EXTRA_DIST = version config.h.in			\
+-	minitar					\
+-	libarchive/test				\
+-	tar/test tar/getdate.c tar/getdate.h
++	libarchive/test	
+ 
+ lib_LTLIBRARIES = libarchive.la
+-dist_man_MANS = $(libarchive_dist_man_MANS) $(bsdtar_dist_man_MANS)
++dist_man_MANS = $(libarchive_dist_man_MANS)
+ 
+ #
+ # Libarchive headers, source, etc.
+@@ -348,8 +346,7 @@
+ 	libarchive/archive_util.3				\
+ 	libarchive/archive_write.3				\
+ 	libarchive/libarchive.3					\
+-	libarchive/libarchive-formats.5				\
+-	libarchive/tar.5
++	libarchive/libarchive-formats.5
+ 
+ 
+ #
-- 
cgit v1.2.3