diff options
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/libarchive/Makefile | 4 | ||||
| -rw-r--r-- | archivers/libarchive/PLIST | 3 | ||||
| -rw-r--r-- | archivers/libarchive/distinfo | 11 | ||||
| -rw-r--r-- | archivers/libarchive/patches/patch-aa | 15 | ||||
| -rw-r--r-- | archivers/libarchive/patches/patch-ab | 35 |
5 files changed, 13 insertions, 55 deletions
diff --git a/archivers/libarchive/Makefile b/archivers/libarchive/Makefile index 2b0ccb933f8..9cc86aa45b7 100644 --- a/archivers/libarchive/Makefile +++ b/archivers/libarchive/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2006/08/19 20:46:54 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2006/08/20 14:56:03 joerg Exp $ # -DISTNAME= libarchive-1.2.55 +DISTNAME= libarchive-1.2.57 CATEGORIES= archivers MASTER_SITES= http://people.freebsd.org/~kientzle/libarchive/src/ diff --git a/archivers/libarchive/PLIST b/archivers/libarchive/PLIST index a5a52d6460f..f4d6cdfe482 100644 --- a/archivers/libarchive/PLIST +++ b/archivers/libarchive/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2006/05/01 09:02:38 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.4 2006/08/20 14:56:03 joerg Exp $ include/archive.h include/archive_entry.h lib/libarchive.la @@ -8,3 +8,4 @@ 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 89242dafb78..7af318f5498 100644 --- a/archivers/libarchive/distinfo +++ b/archivers/libarchive/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.11 2006/08/19 20:46:54 joerg Exp $ +$NetBSD: distinfo,v 1.12 2006/08/20 14:56:03 joerg Exp $ -SHA1 (libarchive-1.2.55.tar.gz) = 2a1805c451ef286b64eb3de789fe360339309dcc -RMD160 (libarchive-1.2.55.tar.gz) = a735788a5a6d53ae0dcd0f561ea4e2f3e3fcb339 -Size (libarchive-1.2.55.tar.gz) = 534310 bytes -SHA1 (patch-aa) = 87364be23d093c6b584bcd805d4aed4d20f5374a -SHA1 (patch-ab) = c7606619dc22ddbc405817f4216b9a758c96d602 +SHA1 (libarchive-1.2.57.tar.gz) = 70bf5a0a6a8af4cefda412db5a2ba53724e9e3e8 +RMD160 (libarchive-1.2.57.tar.gz) = 238a44ec554aa4fc5ae795c1af3640d253f36445 +Size (libarchive-1.2.57.tar.gz) = 536128 bytes +SHA1 (patch-ab) = 5e92405b0898123d8240f332475d13abe85f8ad3 diff --git a/archivers/libarchive/patches/patch-aa b/archivers/libarchive/patches/patch-aa deleted file mode 100644 index 1515a1dbfd3..00000000000 --- a/archivers/libarchive/patches/patch-aa +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-aa,v 1.6 2006/08/19 20:46:54 joerg Exp $ - ---- libarchive/archive.h.in.orig 2006-08-18 06:31:37.000000000 +0200 -+++ libarchive/archive.h.in -@@ -36,7 +36,10 @@ - */ - - #include <sys/types.h> /* Linux requires this for off_t */ -+#if HAVE_INTTYPES_H - #include <inttypes.h> /* For int64_t */ -+#endif -+#include <stdlib.h> /* For [u]intptr_t on Interix */ - #include <stdio.h> /* For FILE * */ - #include <unistd.h> /* For ssize_t and size_t */ - diff --git a/archivers/libarchive/patches/patch-ab b/archivers/libarchive/patches/patch-ab index db4b0dc8bb4..2cc31368368 100644 --- a/archivers/libarchive/patches/patch-ab +++ b/archivers/libarchive/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.2 2006/08/19 20:46:54 joerg Exp $ +$NetBSD: patch-ab,v 1.3 2006/08/20 14:56:03 joerg Exp $ ---- Makefile.in.orig 2006-08-19 20:35:16.000000000 +0200 +--- Makefile.in.orig 2006-08-20 02:33:45.000000000 +0200 +++ Makefile.in @@ -38,7 +38,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : @@ -11,25 +11,8 @@ $NetBSD: patch-ab,v 1.2 2006/08/19 20:46:54 joerg Exp $ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \ $(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/config.h.in $(top_srcdir)/configure \ -@@ -130,8 +130,8 @@ LINK = $(LIBTOOL) --tag=CC --mode=link $ - 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 -@@ -258,12 +258,10 @@ sysconfdir = @sysconfdir@ - 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 +@@ -264,7 +264,7 @@ EXTRA_DIST = version config.h.in \ + tar/test tar/getdate.c tar/getdate.h lib_LTLIBRARIES = libarchive.la -dist_man_MANS = $(libarchive_dist_man_MANS) $(bsdtar_dist_man_MANS) @@ -37,13 +20,3 @@ $NetBSD: patch-ab,v 1.2 2006/08/19 20:46:54 joerg Exp $ # # Libarchive headers, source, etc. -@@ -326,8 +324,7 @@ libarchive_dist_man_MANS = \ - libarchive/archive_util.3 \ - libarchive/archive_write.3 \ - libarchive/libarchive.3 \ -- libarchive/libarchive-formats.5 \ -- libarchive/tar.5 -+ libarchive/libarchive-formats.5 - - - # |