From 3853354d276359e6c2c836dc539eda4a6a7a8d97 Mon Sep 17 00:00:00 2001 From: naddy Date: Mon, 29 Oct 2007 19:28:29 +0000 Subject: [PATCH] Import libarchive 2.3.4. Libarchive is a programming library that can create and read several different streaming archive formats, including most popular tar variants and several cpio formats. bsdtar is an almost fully GNU tar-compatible frontend for libarchive. It is one of the fastest tar implementations and supports many advanced features not found elsewhere. --- archivers/libarchive/Makefile | 59 +++++++++++++++++++ archivers/libarchive/distinfo | 10 ++++ .../patches/patch-libarchive_test_main_c | 14 +++++ .../libarchive/patches/patch-tar_bsdtar_1 | 12 ++++ archivers/libarchive/pkg/DESCR | 8 +++ archivers/libarchive/pkg/PFRAG.shared | 2 + archivers/libarchive/pkg/PLIST | 31 ++++++++++ 7 files changed, 136 insertions(+) create mode 100644 archivers/libarchive/Makefile create mode 100644 archivers/libarchive/distinfo create mode 100644 archivers/libarchive/patches/patch-libarchive_test_main_c create mode 100644 archivers/libarchive/patches/patch-tar_bsdtar_1 create mode 100644 archivers/libarchive/pkg/DESCR create mode 100644 archivers/libarchive/pkg/PFRAG.shared create mode 100644 archivers/libarchive/pkg/PLIST diff --git a/archivers/libarchive/Makefile b/archivers/libarchive/Makefile new file mode 100644 index 00000000000..5432b26034f --- /dev/null +++ b/archivers/libarchive/Makefile @@ -0,0 +1,59 @@ +# $OpenBSD: Makefile,v 1.1.1.1 2007/10/29 19:28:29 naddy Exp $ + +COMMENT= library for reading and writing streaming archives + +V= 2.3.4 +DISTNAME= libarchive-$V +SHARED_LIBS += archive 0.0 # .5.4 +CATEGORIES= archivers +HOMEPAGE= http://people.freebsd.org/~kientzle/libarchive/ + +MAINTAINER= Christian Weisgerber + +# BSD +PERMIT_PACKAGE_CDROM= Yes +PERMIT_PACKAGE_FTP= Yes +PERMIT_DISTFILES_CDROM= Yes +PERMIT_DISTFILES_FTP= Yes + +MASTER_SITES= ${HOMEPAGE}src/ +MASTER_SITES0= http://shell.uugrn.org/~naddy/ +DISTFILES= libarchive-$V.tar.gz \ + libarchive-catpages-$V.tar.gz:0 + +WANTLIB= c z +LIB_DEPENDS= bz2.>=10::archivers/bzip2 + +USE_LIBTOOL= Yes +CONFIGURE_STYLE=gnu +CONFIGURE_ARGS= ${CONFIGURE_SHARED} +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" +MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/config.aux + +MAN_fragment= \ + MAN=`(printf 'mans:\n\t@echo $$(man_MANS)\n'; cat Makefile) | \ + make -f - mans` + +post-install: + @cd ${WRKSRC}; \ + ${MAN_fragment}; \ + for m in $$MAN; do \ + ${INSTALL_MAN} $${m%.[1-9]}.0 \ + ${PREFIX}/man/cat$${m#$${m%[1-9]}}/; \ + done + +# convenience target for maintainer +FREEBSDHOST= shell.uugrn.org +update-catpages: + @cd ${WRKSRC}; \ + ${MAN_fragment}; \ + for m in $$MAN; do \ + echo "Formatting $$m ..."; \ + ssh ${FREEBSDHOST} nroff -mdoc <$$m >$${m%.[1-9]}.0 ; \ + CAT="$$CAT $${m%.[1-9]}.0" ; \ + done; \ + pax -w -s ',^,${DISTNAME}/,' $$CAT | \ + gzip >${FULLDISTDIR}/libarchive-catpages-$V.tar.gz + +.include diff --git a/archivers/libarchive/distinfo b/archivers/libarchive/distinfo new file mode 100644 index 00000000000..69255d19b8f --- /dev/null +++ b/archivers/libarchive/distinfo @@ -0,0 +1,10 @@ +MD5 (libarchive-2.3.4.tar.gz) = IhOPpTXo1HwexajfiBQkDQ== +MD5 (libarchive-catpages-2.3.4.tar.gz) = /+UhNP4GbuHkBr5jqPgGJA== +RMD160 (libarchive-2.3.4.tar.gz) = 6j1+0YIh7Lacp5TBD14tkVWL7Uo= +RMD160 (libarchive-catpages-2.3.4.tar.gz) = 0a58/5JFUpAQIMXPZaAbnqKMRkw= +SHA1 (libarchive-2.3.4.tar.gz) = meWneRHpMxYtGaC2m+NXuIJOiLs= +SHA1 (libarchive-catpages-2.3.4.tar.gz) = I/1K1kFygxvKxdLHux3dzPQ67QE= +SHA256 (libarchive-2.3.4.tar.gz) = GVbjhPIJcDGwoXl8HIFyRYJw+xO5lE7m+csPS3HKHAc= +SHA256 (libarchive-catpages-2.3.4.tar.gz) = 13usbHPxfWHCXeHDEbO+4Yq+WJ3NI7MsPBggd3Rcb5Y= +SIZE (libarchive-2.3.4.tar.gz) = 682180 +SIZE (libarchive-catpages-2.3.4.tar.gz) = 48536 diff --git a/archivers/libarchive/patches/patch-libarchive_test_main_c b/archivers/libarchive/patches/patch-libarchive_test_main_c new file mode 100644 index 00000000000..be78d27b3f2 --- /dev/null +++ b/archivers/libarchive/patches/patch-libarchive_test_main_c @@ -0,0 +1,14 @@ +$OpenBSD: patch-libarchive_test_main_c,v 1.1.1.1 2007/10/29 19:28:29 naddy Exp $ +--- libarchive/test/main.c.orig Wed Oct 24 18:25:33 2007 ++++ libarchive/test/main.c Wed Oct 24 18:25:48 2007 +@@ -285,8 +285,8 @@ test_assert_equal_wstring(const char *file, int line, + return; + fprintf(stderr, "%s:%d: Assertion failed: Unicode strings not equal\n", + file, line); +- fwprintf(stderr, L" %s = \"%ls\"\n", e1, v1); +- fwprintf(stderr, L" %s = \"%ls\"\n", e2, v2); ++/* fwprintf(stderr, L" %s = \"%ls\"\n", e1, v1); ++ fwprintf(stderr, L" %s = \"%ls\"\n", e2, v2); */ + test_failed(a); + } + diff --git a/archivers/libarchive/patches/patch-tar_bsdtar_1 b/archivers/libarchive/patches/patch-tar_bsdtar_1 new file mode 100644 index 00000000000..a3baf9707e0 --- /dev/null +++ b/archivers/libarchive/patches/patch-tar_bsdtar_1 @@ -0,0 +1,12 @@ +$OpenBSD: patch-tar_bsdtar_1,v 1.1.1.1 2007/10/29 19:28:29 naddy Exp $ +--- tar/bsdtar.1.orig Thu Oct 25 11:44:48 2007 ++++ tar/bsdtar.1 Thu Oct 25 11:47:32 2007 +@@ -28,7 +28,7 @@ + .Dt BSDTAR 1 + .Os + .Sh NAME +-.Nm tar ++.Nm bsdtar + .Nd manipulate tape archives + .Sh SYNOPSIS + .Nm diff --git a/archivers/libarchive/pkg/DESCR b/archivers/libarchive/pkg/DESCR new file mode 100644 index 00000000000..a49264c0f09 --- /dev/null +++ b/archivers/libarchive/pkg/DESCR @@ -0,0 +1,8 @@ +Libarchive is a programming library that can create and read several +different streaming archive formats, including most popular tar variants +and several cpio formats. + +bsdtar is an almost fully GNU tar-compatible frontend for libarchive. +It is one of the fastest tar implementations and supports many advanced +features not found elsewhere. + diff --git a/archivers/libarchive/pkg/PFRAG.shared b/archivers/libarchive/pkg/PFRAG.shared new file mode 100644 index 00000000000..954a93de50e --- /dev/null +++ b/archivers/libarchive/pkg/PFRAG.shared @@ -0,0 +1,2 @@ +@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2007/10/29 19:28:29 naddy Exp $ +@lib lib/libarchive.so.${LIBarchive_VERSION} diff --git a/archivers/libarchive/pkg/PLIST b/archivers/libarchive/pkg/PLIST new file mode 100644 index 00000000000..03626cbdd6f --- /dev/null +++ b/archivers/libarchive/pkg/PLIST @@ -0,0 +1,31 @@ +@comment $OpenBSD: PLIST,v 1.1.1.1 2007/10/29 19:28:29 naddy Exp $ +%%SHARED%% +bin/bsdtar +include/archive.h +include/archive_entry.h +lib/libarchive.a +lib/libarchive.la +@man man/cat1/bsdtar.0 +@man man/cat3/archive_entry.0 +@man man/cat3/archive_read.0 +@man man/cat3/archive_util.0 +@man man/cat3/archive_write.0 +@man man/cat3/archive_write_disk.0 +@man man/cat3/libarchive.0 +@man man/cat3/libarchive_internals.0 +@man man/cat5/cpio.0 +@man man/cat5/libarchive-formats.0 +@man man/cat5/mtree.0 +@man man/cat5/tar.0 +@comment @man man/man1/bsdtar.1 +@comment @man man/man3/archive_entry.3 +@comment @man man/man3/archive_read.3 +@comment @man man/man3/archive_util.3 +@comment @man man/man3/archive_write.3 +@comment @man man/man3/archive_write_disk.3 +@comment @man man/man3/libarchive.3 +@comment @man man/man3/libarchive_internals.3 +@comment @man man/man5/cpio.5 +@comment @man man/man5/libarchive-formats.5 +@comment @man man/man5/mtree.5 +@comment @man man/man5/tar.5