update to 2.8.3

archivers/libarchive/Makefile

@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2010/04/04 15:02:05 naddy Exp $
+# $OpenBSD: Makefile,v 1.13 2010/04/05 11:36:55 naddy Exp $
 
 COMMENT=	library for reading and writing streaming archives
 
-DISTNAME=	libarchive-2.7.1
+DISTNAME=	libarchive-2.8.3
-PKGNAME=	${DISTNAME}p0
+SHARED_LIBS=	archive		6.0	# .10.3
-SHARED_LIBS +=  archive              5.0      # .9.1
 CATEGORIES=	archivers
 HOMEPAGE=	http://code.google.com/p/libarchive/
 
@@ -18,16 +17,20 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	http://libarchive.googlecode.com/files/
 
-WANTLIB=	c crypto z
+WANTLIB=	c expat z
 LIB_DEPENDS=	bz2.>=10::archivers/bzip2 \
 		lzma.>=0::archivers/xz
 
 USE_LIBTOOL=	Yes
 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
+CONFIGURE_ARGS=	${CONFIGURE_SHARED}
-		--without-lzmadec	# old LZMA utils
+CONFIGURE_ARGS+=--without-lzmadec	# old LZMA utils
+CONFIGURE_ARGS+=--without-xml2		# expat suffices
 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
+
 .include <bsd.port.mk>

archivers/libarchive/distinfo

@@ -1,5 +1,5 @@
-MD5 (libarchive-2.7.1.tar.gz) = 9DOCQTtEV9DhkncbEApm5w==
+MD5 (libarchive-2.8.3.tar.gz) = /o2RfhAdSzdYASQDCEKh0A==
-RMD160 (libarchive-2.7.1.tar.gz) = egtXR1aUUvAV6U5Ur6kMqF39fMo=
+RMD160 (libarchive-2.8.3.tar.gz) = fHeofN/AlkF/Zxgr/HQUHqthrqQ=
-SHA1 (libarchive-2.7.1.tar.gz) = OBDe0JstJI6rl1TQCPDPFE8nhI0=
+SHA1 (libarchive-2.8.3.tar.gz) = 4GNKMmzOK0bI3GN96E11ViV+WeA=
-SHA256 (libarchive-2.7.1.tar.gz) = p+Bm74V9PbAhHi2RbKFKr8SKR3bE+hCP1nCSzoYqe6g=
+SHA256 (libarchive-2.8.3.tar.gz) = FgldFTNLPI27Atta89QV8SwcO91OtDr3u8Nqt1csC3o=
-SIZE (libarchive-2.7.1.tar.gz) = 1248222
+SIZE (libarchive-2.8.3.tar.gz) = 1438099

archivers/libarchive/patches/patch-Makefile_in

@@ -1,21 +1,10 @@
-$OpenBSD: patch-Makefile_in,v 1.4 2010/04/04 15:02:05 naddy Exp $
+$OpenBSD: patch-Makefile_in,v 1.5 2010/04/05 11:36:55 naddy Exp $
-
-On sparc64 there are some unexplainable format warnings, maybe a gcc bug.
 
 Our groff is too old.  We need to pre-format the man pages with mandoc.
 
---- Makefile.in.orig	Wed Aug  5 07:22:37 2009
+--- Makefile.in.orig	Mon Mar 15 03:46:54 2010
-+++ Makefile.in	Sun Apr  4 00:00:28 2010
++++ Makefile.in	Mon Apr  5 01:13:55 2010
-@@ -788,7 +788,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-bsdtar --enable-b
+@@ -6978,3 +6978,19 @@ cpio/test/list.h: Makefile
- # Especially for early development, we want to be a little
- # aggressive about diagnosing build problems; this can get
- # relaxed somewhat in final shipping versions.
--AM_CFLAGS = -Wall -Werror
-+AM_CFLAGS = -Wall
- 
- #
- # What to include in the distribution
-@@ -6707,3 +6707,19 @@ cpio/test/list.h: Makefile
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:

archivers/libarchive/patches/patch-libarchive_archive_hash_h

@@ -0,0 +1,30 @@
+$OpenBSD: patch-libarchive_archive_hash_h,v 1.1 2010/04/05 11:36:55 naddy Exp $
+--- libarchive/archive_hash.h.orig	Sun Jan 17 01:21:10 2010
++++ libarchive/archive_hash.h	Mon Apr  5 01:21:47 2010
+@@ -118,7 +118,7 @@ typedef SHA256_CTX archive_sha256_ctx;
+ #elif defined(HAVE_SHA2_H) && defined(HAVE_SHA256INIT)
+ #  include <sha2.h>
+ #  define ARCHIVE_HAS_SHA256
+-typedef SHA256_CTX archive_sha256_ctx;
++typedef SHA2_CTX archive_sha256_ctx;
+ #  define archive_sha256_init(ctx)		SHA256Init(ctx)
+ #  define archive_sha256_final(ctx, buf)	SHA256Final(buf, ctx)
+ #  define archive_sha256_update(ctx, buf, n)	SHA256Update(ctx, buf, n)
+@@ -147,7 +147,7 @@ typedef SHA384_CTX archive_sha384_ctx;
+ #elif defined(HAVE_SHA2_H) && defined(HAVE_SHA384INIT)
+ #  include <sha2.h>
+ #  define ARCHIVE_HAS_SHA384
+-typedef SHA384_CTX archive_sha384_ctx;
++typedef SHA2_CTX archive_sha384_ctx;
+ #  define archive_sha384_init(ctx)		SHA384Init(ctx)
+ #  define archive_sha384_final(ctx, buf)	SHA384Final(buf, ctx)
+ #  define archive_sha384_update(ctx, buf, n)	SHA384Update(ctx, buf, n)
+@@ -176,7 +176,7 @@ typedef SHA512_CTX archive_sha512_ctx;
+ #elif defined(HAVE_SHA2_H) && defined(HAVE_SHA512INIT)
+ #  include <sha2.h>
+ #  define ARCHIVE_HAS_SHA512
+-typedef SHA512_CTX archive_sha512_ctx;
++typedef SHA2_CTX archive_sha512_ctx;
+ #  define archive_sha512_init(ctx)		SHA512Init(ctx)
+ #  define archive_sha512_final(ctx, buf)	SHA512Final(buf, ctx)
+ #  define archive_sha512_update(ctx, buf, n)	SHA512Update(ctx, buf, n)

archivers/libarchive/patches/patch-tar_bsdtar_1

@@ -1,6 +1,6 @@
-$OpenBSD: patch-tar_bsdtar_1,v 1.5 2009/04/18 18:22:49 naddy Exp $
+$OpenBSD: patch-tar_bsdtar_1,v 1.6 2010/04/05 11:36:55 naddy Exp $
---- tar/bsdtar.1.orig	Wed Apr  8 09:09:13 2009
+--- tar/bsdtar.1.orig	Sun Jan 17 01:21:04 2010
-+++ tar/bsdtar.1	Sat Apr 18 15:28:07 2009
++++ tar/bsdtar.1	Mon Apr  5 01:13:55 2010
 @@ -28,7 +28,7 @@
  .Dt BSDTAR 1
  .Os
@@ -22,7 +22,7 @@ $OpenBSD: patch-tar_bsdtar_1,v 1.5 2009/04/18 18:22:49 naddy Exp $
  .It Fl H
  (c and r mode only)
  Symbolic links named on the command line will be followed; the
-@@ -533,7 +533,7 @@ for more information.
+@@ -556,7 +556,7 @@ for more information.
  .El
  .Sh FILES
  .Bl -tag -width ".Ev BLOCKSIZE"

archivers/libarchive/pkg/DESCR

@@ -5,4 +5,3 @@ 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/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2009/04/18 18:22:49 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.6 2010/04/05 11:36:55 naddy Exp $
 %%SHARED%%
 @bin bin/bsdcpio
 @bin bin/bsdtar
@@ -6,6 +6,8 @@ include/archive.h
 include/archive_entry.h
 lib/libarchive.a
 lib/libarchive.la
+lib/pkgconfig/
+lib/pkgconfig/libarchive.pc
 @man man/cat1/bsdcpio.0
 @man man/cat1/bsdtar.0
 @man man/cat3/archive_entry.0