Import of pkgsrc-2015Q1

Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2009/05/16 07:21:05 rillig Exp $
+# $NetBSD: Makefile,v 1.86 2014/06/02 10:24:05 wiz Exp $
 #
 # This is the top-level Makefile of pkgsrc. It contains a list of the
 # categories of packages, as well as some targets that operate on the
@@ -32,9 +32,6 @@ USE_TOOLS+=	[ awk cat cmp echo env expr false fgrep grep mv	rm sed	\
 # additional tools used by bsd.pkg.subdir.mk
 USE_TOOLS+=	basename touch
 
-# additional tools used by bsd.bulk-pkg.mk
-USE_TOOLS+=	egrep find ls sh tee true tsort
-
 PKGSRCTOP=	yes
 
 .include "mk/bsd.prefs.mk"

archivers/9e/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/09/11 19:46:52 asau Exp $
+# $NetBSD: Makefile,v 1.11 2014/10/09 14:05:50 wiz Exp $
 
 DISTNAME=	9e
 PKGNAME=	9e-1.0
@@ -9,8 +9,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.eecs.harvard.edu/~wkj/Software/9e/
 COMMENT=	Explode Plan9 archives
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 NO_CONFIGURE=	yes
 
 INSTALLATION_DIRS=	bin

archivers/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.132 2013/10/21 11:30:10 fhajny Exp $
+# $NetBSD: Makefile,v 1.136 2015/01/26 07:49:53 mef Exp $
 #
 
 COMMENT=	Archivers
@@ -31,6 +31,7 @@ SUBDIR+=	gzrecover
 SUBDIR+=	ha
 SUBDIR+=	heirloom-tar
 SUBDIR+=	hpack
+SUBDIR+=	hs-zlib
 SUBDIR+=	jamjar
 SUBDIR+=	lbrate
 SUBDIR+=	lcab
@@ -42,6 +43,7 @@ SUBDIR+=	liblzo
 SUBDIR+=	libunrar
 SUBDIR+=	libzip
 SUBDIR+=	lrzip
+SUBDIR+=	lz4
 SUBDIR+=	lzip
 SUBDIR+=	lziprecover
 SUBDIR+=	lzma
@@ -58,6 +60,7 @@ SUBDIR+=	ocaml-bz2
 SUBDIR+=	ocaml-zip
 SUBDIR+=	p5-Archive-Any
 SUBDIR+=	p5-Archive-Any-Lite
+SUBDIR+=	p5-Archive-Extract
 SUBDIR+=	p5-Archive-Peek
 SUBDIR+=	p5-Archive-Tar
 SUBDIR+=	p5-Archive-Zip
@@ -74,6 +77,7 @@ SUBDIR+=	php-zlib
 SUBDIR+=	pigz
 SUBDIR+=	ppmd
 SUBDIR+=	ppunpack
+SUBDIR+=	py-yuicompressor
 SUBDIR+=	rar
 SUBDIR+=	rox-archive
 SUBDIR+=	ruby-archive-tar-minitar

archivers/advancecomp/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/09/11 19:46:52 asau Exp $
+# $NetBSD: Makefile,v 1.15 2014/10/09 14:05:50 wiz Exp $
 
 DISTNAME=	advancecomp-1.15
 CATEGORIES=	archivers
@@ -8,8 +8,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://advancemame.sourceforge.net/
 COMMENT=	Recompression utilities for .zip, .png, .mng and .gz files
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
 

archivers/afio/Makefile

@@ -1,17 +1,14 @@
-# $NetBSD: Makefile,v 1.13 2013/04/06 03:45:05 rodent Exp $
+# $NetBSD: Makefile,v 1.16 2015/02/15 14:45:48 ryoon Exp $
 
-DISTNAME=	afio-2.5
-PKGREVISION=	2
+DISTNAME=	afio-2.5.1
 CATEGORIES=	archivers
-MASTER_SITES=	http://www.ibiblio.org/pub/Linux/system/backup/
+MASTER_SITES=	http://members.chello.nl/~k.holtman/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://freshmeat.net/projects/afio/
+HOMEPAGE=	http://members.chello.nl/~k.holtman/afio.html
 COMMENT=	Data corruption handling cpio-format archive creator
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 BUILD_TARGET=	afio
 
 .include "../../mk/bsd.prefs.mk"

archivers/afio/distinfo

@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2012/06/23 18:02:15 dholland Exp $
+$NetBSD: distinfo,v 1.8 2015/02/15 14:45:48 ryoon Exp $
 
-SHA1 (afio-2.5.tgz) = 051765f209fded60f94944da8a76ae37c3423a23
-RMD160 (afio-2.5.tgz) = 991bdb794ee8b4b7e6a737afa85009aae925699d
-Size (afio-2.5.tgz) = 179184 bytes
+SHA1 (afio-2.5.1.tgz) = bff6b9a147dc5b0e6bd7f1a76f0b84e4dd9a7dc9
+RMD160 (afio-2.5.1.tgz) = 923981a9e6766781705ceedecd3d86afa5b9abae
+Size (afio-2.5.1.tgz) = 191765 bytes
 SHA1 (patch-aa) = e35b47c2f10a6f80d8446e4c22a7a023dae55933
-SHA1 (patch-ab) = 746c0eaf036cba60fb48e798175e055df6addd77
-SHA1 (patch-ac) = 99378318e898429153352a2d9b47008f419865af
+SHA1 (patch-ab) = a93cf92b80f2b40e30987822b144c24f3a3e5c1e
+SHA1 (patch-ac) = d589b2e37d8a81373f14e4093fe8cc2b30b5489b

archivers/afio/patches/patch-ab

@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.3 2012/06/23 18:02:15 dholland Exp $
+$NetBSD: patch-ab,v 1.4 2015/02/15 14:45:48 ryoon Exp $
 
 - Use NAME_MAX if available rather than relying on MAXNAMLEN.
 - Fix Solaris preprocessor symbols.
 - Fix bad calls to execlp() that break on 64-bit platforms.
 
---- compfile.c.orig	2003-06-24 21:32:20.000000000 +0000
+--- compfile.c.orig	2012-02-05 13:45:01.000000000 +0000
 +++ compfile.c
 @@ -2,6 +2,7 @@
  
@@ -14,25 +14,16 @@ $NetBSD: patch-ab,v 1.3 2012/06/23 18:02:15 dholland Exp $
  #include <unistd.h>
  #include <string.h>
  
-@@ -179,7 +180,7 @@ int setupgzip(char *name)
-       if (open (name, O_RDONLY) >= 0)
-       { 
- 	  if(! compressargs)
--	      execlp (compressprog, compressprog, "-c", farg, 0);
-+	      execlp (compressprog, compressprog, "-c", farg, (char *)NULL);
- 	  else
- 	      execvp (compressprog, compress_arg_list);
-       }
-@@ -210,7 +211,7 @@ void waitforgzip()
+@@ -211,7 +212,7 @@ void waitforgzip()
   * version;
   */
  
--#if ( defined(sun) && defined(__svr4__) )
-+#if ( defined(__sun) && defined(__SVR4) )
+-#if ( defined(sun) && defined(__svr4__) ) || defined(__CYGWIN32__)
++#if ( defined(__sun) && defined(__svr4__) ) || defined(__CYGWIN32__)
  #include <dirent.h>
  #else
  #include <sys/dir.h>
-@@ -283,7 +284,9 @@ compressfile (int *fdp, char *name, reg 
+@@ -284,7 +285,9 @@ compressfile (int *fdp, char *name, reg 
        tmpcomp++;
      else
        tmpcomp = name;

archivers/afio/patches/patch-ac

@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2012/06/23 18:02:15 dholland Exp $
+$NetBSD: patch-ac,v 1.3 2015/02/15 14:45:48 ryoon Exp $
 
 - Use standard headers.
 - Use strerror, not sys_errlist and sys_nerr.
@@ -8,32 +8,18 @@ $NetBSD: patch-ac,v 1.2 2012/06/23 18:02:15 dholland Exp $
 - Build fix for makedev() on Solaris and Interix.
 - Fix bad calls to execlp() that break on 64-bit platforms.
 
---- afio.c.orig	2003-12-20 22:16:13.000000000 +0000
+--- afio.c.orig	2012-02-05 13:25:57.000000000 +0000
 +++ afio.c
-@@ -166,52 +166,40 @@ static char *ident = "$Header: /u/buhrt/
- #include <signal.h>
- #include <strings.h>
- #include <sys/wait.h>
--#define linux_tstamp 1
--/* fix SunOS errno.h not declaring what the manpage says it declares 
--   bogosity. */
-- extern int sys_nerr;
-- extern char *sys_errlist[];
--#endif
--
--#ifdef hpux
-- /* Fix that HPUX dosent have sys_nerr or sys_errlist 
--    Added by Daniel Andersson, daniel.andersson@sto.sema.se
--  */
--extern int sys_nerr;
--extern char *sys_errlist[];
- #endif
+@@ -166,7 +166,7 @@ static char *ident = "$Header: /u/buhrt/
+ #include <stdio.h>
+ #include <errno.h>
  
- #include <unistd.h>
- #include <string.h>
- #include <stdlib.h>
--#include <sys/signal.h>
-+#include <signal.h>
+-#ifdef sun
++#ifdef __sun
+ #include <sys/types.h>
+ #include <utime.h>
+ #include <signal.h>
+@@ -202,30 +202,29 @@ extern char *sys_errlist[];
  #include <sys/types.h>
  #include <sys/ioctl.h>
  #include <sys/stat.h>
@@ -44,7 +30,7 @@ $NetBSD: patch-ac,v 1.2 2012/06/23 18:02:15 dholland Exp $
  #include "patchlevel.h"
  
  #ifdef linux
--
+ 
 -#define linux_tstamp 1
 -
 -#include <utime.h>
@@ -60,9 +46,6 @@ $NetBSD: patch-ac,v 1.2 2012/06/23 18:02:15 dholland Exp $
  #include <strings.h>
  #endif
  
-+/* nothing should need this */
-+/*#define broken_utime*/
-+
  #ifndef	major
 -#ifdef sun
 +#if defined(sun) || defined(__INTERIX)
@@ -73,7 +56,7 @@ $NetBSD: patch-ac,v 1.2 2012/06/23 18:02:15 dholland Exp $
  #else
  #include <sys/sysmacros.h>
  #endif
-@@ -1122,7 +1110,7 @@ savedirstamp (char *name, time_t mtime)
+@@ -1140,7 +1139,7 @@ savedirstamp (char *name, time_t mtime)
  STATIC void
  restoredirstamps (void)
  {
@@ -82,7 +65,7 @@ $NetBSD: patch-ac,v 1.2 2012/06/23 18:02:15 dholland Exp $
    auto struct utimbuf tstamp;
  #else
    auto time_t tstamp[2];
-@@ -1130,7 +1118,7 @@ restoredirstamps (void)
+@@ -1148,7 +1147,7 @@ restoredirstamps (void)
    Dir *DirP_forw;
    while(DirP!=NULL)
    {
@@ -91,7 +74,7 @@ $NetBSD: patch-ac,v 1.2 2012/06/23 18:02:15 dholland Exp $
      tstamp.actime = DirP->d_mtime;
      tstamp.modtime = DirP->d_mtime;
      /* no error code checking on purpose */
-@@ -1212,7 +1200,7 @@ readcheck (av)
+@@ -1239,7 +1238,7 @@ readcheck (av)
    auto char name[PATHSIZE];
    auto char local[PATHSIZE];
    int sel, res;
@@ -100,7 +83,7 @@ $NetBSD: patch-ac,v 1.2 2012/06/23 18:02:15 dholland Exp $
    auto struct utimbuf tstamp;
  #else
    auto time_t tstamp[2];
-@@ -1241,7 +1229,7 @@ readcheck (av)
+@@ -1267,7 +1266,7 @@ readcheck (av)
        if(aflag && atime_sb_valid && ((sb.sb_mode & S_IFMT)==S_IFREG))
        {
  	  /* reset access time, this distroys the ctime btw. */
@@ -109,16 +92,7 @@ $NetBSD: patch-ac,v 1.2 2012/06/23 18:02:15 dholland Exp $
  	  tstamp.actime = atime_sb.sb_atime;
  	  tstamp.modtime = atime_sb.sb_mtime;
  	  VOID utime (name, &tstamp);
-@@ -1585,7 +1573,7 @@ incheckdata (int fd, off_t size, char *n
- 	if(compressargs)
- 	    execvp (compressprog, compress_arg_list);
- 	else
--	    execlp (compressprog, compressprog, "-d", "-c", 0);
-+	    execlp (compressprog, compressprog, "-d", "-c", (char *)NULL);
- 	fprintf (stderr, "Could not uncompress, errno %d\n", errno);
- 	exit(1);
- 	break;
-@@ -1696,7 +1684,7 @@ inentry (name, asb)
+@@ -1758,7 +1757,7 @@ inentry (name, asb)
    reg Link *linkp;
    reg int ifd;
    reg int ofd;
@@ -127,7 +101,7 @@ $NetBSD: patch-ac,v 1.2 2012/06/23 18:02:15 dholland Exp $
    auto struct utimbuf tstamp;
  #else
    auto time_t tstamp[2];
-@@ -1729,7 +1717,7 @@ inentry (name, asb)
+@@ -1794,7 +1793,7 @@ inentry (name, asb)
    /* Cannot set utime on symlink (at least not under Linux) */
    if((asb->sb_mode & S_IFMT) != S_IFLNK)
    {
@@ -136,25 +110,7 @@ $NetBSD: patch-ac,v 1.2 2012/06/23 18:02:15 dholland Exp $
        tstamp.actime = tstamp.modtime = mflag ? timenow : asb->sb_mtime;
        VOID utime (name, &tstamp);
  #else
-@@ -3004,7 +2992,7 @@ opencontrolscript (char *name)
- 	VOID dup (pfd[0]);
- 	VOID close (pfd[0]);
- 	
--        execlp (controlscript, controlscript, label, 0);
-+        execlp (controlscript, controlscript, label, (char *)NULL);
- 
- 	warnarch("Problems running control script:",(off_t)0);	       
- 	warn(controlscript,syserr());
-@@ -3266,7 +3254,7 @@ openotty (name, asb, linkp, ispass, dozf
- 		  if(compressargs)
- 		      execvp (compressprog, compress_arg_list);
- 		  else
--		      execlp (compressprog, compressprog, "-d", "-c", 0);
-+		      execlp (compressprog, compressprog, "-d", "-c", (char *)NULL);
- 		  fprintf (stderr, "Could not uncompress, errno %d\n", errno);
- 		  exit (1);
- 	      }
-@@ -3493,7 +3481,7 @@ out (av)
+@@ -3580,7 +3579,7 @@ out (av)
      auto char name[PATHSIZE];
      auto char fsname[PATHSIZE];
      auto int compression;
@@ -163,7 +119,7 @@ $NetBSD: patch-ac,v 1.2 2012/06/23 18:02:15 dholland Exp $
      auto struct utimbuf tstamp;
  #else
      auto time_t tstamp[2];
-@@ -3638,7 +3626,7 @@ out (av)
+@@ -3750,7 +3749,7 @@ out (av)
  	if(aflag && *fsname && ((sb.sb_mode & S_IFMT)==S_IFREG))
  	{
  	    /* reset access time, this distroys the ctime btw. */
@@ -172,7 +128,7 @@ $NetBSD: patch-ac,v 1.2 2012/06/23 18:02:15 dholland Exp $
  	    tstamp.actime = sb.sb_atime;
  	    tstamp.modtime = sb.sb_mtime;
  	    VOID utime (fsname, &tstamp);
-@@ -4133,7 +4121,7 @@ passitem (from, asb, ifd, dir)
+@@ -4251,7 +4250,7 @@ passitem (from, asb, ifd, dir)
  {
    reg int ofd;
  
@@ -181,7 +137,7 @@ $NetBSD: patch-ac,v 1.2 2012/06/23 18:02:15 dholland Exp $
    auto struct utimbuf tstamp;
  #else
    auto time_t tstamp[2];
-@@ -4149,7 +4137,7 @@ passitem (from, asb, ifd, dir)
+@@ -4267,7 +4266,7 @@ passitem (from, asb, ifd, dir)
  	continue;
        if (ofd > 0)
  	passdata (from, ifd, to, ofd);
@@ -190,21 +146,7 @@ $NetBSD: patch-ac,v 1.2 2012/06/23 18:02:15 dholland Exp $
        tstamp.actime = tstamp.modtime = mflag ? timenow : asb->sb_mtime;
        VOID utime (to, &tstamp);
  #else
-@@ -4354,12 +4342,7 @@ fswrite (fd, buf, len)
- STATIC char *
- syserr ()
- {
--  static char msg[40];
--
--  if (errno > 0 && errno < sys_nerr)
--    return ((char *) sys_errlist[errno]);
--  VOID sprintf (msg, "Unknown error (errno %d)", errno);
--  return (msg);
-+  return strerror(errno);
- }
- 
- /*
-@@ -4765,7 +4748,7 @@ xwait (pid, what, compstat2)
+@@ -4901,7 +4900,7 @@ xwait (pid, what, compstat2)
       char *what;
       int compstat2;
  {
@@ -213,7 +155,7 @@ $NetBSD: patch-ac,v 1.2 2012/06/23 18:02:15 dholland Exp $
    reg Child *cp;
    reg Child **acp;
    auto char why[100];
-@@ -4782,16 +4765,16 @@ xwait (pid, what, compstat2)
+@@ -4918,16 +4917,16 @@ xwait (pid, what, compstat2)
    free ((char *) cp);
    if (status == 0)
      return (0);

archivers/arc/Makefile

@@ -1,16 +1,13 @@
-# $NetBSD: Makefile,v 1.33 2012/09/11 19:46:52 asau Exp $
+# $NetBSD: Makefile,v 1.35 2015/01/04 10:43:44 wiz Exp $
 
-DISTNAME=	arc-5.21o
+DISTNAME=	arc-5.21p
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=arc/}
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://sourceforge.net/projects/arc/
 COMMENT=	Create & extract files from DOS .ARC files
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:

archivers/arc/distinfo

@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2006/05/02 19:06:45 wiz Exp $
+$NetBSD: distinfo,v 1.11 2015/01/04 10:43:44 wiz Exp $
 
-SHA1 (arc-5.21o.tgz) = 4b803eae04976072fae88d4dbfc4b3e45796f8f3
-RMD160 (arc-5.21o.tgz) = 2897f62452f59efcb757cd5447d6d330df0cfdd1
-Size (arc-5.21o.tgz) = 82386 bytes
-SHA1 (patch-aa) = 2222318794a68a913e80cb808e3881a4fdc07fb0
+SHA1 (arc-5.21p.tar.gz) = e68e358b86a67c68e8a1cb95a840f380bfda3684
+RMD160 (arc-5.21p.tar.gz) = c6a97105ab26cf1d2b6ad45d528894628cff0586
+Size (arc-5.21p.tar.gz) = 84791 bytes
+SHA1 (patch-aa) = efbb7e0a3a715d871dc98ad4fad58d0ae49f5b02
 SHA1 (patch-ab) = e85c2698747106a7319db07185bfe0b6e2480974
 SHA1 (patch-ac) = 3332d9db5c41fb205ab9f5123b0de0704ae634b3
-SHA1 (patch-ad) = 3b43c7b64d0e926677dc8d1b20f3afbf0c854a5b
+SHA1 (patch-ad) = b8c7b8a9a0733fb8f4a8963765d3dcd318988afc

archivers/arc/patches/patch-aa

@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.4 2006/05/02 19:06:45 wiz Exp $
+$NetBSD: patch-aa,v 1.5 2015/01/04 10:43:44 wiz Exp $
 
---- Makefile.orig	2005-10-09 03:30:24.000000000 +0200
+--- Makefile.orig	2010-08-07 13:06:42.000000000 +0000
 +++ Makefile
-@@ -41,14 +41,14 @@ SYSTEM = -DSYSV=1
- OPT = -O
+@@ -44,14 +44,14 @@ SYSTEM = -DSYSV=1
+ OPT = -O -Wall
  # For MWC 3.0 on the Atari ST, use:
  #CFLAGS = -VCOMPAC -VPEEP
 -CFLAGS = $(OPT) $(SYSTEM)

archivers/arc/patches/patch-ad

@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2006/05/02 19:06:45 wiz Exp $
+$NetBSD: patch-ad,v 1.3 2015/01/04 10:43:44 wiz Exp $
 
---- marc.c.orig	2005-10-09 03:38:22.000000000 +0200
+--- marc.c.orig	2010-08-07 13:06:42.000000000 +0000
 +++ marc.c
-@@ -48,12 +48,13 @@ char *pinbuf;				/* block input buffer *
+@@ -49,12 +49,13 @@ char *pinbuf;				/* block input buffer *
  static char **lst;		       /* files list */
  static int lnum;		       /* length of files list */
  
@@ -16,4 +16,4 @@ $NetBSD: patch-ad,v 1.2 2006/05/02 19:06:45 wiz Exp $
 -    char *makefnam();
      char *envfind();
  #if	!_MTS
-     char *arctemp2, *mktemp();		/* temp file stuff */
+     char *arctemp2;		       /* temp file stuff */

archivers/arj/Makefile

@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2013/11/04 16:41:43 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2015/02/26 16:05:11 tnn Exp $
 
 DISTNAME=	arj-3.10.22
+PKGREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=arj/}
 
@@ -8,8 +9,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://arj.sourceforge.net/
 COMMENT=	Open-source ARJ archiver
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 MAKE_JOBS_SAFE=		no
 
 USE_TOOLS+=		autoconf gmake
@@ -22,11 +21,6 @@ MAKE_FLAGS+=		INSTALL_DIR=${INSTALL_PROGRAM_DIR:Q}
 INSTALL_UNSTRIPPED=	yes # $LOCALBASE/bin/arj must have symbol table
 ARJ_DOCSDIR=		${PREFIX}/share/doc/arj
 
-.include "../../mk/compiler.mk"
-
-_WRAP_EXTRA_ARGS.CC+=	-g -O0
-BUILDLINK_TRANSFORM+=	rm:-s
-
 pre-configure:
 	${CP} -f ${WRKSRC}/environ.c ${WRKSRC}/environ.c.1
 	${SED} -e 's|@PREFIX@|${PREFIX}|g' < ${WRKSRC}/environ.c.1	\

archivers/arj/distinfo

@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.15 2013/11/04 16:41:43 joerg Exp $
+$NetBSD: distinfo,v 1.16 2014/05/11 20:56:16 rodent Exp $
 
 SHA1 (arj-3.10.22.tar.gz) = e8470f480e9eee14906e5485a8898e5c24738c8b
 RMD160 (arj-3.10.22.tar.gz) = 80f8a1a8cd203f73def8e957d96563a4dba80153
 Size (arj-3.10.22.tar.gz) = 431467 bytes
-SHA1 (patch-aa) = 7dc0000f3d0c0974a40bbea7d9103449cb89b4b9
-SHA1 (patch-ab) = da21aae85f1bf4b9c8cac78d45ad33c44fcd5d3d
+SHA1 (patch-aa) = 02a45f1365121b63020f3714cea142f9571d8f72
+SHA1 (patch-ab) = 062f3dc1eee6f009dfdfa432bb3c138a9c28a829
 SHA1 (patch-ac) = db8a0afa61f49242e9fd601d5fc3167cf75f748b
-SHA1 (patch-ad) = 186b05ec694daa25504123690f9b7bba9f22a7f4
-SHA1 (patch-ae) = 46181177d4a42b510a02ce8e138275dca453f1de
-SHA1 (patch-af) = c4e5a0dc8a2b42af471fd065ab28f162d94bd0b7
-SHA1 (patch-ag) = ce4d0fefed6ccf7ab7fad864a7cb7faa36e4e4ac
-SHA1 (patch-integr.c) = 8c3f9fd4db4d4b1323cceccd6cfa31dc09ab39af
+SHA1 (patch-ad) = 2cf609a6c7cb4e32441a433db3dc9cc04c23ae2a
+SHA1 (patch-ae) = 5bc829e43a4d45354905f061905e2810408847f1
+SHA1 (patch-af) = cbde8eccfa95e934714591974786fe94d7b4f19f
+SHA1 (patch-ag) = 898539d86abd3747b60d9f95a5a797f709f6360d
+SHA1 (patch-exe__sear.c) = 6d8db5a2cdb8f2452b96cf4d09687ae9d45d3e17
+SHA1 (patch-integr.c) = 67ae3fc4149a7b71a185bf45d2a457a109bcef9b

archivers/arj/patches/patch-aa

@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.8 2005/10/07 16:52:06 joerg Exp $
+$NetBSD: patch-aa,v 1.9 2014/05/11 20:56:16 rodent Exp $
+
+Add support for various OSes.
 
 --- environ.c.orig	2004-06-18 16:19:36.000000000 +0000
 +++ environ.c
@@ -7,7 +9,7 @@ $NetBSD: patch-aa,v 1.8 2005/10/07 16:52:06 joerg Exp $
    #include <sys/statfs.h>
    #include <sys/statvfs.h>
 - #elif defined(__FreeBSD__)||defined(__NetBSD__)
-+ #elif defined(__FreeBSD__)||defined(__NetBSD__)||defined(__APPLE__) || defined(__DragonFly__)
++ #elif defined(__FreeBSD__)||defined(__NetBSD__)||defined(__APPLE__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__OpenBSD__)
    #include <sys/param.h>
    #include <sys/mount.h>
 - #elif defined(__QNXNTO__)

archivers/arj/patches/patch-ab

@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.7 2006/03/05 21:40:57 adam Exp $
+$NetBSD: patch-ab,v 1.8 2014/05/11 20:56:16 rodent Exp $
 
---- gnu/configure.in.orig	2005-06-21 20:27:20.000000000 +0200
+--- gnu/configure.in.orig	2005-06-21 18:27:20.000000000 +0000
 +++ gnu/configure.in
 @@ -12,13 +12,23 @@ dnl Installation script (let it be, temp
  AC_PROG_INSTALL([e:/os2apps/autoconf/install-sh])

archivers/arj/patches/patch-ad

@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1 2005/03/22 16:24:13 minskim Exp $
+$NetBSD: patch-ad,v 1.2 2014/05/11 20:56:16 rodent Exp $
 
---- gnu/config.h.in.orig	Sat Apr 17 05:33:38 2004
+--- gnu/config.h.in.orig	2004-04-17 10:33:38.000000000 +0000
 +++ gnu/config.h.in
 @@ -4,6 +4,7 @@
  #undef LIBC

archivers/arj/patches/patch-ae

@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.1 2005/03/22 16:24:13 minskim Exp $
+$NetBSD: patch-ae,v 1.2 2014/05/11 20:56:16 rodent Exp $
 
---- uxspec.c.orig	Sat Apr 17 06:39:42 2004
+--- uxspec.c.orig	2004-04-17 11:39:42.000000000 +0000
 +++ uxspec.c
 @@ -13,6 +13,11 @@
   #include <unistd.h>

archivers/arj/patches/patch-af

@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.2 2009/05/13 14:26:24 hasso Exp $
+$NetBSD: patch-af,v 1.3 2014/05/11 20:56:16 rodent Exp $
 
---- fardata.c.orig	2004-04-17 14:39:42 +0300
-+++ fardata.c	2009-05-03 08:53:46 +0300
+--- fardata.c.orig	2004-04-17 11:39:42.000000000 +0000
++++ fardata.c
 @@ -190,7 +190,7 @@ int msg_sprintf(char *str, FMSG *fmt, ..
  
  /* Length-limited strlen() */

archivers/arj/patches/patch-ag

@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.1 2005/10/07 16:52:06 joerg Exp $
+$NetBSD: patch-ag,v 1.2 2014/05/11 20:56:16 rodent Exp $
 
---- arjdata.c.orig	2005-07-22 13:51:08.000000000 +0000
+--- arjdata.c.orig	2004-04-17 11:44:46.000000000 +0000
 +++ arjdata.c
 @@ -64,6 +64,8 @@ static char *resources[][2]=
    #elif TARGET==UNIX

archivers/arj/patches/patch-exe__sear.c

@@ -0,0 +1,15 @@
+$NetBSD: patch-exe__sear.c,v 1.1 2014/05/11 20:56:16 rodent Exp $
+
+Include elf_abi.h instead of elf.h for OpenBSD.
+
+--- exe_sear.c.orig	2003-10-16 10:32:46.000000000 +0000
++++ exe_sear.c
+@@ -10,6 +10,8 @@
+ #ifdef ELF_EXECUTABLES
+  #ifdef __QNXNTO__
+     #include <libelf.h>
++ #elif defined(__OpenBSD__)
++    #include <elf_abi.h>
+  #else
+     #include <elf.h>
+  #endif /* __QNXNTO__ */

archivers/arj/patches/patch-integr.c

@@ -1,6 +1,6 @@
-$NetBSD: patch-integr.c,v 1.1 2013/11/04 16:41:43 joerg Exp $
+$NetBSD: patch-integr.c,v 1.2 2014/05/11 20:56:16 rodent Exp $
 
---- integr.c.orig	2013-11-04 16:18:17.000000000 +0000
+--- integr.c.orig	2005-06-21 18:27:18.000000000 +0000
 +++ integr.c
 @@ -5,7 +5,7 @@
   *

archivers/ark/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2014/02/12 23:17:32 tron Exp $
+# $NetBSD: Makefile,v 1.31 2015/01/21 09:12:41 obache Exp $
 
 DISTNAME=	ark-${_KDE_VERSION}
 PKGREVISION=	1

archivers/ark/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2013/04/03 10:52:13 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/11/13 20:13:00 markd Exp $
 bin/ark
 lib/kde4/arkpart.so
 lib/kde4/kerfuffle_cli7z.so
@@ -14,6 +14,7 @@ lib/libkerfuffle.so
 lib/libkerfuffle.so.4
 lib/libkerfuffle.so.${PKGVERSION}
 man/man1/ark.1
+share/appdata/ark.appdata.xml
 share/applications/kde4/ark.desktop
 share/doc/kde/HTML/en/ark/ark-mainwindow.png
 share/doc/kde/HTML/en/ark/common

archivers/ark/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2014/02/01 02:20:44 markd Exp $
+$NetBSD: distinfo,v 1.8 2014/11/13 20:13:00 markd Exp $
 
-SHA1 (ark-4.11.5.tar.xz) = 2392d08c3a1d5d92cb1ec668e4e5013154fc0e14
-RMD160 (ark-4.11.5.tar.xz) = 7002d69ec1bf0ea2cb7315bf8cfeefb51a143b05
-Size (ark-4.11.5.tar.xz) = 230492 bytes
+SHA1 (ark-4.14.3.tar.xz) = 5b28719e0134b763ddcc0a67ba7c31f4a416f0e6
+RMD160 (ark-4.14.3.tar.xz) = 12660c88dbc47c5a3ec2a2f4bb7493fb7d94c186
+Size (ark-4.14.3.tar.xz) = 236116 bytes

archivers/bicom/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2012/09/11 19:46:53 asau Exp $
+# $NetBSD: Makefile,v 1.32 2014/10/09 14:05:51 wiz Exp $
 #
 
 DISTNAME=		bicom101
@@ -19,8 +19,6 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 WRKSRC=			${WRKDIR}
 USE_LANGUAGES=		c++
 

archivers/bsdtar/Makefile

@@ -1,21 +1,16 @@
-# $NetBSD: Makefile,v 1.20 2013/06/13 21:36:46 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.22 2015/01/17 12:44:51 adam Exp $
 
-DISTNAME=	bsdtar-2.8.4
-PKGREVISION=	1
-CATEGORIES=	archivers
-MASTER_SITES=	# empty
-DISTFILES=	# empty
+.include "../../archivers/libarchive/Makefile.common"
 
-MAINTAINER=	joerg@NetBSD.org
-HOMEPAGE=	http://code.google.com/p/libarchive/
+PKGNAME=	${DISTNAME:S/libarchive/bsdtar/}
 COMMENT=	Fast multi-format tape archiver
 
-GNU_CONFIGURE=	yes
 # Explicitly do not depend on libtool as this can be used
 # as bootstrap dependency.
-#
 #USE_LIBTOOL=	yes
+CONFIGURE_ARGS+=	--enable-bsdtar=static
+CONFIGURE_ARGS+=	--disable-bsdcpio
+CONFIGURE_ARGS+=	--disable-shared
 
 .include "../../archivers/bzip2/builtin.mk"
 .include "../../devel/zlib/builtin.mk"
@@ -39,11 +34,14 @@ FILESDIR.bzip2?=	${.CURDIR}/../../archivers/bzip2/files
 FILESDIR.libarchive?=	${.CURDIR}/../../archivers/libarchive/files
 FILESDIR.zlib?=		${.CURDIR}/../../devel/zlib/files
 
-CONFIGURE_ARGS+=	--enable-bsdtar=static --disable-cpio \
-			--disable-shared --without-xml2 --without-expat
-
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
+.include "../../mk/bsd.prefs.mk"
+.if ${OS_VARIANT} == "SCOOSR5"
+# SCO OpenServer 5.0.7/3.2 has windows.h, and configure expects it for MS Windows.
+CONFIGURE_ENV+=		ac_cv_header_windows_h=no
+.endif
+
 do-extract:
 .if empty(USE_BUILTIN.bzip2:M[yY][eE][sS])
 	${RUN}${CP} -R ${FILESDIR.bzip2} ${WRKDIR}/bzip2

archivers/bunzip/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2012/09/11 19:46:53 asau Exp $
+# $NetBSD: Makefile,v 1.19 2014/10/09 14:05:51 wiz Exp $
 
 DISTNAME=	bunzip021.c
 PKGNAME=	bunzip-0.21
@@ -10,8 +10,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.muraroa.demon.co.uk/
 COMMENT=	Decompressor for bzip .bz files
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 WRKSRC=		${WRKDIR}
 
 INSTALLATION_DIRS=	bin

archivers/bzip2/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2013/09/20 04:05:13 joerg Exp $
+# $NetBSD: Makefile,v 1.54 2014/10/09 14:05:51 wiz Exp $
 #
 
 DISTNAME=	bzip2-1.0.6
@@ -12,7 +12,6 @@ COMMENT=	Block-sorting file compressor
 
 DISTFILES=	# empty
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
 REPLACE_SH=	bzdiff bzgrep bzmore
 
 MAKE_JOBS_SAFE=		no

archivers/cabextract/Makefile

@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2012/09/11 19:46:53 asau Exp $
+# $NetBSD: Makefile,v 1.27 2015/03/27 16:49:55 bsiegert Exp $
 
-DISTNAME=	cabextract-1.4
+DISTNAME=	cabextract-1.6
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.cabextract.org.uk/
 
@@ -9,8 +9,6 @@ HOMEPAGE=	http://www.cabextract.org.uk/
 COMMENT=	Microsoft cabinet (.CAB) file extractor
 LICENSE=	gnu-gpl-v3
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 

archivers/cabextract/distinfo

@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.13 2011/05/13 04:10:46 adam Exp $
+$NetBSD: distinfo,v 1.15 2015/03/27 16:49:55 bsiegert Exp $
 
-SHA1 (cabextract-1.4.tar.gz) = b1d5dd668d2dbe95b47aad6e92c0b7183ced70f1
-RMD160 (cabextract-1.4.tar.gz) = da175f0dab84150cf0c36ac4870002b07e4774d4
-Size (cabextract-1.4.tar.gz) = 222490 bytes
-SHA1 (patch-mspack_system.h) = e997f6ea664e8fbf7b03ff9fb10fb8adc06d8779
+SHA1 (cabextract-1.6.tar.gz) = 64f6d5056d3e417a943648c23cb22218b7079ced
+RMD160 (cabextract-1.6.tar.gz) = 6b693c30aa4d6821b5e83b63a8dc9d58968268b7
+Size (cabextract-1.6.tar.gz) = 241731 bytes

archivers/cabextract/patches/patch-mspack_system.h

@@ -1,35 +0,0 @@
-$NetBSD: patch-mspack_system.h,v 1.2 2011/05/13 04:10:47 adam Exp $
-
-Autoconf has already assured us of a 64-bit off_t.
-
---- mspack/system.h.orig	2011-04-26 17:15:21.000000000 +0000
-+++ mspack/system.h
-@@ -19,6 +19,7 @@ extern "C" {
- # include <config.h>
- #endif
- 
-+#include <inttypes.h>
- #include <mspack.h>
- 
- /* fix for problem with GCC 4 and glibc (thanks to Ville Skytta)
-@@ -57,18 +58,8 @@ extern "C" {
- # include <limits.h>
- #endif
- 
--#if ((defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS >= 64) || \
--     (defined(FILESIZEBITS)      && FILESIZEBITS      >= 64) || \
--     (defined(SIZEOF_OFF_T)      && SIZEOF_OFF_T      >= 8)  || \
--     defined(_LARGEFILE_SOURCE) || defined(_LARGEFILE64_SOURCE))
--# define LARGEFILE_SUPPORT
--# define LD "lld"
--# define LU "llu"
--#else
--extern const char *largefile_msg;
--# define LD "ld"
--# define LU "lu"
--#endif
-+#define LARGEFILE_SUPPORT
-+#define LD PRId64
- 
- /* endian-neutral reading of little-endian data */
- #define __egi32(a,n) ( ((((unsigned char *) a)[n+3]) << 24) | \

archivers/dact/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2012/09/11 19:46:53 asau Exp $
+# $NetBSD: Makefile,v 1.22 2014/10/09 14:05:51 wiz Exp $
 
 DISTNAME=	dact-0.8.41
 CATEGORIES=	archivers
@@ -8,8 +8,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.rkeene.org/devel/dact/
 COMMENT=	Dynamic adaptive compression tool
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}

archivers/dar/Makefile

@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2014/02/12 23:17:32 tron Exp $
+# $NetBSD: Makefile,v 1.51 2014/10/09 14:05:51 wiz Exp $
 
-DISTNAME=	dar-2.4.10
-PKGREVISION=	2
+DISTNAME=	dar-2.4.13
 CATEGORIES=	archivers sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dar/}
 
@@ -10,12 +9,10 @@ HOMEPAGE=	http://dar.linux.free.fr/
 COMMENT=	Disk archiver
 LICENSE=	gnu-gpl-v2
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake pkg-config bash:run
+USE_TOOLS+=		gmake groff gsed pkg-config bash:run
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-dar-static
@@ -104,14 +101,15 @@ SUBST_FILES.static=	src/testing/Makefile.in
 SUBST_SED.static=	-e 's,-all-static,-static,g'
 .endif
 
-.if ${OPSYS} == "NetBSD"
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD"
 BUILDLINK_TRANSFORM=	l:execinfo:execinfo:elf
 .endif
 
 .include "../../archivers/bzip2/buildlink3.mk"
+.include "../../devel/libexecinfo/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"

archivers/dar/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2013/06/28 15:03:55 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.13 2014/05/14 04:35:20 rodent Exp $
 bin/dar
 bin/dar_cp
 bin/dar_manager
@@ -36,6 +36,7 @@ include/dar/libdar_4_4.hpp
 include/dar/libdar_config.h
 include/dar/libdar_my_config.h
 include/dar/limitint.hpp
+include/dar/list_entry.hpp
 include/dar/mask.hpp
 include/dar/mask_list.hpp
 include/dar/mem_ui.hpp
@@ -126,6 +127,7 @@ share/doc/dar/mini-howto/dar-differential-backup-mini-howto.en.html
 share/doc/dar/mini-howto/dar-differential-backup-mini-howto.es.html
 share/doc/dar/mini-howto/dar-differential-backup-mini-howto.it.html
 share/doc/dar/mini-howto/index.html
+share/doc/dar/old_dar_key.txt
 share/doc/dar/presentation.html
 share/doc/dar/usage_notes.html
 share/examples/dar/darrc

archivers/dar/distinfo

@@ -1,28 +1,13 @@
-$NetBSD: distinfo,v 1.29 2014/01/20 19:29:34 joerg Exp $
+$NetBSD: distinfo,v 1.30 2014/05/14 04:35:20 rodent Exp $
 
-SHA1 (dar-2.4.10.tar.gz) = bf02ba10bfcd2ad959017706f167fc390aafe932
-RMD160 (dar-2.4.10.tar.gz) = 26161a09a60e36a3094f94d8831a157b7c3e4d0a
-Size (dar-2.4.10.tar.gz) = 1760827 bytes
-SHA1 (patch-aa) = 734ec162dbc339b2015a169bb9fe723e45d0a29b
-SHA1 (patch-ab) = f07d55861f21545b0ae8ac6b187a94526e44e345
-SHA1 (patch-ac) = dcbf4e31071c83a167a60a20e4980b35f055a46e
-SHA1 (patch-ad) = e32c33d5670f39a04f8ceef94d6e9d5a6b524016
-SHA1 (patch-ae) = 54220384bf2031df64c38f5abea038382ca37e8e
-SHA1 (patch-af) = 414e58277c946b59f57352e260ac5d49673ef008
-SHA1 (patch-src_dar__suite_command__line.cpp) = 63d3004bf7d49277c1508fe5d9ac52ec0d5bf11f
-SHA1 (patch-src_dar__suite_crit__action__cmd__line.cpp) = bc9484e836fbde98f682f6031aaadd99cc8eb479
-SHA1 (patch-src_dar__suite_dar__manager.cpp) = 2ed9008b5e7629ef8e279b7d1218a4fae5101df1
-SHA1 (patch-src_dar__suite_dar__xform.cpp) = 929e7cbb933a8d58bd1b79ecb50404f5dbbfddfe
-SHA1 (patch-src_dar__suite_line__tools.cpp) = 076c5213aaa3e6dfa471322b6597c0ce8ccfd2a8
-SHA1 (patch-src_examples_factoriel.cpp) = 6c9e038b7a3bbfdc96dbbdf1b7e100c159353f87
-SHA1 (patch-src_examples_formula.cpp) = 583ceeba0a232e657ab0696711f630476ec2e495
-SHA1 (patch-src_examples_prime.cpp) = 09fc3b96642945042a2d13bb4c1995546cdb7607
-SHA1 (patch-src_libdar_mask__list.hpp) = b3b6eaa36875784432e53d5dfbfb33d7623054a3
-SHA1 (patch-src_libdar_secu__string.hpp) = 6793cb79bf5f8c4d3ac83ba4f2cd2fd9f452afb1
-SHA1 (patch-src_testing_Makefile.in) = e8d48b5fa9fcdd2f5bef3fca240850c0787f6647
-SHA1 (patch-src_testing_test__catalogue.cpp) = 2d1a8299f01776e3fa9996819aa8be523b73b4cc
-SHA1 (patch-src_testing_test__deci.cpp) = 053e2123a5219dc0cb827743e348f9463ce84615
-SHA1 (patch-src_testing_test__escape.cpp) = b7959b2e5e3675d2e64f232face3b18384f8e3da
-SHA1 (patch-src_testing_test__infinint.cpp) = 5ee29a1881b05881bb334f1cd7bfd30ea21baf7f
-SHA1 (patch-src_testing_test__terminateur.cpp) = 79d4efadfc4528d6def28985228a0d25d1fc6e78
-SHA1 (patch-src_testing_testtools.cpp) = 4cdd4a6fde69f40463464f6ead1d208a685a516b
+SHA1 (dar-2.4.13.tar.gz) = b20471ada21cd0cbe4687e7bdd3c2e6f70f5c0d1
+RMD160 (dar-2.4.13.tar.gz) = 20cf6492aedd82b3bc227603588c8e6f44560dde
+Size (dar-2.4.13.tar.gz) = 1799774 bytes
+SHA1 (patch-aa) = 86370bb2515795b2c5645beaafeb8af08d9f209b
+SHA1 (patch-ab) = 9b8fd96e3944aedeaa4f2df0d5bfe17a73d3f7eb
+SHA1 (patch-ac) = 0581af6c9229d614fcaa6df9d1e52ef773af9ea6
+SHA1 (patch-ad) = d3b7c3564462bc25e447d87af4ea005c88540ead
+SHA1 (patch-ae) = 95a00fb53851068e6e02bfe013b39970bc12230e
+SHA1 (patch-af) = 1ece254cecbec601da9a57c32f515f1008f87859
+SHA1 (patch-src_libdar_mask__list.hpp) = 33612489e2b2e14fc9e6606aac0c4988988d89e4
+SHA1 (patch-src_libdar_secu__string.hpp) = 073db488ceed38d9dc1999786ac666a9179c520e

archivers/dar/patches/patch-aa

@@ -1,11 +1,13 @@
-$NetBSD: patch-aa,v 1.5 2013/06/28 15:03:55 ryoon Exp $
+$NetBSD: patch-aa,v 1.6 2014/05/14 04:35:20 rodent Exp $
 
---- doc/Makefile.in.orig	2013-03-09 12:40:15.000000000 +0000
+Fix DOCDIR path.
+
+--- doc/Makefile.in.orig	2014-04-21 11:24:24.000000000 +0000
 +++ doc/Makefile.in
-@@ -16,7 +16,7 @@
- @SET_MAKE@
- 
- VPATH = @srcdir@
+@@ -33,7 +33,7 @@ am__make_dryrun = \
+     esac; \
+     test $$am__dry = yes; \
+   }
 -pkgdatadir = $(datadir)/@PACKAGE@
 +pkgdatadir = $(datadir)/doc/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@

archivers/dar/patches/patch-ab

@@ -1,11 +1,13 @@
-$NetBSD: patch-ab,v 1.5 2013/06/28 15:03:55 ryoon Exp $
+$NetBSD: patch-ab,v 1.6 2014/05/14 04:35:20 rodent Exp $
 
---- doc/mini-howto/Makefile.in.orig	2013-03-09 12:40:15.000000000 +0000
+Fix DOCDIR path.
+
+--- doc/mini-howto/Makefile.in.orig	2014-04-21 11:24:24.000000000 +0000
 +++ doc/mini-howto/Makefile.in
-@@ -16,7 +16,7 @@
- @SET_MAKE@
- 
- VPATH = @srcdir@
+@@ -33,7 +33,7 @@ am__make_dryrun = \
+     esac; \
+     test $$am__dry = yes; \
+   }
 -pkgdatadir = $(datadir)/@PACKAGE@
 +pkgdatadir = $(datadir)/doc/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@

archivers/dar/patches/patch-ac

@@ -1,11 +1,11 @@
-$NetBSD: patch-ac,v 1.8 2011/08/20 16:02:23 cheusov Exp $
+$NetBSD: patch-ac,v 1.9 2014/05/14 04:35:20 rodent Exp $
 
 Solaris has <getopt.h>, but the plain getopt() function is defined in
 <unistd.h>, so it needs both headers.
 
---- configure.orig	2011-07-21 14:52:29.000000000 +0000
+--- configure.orig	2014-04-21 11:24:23.000000000 +0000
 +++ configure
-@@ -28383,11 +28383,10 @@ extern "C" {
+@@ -21763,11 +21763,10 @@ extern "C" {
  				   #endif
                                     #if HAVE_GETOPT_H
                                     #include <getopt.h>

archivers/dar/patches/patch-ad

@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.7 2014/01/20 19:29:34 joerg Exp $
+$NetBSD: patch-ad,v 1.8 2014/05/14 04:35:20 rodent Exp $
 
 On Solaris 10 with SunPro, vector<> does not have a method assign().
 
---- src/libdar/mask_list.cpp.orig	2011-02-11 20:23:42.000000000 +0000
+--- src/libdar/mask_list.cpp.orig	2014-04-21 10:02:16.000000000 +0000
 +++ src/libdar/mask_list.cpp
 @@ -55,6 +55,21 @@ using namespace std;
  namespace libdar
@@ -73,7 +73,7 @@ On Solaris 10 with SunPro, vector<> does not have a method assign().
                  min = tmp;
              else
                  if(contenu[tmp] == target)
-@@ -246,57 +263,11 @@ namespace libdar
+@@ -246,59 +263,11 @@ namespace libdar
          ret = contenu[max] == target || contenu[min] == target;
          if(including && !ret) // if including files, we must also include directories leading to a listed file
  	{
@@ -105,11 +105,13 @@ On Solaris 10 with SunPro, vector<> does not have a method assign().
 -    basic_string<mask_list::my_char> mask_list::convert_string_char(const string & src)
 -    {
 -	basic_string<my_char> ret;
+-	my_char tmp;
 -
 -	string::const_iterator ut = src.begin();
 -	while(ut != src.end())
 -	{
--	    ret += my_char(*ut);
+- 	    tmp = *ut;
+-	    ret += tmp;
 -	    ++ut;
 -	}
 -

archivers/dar/patches/patch-ae

@@ -1,7 +1,9 @@
-$NetBSD: patch-ae,v 1.3 2006/10/08 22:14:54 rillig Exp $
+$NetBSD: patch-ae,v 1.4 2014/05/14 04:35:20 rodent Exp $
 
---- doc/samples/cdbackup.sh.orig	2003-07-22 23:01:34.000000000 +0200
-+++ doc/samples/cdbackup.sh	2006-10-08 23:37:24.000000000 +0200
+Fix portability failure.
+
+--- doc/samples/cdbackup.sh.orig	2013-08-25 17:09:49.000000000 +0000
++++ doc/samples/cdbackup.sh
 @@ -72,8 +72,8 @@ RM="/bin/rm"
  #initial call of this script (just executes dar with the proper parameters):
  DATE=`$DATECMD -I`

archivers/dar/patches/patch-af

@@ -1,11 +1,11 @@
-$NetBSD: patch-af,v 1.5 2013/06/28 15:03:55 ryoon Exp $
+$NetBSD: patch-af,v 1.6 2014/05/14 04:35:20 rodent Exp $
 
 Make sure we link with AM_LDFLAGS, which arranges the link and rpath for
 libintl.so.
 
---- src/libdar/Makefile.in.orig	2013-03-09 12:40:16.000000000 +0000
+--- src/libdar/Makefile.in.orig	2014-04-21 11:24:25.000000000 +0000
 +++ src/libdar/Makefile.in
-@@ -98,7 +98,7 @@ am_libdar_la_OBJECTS = $(am__objects_1) 
+@@ -118,7 +118,7 @@ am_libdar_la_OBJECTS = $(am__objects_1) 
  libdar_la_OBJECTS = $(am_libdar_la_OBJECTS)
  libdar_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
@@ -14,7 +14,7 @@ libintl.so.
  @BUILD_MODE32_FALSE@@BUILD_MODE64_FALSE@am_libdar_la_rpath = -rpath \
  @BUILD_MODE32_FALSE@@BUILD_MODE64_FALSE@	$(libdir)
  libdar32_la_LIBADD =
-@@ -106,14 +106,14 @@ am_libdar32_la_OBJECTS = $(am__objects_1
+@@ -126,14 +126,14 @@ am_libdar32_la_OBJECTS = $(am__objects_1
  libdar32_la_OBJECTS = $(am_libdar32_la_OBJECTS)
  libdar32_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \

archivers/dar/patches/patch-src_dar__suite_command__line.cpp

@@ -1,31 +0,0 @@
-$NetBSD: patch-src_dar__suite_command__line.cpp,v 1.1 2013/06/26 15:49:31 joerg Exp $
-
---- src/dar_suite/command_line.cpp.orig	2013-06-20 19:13:40.000000000 +0000
-+++ src/dar_suite/command_line.cpp
-@@ -758,7 +758,7 @@ static bool get_args_recursive(recursive
- 			try
- 			{
- 				// trying to read a simple integer
--			    deci tmp = string(optarg);
-+			    libdar::deci tmp = string(optarg);
- 			    p.fixed_date = tmp.computer();
- 			}
- 			catch(Edeci & e)
-@@ -845,7 +845,7 @@ static bool get_args_recursive(recursive
-             case 'p':
- 		if(optarg != NULL)
- 		{
--		    deci conv = string(optarg);
-+		    libdar::deci conv = string(optarg);
- 		    p.pause = conv.computer();
- 		}
- 		else
-@@ -1222,7 +1222,7 @@ static bool get_args_recursive(recursive
-                 {
-                     try
-                     {
--                        p.hourshift = deci(string(optarg)).computer();
-+                        p.hourshift = libdar::deci(string(optarg)).computer();
-                     }
-                     catch(Edeci & e)
-                     {

archivers/dar/patches/patch-src_dar__suite_crit__action__cmd__line.cpp

@@ -1,13 +0,0 @@
-$NetBSD: patch-src_dar__suite_crit__action__cmd__line.cpp,v 1.1 2013/06/26 15:49:31 joerg Exp $
-
---- src/dar_suite/crit_action_cmd_line.cpp.orig	2013-06-20 19:17:02.000000000 +0000
-+++ src/dar_suite/crit_action_cmd_line.cpp
-@@ -413,7 +413,7 @@ static const criterium * criterium_creat
- 		case 'r':
- 		    try
- 		    {
--			deci tmp = sub_arg;
-+			libdar::deci tmp = sub_arg;
- 			date = tmp.computer();
- 		    }
- 		    catch(Edeci & e)

archivers/dar/patches/patch-src_dar__suite_dar__manager.cpp

@@ -1,76 +0,0 @@
-$NetBSD: patch-src_dar__suite_dar__manager.cpp,v 1.1 2013/06/26 15:49:31 joerg Exp $
-
---- src/dar_suite/dar_manager.cpp.orig	2013-06-20 19:21:17.000000000 +0000
-+++ src/dar_suite/dar_manager.cpp
-@@ -78,7 +78,7 @@ using namespace libdar;
- #define MISSING_ARG "Missing argument to -%c"
- #define INVALID_ARG "Invalid argument given to -%c (requires integer)"
- 
--enum operation { none_op, create, add, listing, del, chbase, where, options, dar, restore, used, files, stats, move, interactive, check, batch };
-+enum operation { none_op, create, add, listing, del, chbase, where, options, dar, restore, used, files, stats, my_move, interactive, check, batch };
- 
- static S_I little_main(user_interaction & dialog, S_I argc, char *const argv[], const char **env);
- static bool command_line(user_interaction & dialog,
-@@ -183,7 +183,7 @@ S_I little_main(user_interaction & dialo
-     case used:
-     case files:
-     case stats:
--    case move:
-+    case my_move:
-     case interactive:
-     case check:
-     case batch:
-@@ -386,7 +386,7 @@ static bool command_line(user_interactio
- 		case 'm':
- 		    if(op != none_op)
- 			throw Erange("command_line", tools_printf(gettext(ONLY_ONCE), char(lu)));
--		    op = move;
-+		    op = my_move;
- 		    if(optarg == NULL)
- 			throw Erange("command_line", tools_printf(gettext(MISSING_ARG), char(lu)));
- 		    num = tools_str2int(optarg);
-@@ -448,7 +448,7 @@ static bool command_line(user_interactio
- 		    {
- 			try
- 			{
--			    deci tmp = string(optarg);
-+			    libdar::deci tmp = string(optarg);
- 			    date = tmp.computer();
- 			}
- 			catch(Edeci & e)
-@@ -529,7 +529,7 @@ static bool command_line(user_interactio
- 	    break;
- 	case options:
- 	    break;
--	case move:
-+	case my_move:
- 	    if(rest.size() != 1)
- 	    {
- 		dialog.warning(gettext("Missing argument to command line, aborting"));
-@@ -1068,7 +1068,7 @@ static void op_interactive(user_interact
- 		saved = false;
- 		break;
- 	    case 'm':
--		input = dialog.get_string(gettext("Archive number to move: "), true);
-+		input = dialog.get_string(gettext("Archive number to my_move: "), true);
- 		num = tools_str2int(input);
- 		input = dialog.get_string(gettext("In which position to insert this archive: "), true);
- 		num2 = tools_str2int(input);
-@@ -1298,7 +1298,7 @@ static void finalize(user_interaction & 
-     case where:
-     case options:
-     case dar:
--    case move:
-+    case my_move:
-     case batch:
- 	if(info_details)
- 	    dialog.warning(gettext("Compressing and writing back database to file..."));
-@@ -1362,7 +1362,7 @@ static void action(user_interaction & di
-     case stats:
- 	op_stats(dialog, dat, info_details);
- 	break;
--    case move:
-+    case my_move:
- 	op_move(dialog, dat, num, num2, info_details);
- 	break;
-     case interactive:

archivers/dar/patches/patch-src_dar__suite_dar__xform.cpp

@@ -1,13 +0,0 @@
-$NetBSD: patch-src_dar__suite_dar__xform.cpp,v 1.1 2013/06/26 15:49:31 joerg Exp $
-
---- src/dar_suite/dar_xform.cpp.orig	2013-06-20 19:18:01.000000000 +0000
-+++ src/dar_suite/dar_xform.cpp
-@@ -314,7 +314,7 @@ static bool command_line(user_interactio
-             case 'p':
- 		if(optarg != NULL)
- 		{
--		    deci conv = string(optarg);
-+		    libdar::deci conv = string(optarg);
- 		    pause = conv.computer();
- 		}
- 		else

archivers/dar/patches/patch-src_dar__suite_line__tools.cpp

@@ -1,56 +0,0 @@
-$NetBSD: patch-src_dar__suite_line__tools.cpp,v 1.1 2013/06/26 15:49:31 joerg Exp $
-
---- src/dar_suite/line_tools.cpp.orig	2013-06-20 19:14:58.000000000 +0000
-+++ src/dar_suite/line_tools.cpp
-@@ -215,8 +215,8 @@ void line_tools_repeat_param(const strin
- 
-     try
-     {
--	deci x1 = tmp1;
--	deci x2 = tmp2;
-+	libdar::deci x1 = tmp1;
-+	libdar::deci x2 = tmp2;
- 
- 	repeat_count = x1.computer();
- 	repeat_byte = x2.computer();
-@@ -514,14 +514,14 @@ void line_tools_get_min_digits(string th
- 	it1 = tools_find_first_char_of(the_arg, ',');
- 	if(it1 == the_arg.end()) // a single number is provided
- 	{
--	    deci tmp = the_arg;
-+	    libdar::deci tmp = the_arg;
- 	    num = tmp.computer();
- 	}
- 	else // at least two numbers are provided
- 	{
- 	    if(the_arg.begin() != it1)
- 	    {
--		deci convert = string(the_arg.begin(), it1);
-+		libdar::deci convert = string(the_arg.begin(), it1);
- 		num = convert.computer();
- 	    }
- 		// else we ignore the leading ','
-@@ -533,20 +533,20 @@ void line_tools_get_min_digits(string th
- 	    it2 = tools_find_first_char_of(tmp2, ',');
- 	    if(it2 == tmp2.end()) // just two number have been provided
- 	    {
--		deci convert = tmp2;
-+		libdar::deci convert = tmp2;
- 		ref_num = convert.computer();
- 	    }
- 	    else
- 	    {
- 		if(tmp2.begin() != it2)
- 		{
--		    deci convert = string(tmp2.begin(), it2);
-+		    libdar::deci convert = string(tmp2.begin(), it2);
- 		    ref_num = convert.computer();
- 		}
- 		++it2;
- 		if(it2 != tmp2.end())
- 		{
--		    deci convert = string(it2, tmp2.end());
-+		    libdar::deci convert = string(it2, tmp2.end());
- 		    aux_num = convert.computer();
- 		}
- 	    }

archivers/dar/patches/patch-src_examples_factoriel.cpp

@@ -1,31 +0,0 @@
-$NetBSD: patch-src_examples_factoriel.cpp,v 1.1 2013/06/26 15:49:31 joerg Exp $
-
---- src/examples/factoriel.cpp.orig	2013-06-20 19:26:28.000000000 +0000
-+++ src/examples/factoriel.cpp
-@@ -85,7 +85,7 @@ static int little_main(user_interaction 
- 	exit(1);
- 
-     string s = argv[1];
--    deci f = s;
-+    libdar::deci f = s;
-     infinint max = f.computer();
-     infinint i = 2;
-     infinint p = 1;
-@@ -97,7 +97,7 @@ static int little_main(user_interaction 
-     }
- 
-     ui.warning("calcul finished, now computing the decimal representation ... ");
--    f = deci(p);
-+    f = libdar::deci(p);
-     ui.warning(f.human());
-     if(argc == 3)
-     {
-@@ -112,7 +112,7 @@ static int little_main(user_interaction 
- 	    p.dump(fic);
- 	    fic.skip(0);
- 	    cp = infinint(fic);
--	    ui.warning(string("read from file: ") + deci(cp).human());
-+	    ui.warning(string("read from file: ") + libdar::deci(cp).human());
- 	}
-     }
- 

archivers/dar/patches/patch-src_examples_formula.cpp

@@ -1,22 +0,0 @@
-$NetBSD: patch-src_examples_formula.cpp,v 1.1 2013/06/26 15:49:31 joerg Exp $
-
---- src/examples/formula.cpp.orig	2013-06-20 19:27:22.000000000 +0000
-+++ src/examples/formula.cpp
-@@ -60,7 +60,7 @@ int little_main(user_interaction & ui, S
-     else
-     {
- 	string formula = crit_action_canonize_string(argv[1]);
--	deci tmp = calculus(formula);
-+	libdar::deci tmp = calculus(formula);
- 
- 	cout << tmp.human() << endl;
- 
-@@ -113,7 +113,7 @@ static infinint calculus(const string & 
- 	return calculus(string(formula.begin() + 1, formula.end() - 1));
-     else  // assuming an integer
-     {
--	deci tmp = formula;
-+	libdar::deci tmp = formula;
- 	return tmp.computer();
-     }
- }

archivers/dar/patches/patch-src_examples_prime.cpp

@@ -1,13 +0,0 @@
-$NetBSD: patch-src_examples_prime.cpp,v 1.1 2013/06/26 15:49:31 joerg Exp $
-
---- src/examples/prime.cpp.orig	2013-06-20 19:27:04.000000000 +0000
-+++ src/examples/prime.cpp
-@@ -58,7 +58,7 @@ int little_main(user_interaction & ui, S
-         exit(1);
-     }
- 
--    deci x = string(argv[1]);
-+    libdar::deci x = string(argv[1]);
-     cout << "converting string to infinint... " << endl;
-     infinint num = x.computer();
-     cout << "checking whether the number is a prime factor... " << endl;

archivers/dar/patches/patch-src_libdar_mask__list.hpp

@@ -1,6 +1,6 @@
-$NetBSD: patch-src_libdar_mask__list.hpp,v 1.2 2014/01/20 19:29:34 joerg Exp $
+$NetBSD: patch-src_libdar_mask__list.hpp,v 1.3 2014/05/14 04:35:20 rodent Exp $
 
---- src/libdar/mask_list.hpp.orig	2012-11-30 20:51:11.000000000 +0000
+--- src/libdar/mask_list.hpp.orig	2014-04-21 10:02:16.000000000 +0000
 +++ src/libdar/mask_list.hpp
 @@ -70,46 +70,10 @@ namespace libdar
  
@@ -13,8 +13,8 @@ $NetBSD: patch-src_libdar_mask__list.hpp,v 1.2 2014/01/20 19:29:34 joerg Exp $
 -	class my_char
 -	{
 -	public:
--	    my_char() { val = 0; };
--	    my_char(const char x) : val(x) {};
+- 	    const my_char & operator = (const char x) { val = x; return *this; };
+-	  
 -	    bool operator < (const my_char & x) const
 -	    {
 -		if(val == '/')

archivers/dar/patches/patch-src_libdar_secu__string.hpp

@@ -1,6 +1,6 @@
-$NetBSD: patch-src_libdar_secu__string.hpp,v 1.2 2013/06/28 15:03:55 ryoon Exp $
+$NetBSD: patch-src_libdar_secu__string.hpp,v 1.3 2014/05/14 04:35:20 rodent Exp $
 
---- src/libdar/secu_string.hpp.orig	2012-11-30 20:51:11.000000000 +0000
+--- src/libdar/secu_string.hpp.orig	2014-04-21 10:02:16.000000000 +0000
 +++ src/libdar/secu_string.hpp
 @@ -35,6 +35,7 @@
  #include "../my_config.h"

archivers/dar/patches/patch-src_testing_test__catalogue.cpp

@@ -1,13 +0,0 @@
-$NetBSD: patch-src_testing_test__catalogue.cpp,v 1.1 2013/06/26 15:49:31 joerg Exp $
-
---- src/testing/test_catalogue.cpp.orig	2013-06-20 19:28:21.000000000 +0000
-+++ src/testing/test_catalogue.cpp
-@@ -258,7 +258,7 @@ void f2()
-                                 if(i->is_more_recent_than(*w, 0))
- 				{
-                                     cout << "plus recent" << endl;
--				    cout << "new is " << deci(w->get_last_modif()).human() << " ref " << deci(i->get_last_modif()).human() << endl;
-+				    cout << "new is " << libdar::deci(w->get_last_modif()).human() << " ref " << libdar::deci(i->get_last_modif()).human() << endl;
- 				}
-                                 else
-                                     cout << "pas plus recent" << endl;

archivers/dar/patches/patch-src_testing_test__deci.cpp

@@ -1,18 +0,0 @@
-$NetBSD: patch-src_testing_test__deci.cpp,v 1.1 2013/06/26 15:49:31 joerg Exp $
-
---- src/testing/test_deci.cpp.orig	2013-06-20 19:29:44.000000000 +0000
-+++ src/testing/test_deci.cpp
-@@ -39,10 +39,10 @@ int main()
- 
- static void f1()
- {
--    deci d1 = string("00001");
-+    libdar::deci d1 = string("00001");
-     infinint t = 3;
--    deci d2 = t;
--    deci d3 = infinint(125);
-+    libdar::deci d2 = t;
-+    libdar::deci d3 = infinint(125);
-     U_I c;
- 
-     cout << d1.human() << endl;

archivers/dar/patches/patch-src_testing_test__escape.cpp

@@ -1,11 +0,0 @@
-$NetBSD: patch-src_testing_test__escape.cpp,v 1.1 2013/06/26 15:49:31 joerg Exp $
-
---- src/testing/test_escape.cpp.orig	2013-06-20 19:30:16.000000000 +0000
-+++ src/testing/test_escape.cpp
-@@ -121,5 +121,5 @@ void f2()
- 	cout << "OK" << endl;
-     else
- 	cout << "NOK" << endl;
--    cout << deci(tested.get_position()).human() << endl;
-+    cout << libdar::deci(tested.get_position()).human() << endl;
- }

archivers/dar/patches/patch-src_testing_test__infinint.cpp

@@ -1,122 +0,0 @@
-$NetBSD: patch-src_testing_test__infinint.cpp,v 1.1 2013/06/26 15:49:31 joerg Exp $
-
---- src/testing/test_infinint.cpp.orig	2013-06-20 19:28:49.000000000 +0000
-+++ src/testing/test_infinint.cpp
-@@ -83,9 +83,9 @@ static void routine1()
-     infinint f2 = f1;
-     infinint f3 = 0;
- 
--    deci d1 = f1;
--    deci d2 = f2;
--    deci d3 = f3;
-+    libdar::deci d1 = f1;
-+    libdar::deci d2 = f2;
-+    libdar::deci d3 = f3;
- 
-     ui->warning(d1.human() + " " + d2.human() + " " + d3.human());
- 
-@@ -98,7 +98,7 @@ static void routine1()
-         if(fd >= 0)
-         {
-             f3 = infinint(*ui, fd);
--            d3 = deci(f3);
-+            d3 = libdar::deci(f3);
-             ui->warning(d3.human());
-         }
-         close(fd);
-@@ -106,33 +106,33 @@ static void routine1()
-     }
- 
-     f1 += 3;
--    d1 = deci(f1);
-+    d1 = libdar::deci(f1);
-     ui->warning(d1.human());
- 
-     f1 -= 2;
--    d1 = deci(f1);
-+    d1 = libdar::deci(f1);
-     ui->warning(d1.human());
- 
-     f1 *= 10;
--    d1 = deci(f1);
-+    d1 = libdar::deci(f1);
-     ui->warning(d1.human());
- 
-     f2 = f1;
-     f1 /= 3;
--    d1 = deci(f1);
-+    d1 = libdar::deci(f1);
-     ui->warning(d1.human());
- 
-     f2 %= 3;
--    d2 = deci(f2);
-+    d2 = libdar::deci(f2);
-     ui->warning(d2.human());
- 
-     f2 >>= 12;
--    d2 = deci(f2);
-+    d2 = libdar::deci(f2);
-     ui->warning(d2.human());
- 
-     f1 = 4;
-     f2 >>= f1;
--    d2 = deci(f2);
-+    d2 = libdar::deci(f2);
-     ui->warning(d2.human());
- 
-     f1 = 4+12;
-@@ -143,9 +143,9 @@ static void routine1()
-     cout << f3 << endl;
-     cout << (123 << 16) << endl;
-     f2 <<= 4+12;
--    d2 = deci(f2);
-+    d2 = libdar::deci(f2);
-     ui->warning(d2.human());
--    d3 = deci(f3);
-+    d3 = libdar::deci(f3);
-     ui->warning(d3.human());
- 
-     try
-@@ -184,12 +184,12 @@ static void routine1()
-     {
-         for(f3 = 2; f3 <= f1; f3++)
-         {
--            d1 = deci(f1);
--            d2 = deci(f2);
--            d3 = deci(f3);
-+            d1 = libdar::deci(f1);
-+            d2 = libdar::deci(f2);
-+            d3 = libdar::deci(f3);
-             ui->warning(d1.human() + " " + d2.human() + " " + d3.human());
-             f2 *= f3;
--            d2 = deci(f2);
-+            d2 = libdar::deci(f2);
-             ui->warning(d2.human());
-         }
-     }
-@@ -197,17 +197,17 @@ static void routine1()
-     {
-         ui->warning(e.get_message());
-     }
--    d2 = deci(f2);
--    d1 = deci(f1);
-+    d2 = libdar::deci(f2);
-+    d1 = libdar::deci(f1);
-     ui->warning(string("factoriel(") + d1.human() + ") = " + d2.human());
- }
- 
- static void routine2()
- {
--    ui->warning(deci(infinint(2).power((U_I)0)).human());
--    ui->warning(deci(infinint(2).power(infinint(0))).human());
--    ui->warning(deci(infinint(2).power((U_I)1)).human());
--    ui->warning(deci(infinint(2).power(infinint(1))).human());
--    ui->warning(deci(infinint(2).power((U_I)2)).human());
--    ui->warning(deci(infinint(2).power(infinint(2))).human());
-+    ui->warning(libdar::deci(infinint(2).power((U_I)0)).human());
-+    ui->warning(libdar::deci(infinint(2).power(infinint(0))).human());
-+    ui->warning(libdar::deci(infinint(2).power((U_I)1)).human());
-+    ui->warning(libdar::deci(infinint(2).power(infinint(1))).human());
-+    ui->warning(libdar::deci(infinint(2).power((U_I)2)).human());
-+    ui->warning(libdar::deci(infinint(2).power(infinint(2))).human());
- }

archivers/dar/patches/patch-src_testing_test__terminateur.cpp

@@ -1,13 +0,0 @@
-$NetBSD: patch-src_testing_test__terminateur.cpp,v 1.1 2013/06/26 15:49:31 joerg Exp $
-
---- src/testing/test_terminateur.cpp.orig	2013-06-20 19:28:01.000000000 +0000
-+++ src/testing/test_terminateur.cpp
-@@ -83,7 +83,7 @@ static void f1()
-     for(S_I i=2;i<30;i++)
-         grand *= i;
- 
--    deci conv = grand;
-+    libdar::deci conv = grand;
-     cout << conv.human() << endl;
-     term.set_catalogue_start(grand);
-     term.dump(toto);

archivers/dar/patches/patch-src_testing_testtools.cpp

@@ -1,13 +0,0 @@
-$NetBSD: patch-src_testing_testtools.cpp,v 1.1 2013/06/26 15:49:31 joerg Exp $
-
---- src/testing/testtools.cpp.orig	2013-06-20 19:29:24.000000000 +0000
-+++ src/testing/testtools.cpp
-@@ -35,7 +35,7 @@ using namespace std;
- 
- void display(const infinint & x)
- {
--    deci vu = x;
-+    libdar::deci vu = x;
-     cout << vu.human() << endl;
- }
- 

archivers/fastjar/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2012/09/11 19:46:53 asau Exp $
+# $NetBSD: Makefile,v 1.19 2014/10/09 14:05:51 wiz Exp $
 #
 
 DISTNAME=	fastjar-0.93
@@ -11,8 +11,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://fastjar.sourceforge.net/
 COMMENT=	C language version of the 'jar' archiver normally used by Java
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 GNU_CONFIGURE=	YES
 
 INSTALLATION_DIRS=	${PKGMANDIR}/man1

archivers/file-roller/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.130 2013/10/10 14:41:57 ryoon Exp $
+# $NetBSD: Makefile,v 1.132 2014/05/29 23:35:13 wiz Exp $
 #
 
 DISTNAME=	file-roller-2.32.2
-PKGREVISION=	18
+PKGREVISION=	21
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/file-roller/2.32/}
 EXTRACT_SUFX=	.tar.bz2

archivers/freeze/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2012/09/11 19:46:54 asau Exp $
+# $NetBSD: Makefile,v 1.26 2014/10/09 14:05:51 wiz Exp $
 
 DISTNAME=	freeze-2.5
 PKGREVISION=	3
@@ -10,8 +10,6 @@ COMMENT=	FREEZE / MELT compression program - often used in QNX
 
 CONFLICTS=	statist-[0-9]* # bin/statist
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 GNU_CONFIGURE=	yes
 BUILD_TARGET=	prog
 

archivers/gcpio/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2013/07/21 10:31:26 shattered Exp $
+# $NetBSD: Makefile,v 1.49 2014/10/09 14:05:51 wiz Exp $
 #
 
 DISTNAME=	cpio-2.11
@@ -14,8 +14,6 @@ LICENSE=	gnu-gpl-v3
 
 CONFLICTS+=	gtar-base-[0-9]*
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	makeinfo
 INFO_FILES=	yes

archivers/gsharutils/Makefile

@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.50 2013/07/21 09:03:19 shattered Exp $
+# $NetBSD: Makefile,v 1.52 2014/10/09 14:05:51 wiz Exp $
 
-DISTNAME=	sharutils-4.13.4
+DISTNAME=	sharutils-4.13.5
 PKGNAME=	g${DISTNAME}
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_GNU:=sharutils/}
@@ -10,8 +10,6 @@ HOMEPAGE=	http://www.gnu.org/software/sharutils/sharutils.html
 COMMENT=	Allow packing and unpacking of shell archives
 LICENSE=	gnu-gpl-v3
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 AUTO_MKDIRS=		yes
 
 USE_PKGLOCALEDIR=	yes

archivers/gsharutils/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.18 2013/07/21 09:03:19 shattered Exp $
+$NetBSD: distinfo,v 1.19 2014/09/13 10:53:04 shattered Exp $
 
-SHA1 (sharutils-4.13.4.tar.gz) = 29c8a3ed89ae63cda6c25db552719abeb9d50cbd
-RMD160 (sharutils-4.13.4.tar.gz) = cd1160ffe963181c99396e6b2a0c2b09464a807a
-Size (sharutils-4.13.4.tar.gz) = 1956545 bytes
+SHA1 (sharutils-4.13.5.tar.gz) = 60868635dff4c36f6ccc7be89b53a591938fa3b2
+RMD160 (sharutils-4.13.5.tar.gz) = 9f59fca8d3ec5e98ba61b7a330fa90a1d02f997d
+Size (sharutils-4.13.5.tar.gz) = 2045022 bytes

archivers/gtar-base/Makefile

@@ -1,25 +1,17 @@
-# $NetBSD: Makefile,v 1.82 2014/03/18 18:11:26 bsiegert Exp $
+# $NetBSD: Makefile,v 1.87 2015/01/26 12:30:30 jperkin Exp $
 #
 # Please run 'make files/gtar.1' when updating version of this package
 # to regenerate the man page. converters/help2man is needed.
 
-DISTNAME=	tar-1.27.1
+.include "../../archivers/gtar/Makefile.common"
+
 PKGNAME=	${DISTNAME:S/tar/gtar-base/}
 PKGREVISION=	1
-SVR4_PKGNAME=	gtarb
-CATEGORIES=	archivers
-MASTER_SITES=	${MASTER_SITE_GNU:=tar/}
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.gnu.org/software/tar/tar.html
 COMMENT=	The GNU tape archiver with remote magnetic tape support
 LICENSE=	gnu-gpl-v3
 
 CONFLICTS=	gcpio-[0-9]*
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 USE_FEATURES=		snprintf
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		msgfmt
@@ -38,12 +30,19 @@ CONFIGURE_ENV+=		gt_cv_func_gnugettext2_libintl=yes
 # allow configure to run as root
 CONFIGURE_ENV+=		FORCE_UNSAFE_CONFIGURE=1
 
+.if ${OS_VARIANT} == "SCOOSR5"
+# SCO OpenServer 5.0.7/3.2 has strtoimax in inttypes.h, but not in library.
+CONFIGURE_ENV+=		gl_cv_have_raw_decl_strtoimax=no
+CONFIGURE_ENV+=		ac_cv_have_decl_strtoimax=no
+LDFLAGS.SCO_SV+=	-lsocket
+.endif
+
 PLIST_VARS+=		gtar rmt
 
 TEST_TARGET=		check
 
 # don't include rmt if gtar won't build it
-.if ${OPSYS} != "Interix" && ${OPSYS} != "Darwin"
+.if ${OPSYS} != "Interix" && ${OPSYS} != "Darwin" && ${OS_VARIANT} != "SCOOSR5"
 PLIST.rmt=		yes
 .endif
 
@@ -63,16 +62,8 @@ SYMLINKS=		bin/gtar ${PKGGNUDIR}bin/tar \
 SYMLINKS+=		libexec/grmt ${PKGGNUDIR}libexec/rmt
 .endif
 
-files/gtar.1: build
-	${ECHO} .\\\" > ${FILESDIR}/gtar.1
-	${ECHO} .\\\" \$$NetBSD\$$ >> ${FILESDIR}/gtar.1
-	help2man --name "The GNU version of the tar archiving utility" \
-		--info-page tar ${WRKSRC}/src/tar | \
-		${SED} '/help2man/d' >> ${FILESDIR}/gtar.1
-
 post-install:
-	${INSTALL_MAN} ${FILESDIR}/gtar.1 \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/gtar.1
+	${INSTALL_DATA} ${WRKSRC}/doc/tar.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/gtar.1
 .for o n in ${SYMLINKS}
 	${LN} -sf ${PREFIX}/${o} ${DESTDIR}${PREFIX}/${n}
 .endfor

archivers/gtar-base/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2014/02/24 08:16:56 adam Exp $
+@comment $NetBSD: PLIST,v 1.18 2014/08/17 16:28:18 wiz Exp $
 bin/gtar
 gnu/bin/tar
 gnu/man/man1/tar.1
@@ -36,6 +36,7 @@ share/locale/ro/LC_MESSAGES/tar.mo
 share/locale/ru/LC_MESSAGES/tar.mo
 share/locale/sk/LC_MESSAGES/tar.mo
 share/locale/sl/LC_MESSAGES/tar.mo
+share/locale/sr/LC_MESSAGES/tar.mo
 share/locale/sv/LC_MESSAGES/tar.mo
 share/locale/tr/LC_MESSAGES/tar.mo
 share/locale/uk/LC_MESSAGES/tar.mo

archivers/gtar-base/distinfo

@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.32 2014/03/18 09:03:26 obache Exp $
+$NetBSD: distinfo,v 1.38 2015/01/26 12:41:53 jperkin Exp $
 
-SHA1 (tar-1.27.1.tar.bz2) = 67aa31d0d497849c05ba5ea6eb41cff130407751
-RMD160 (tar-1.27.1.tar.bz2) = a99ccfd874ac72c1e0feec2d86423c3e5bcd19fb
-Size (tar-1.27.1.tar.bz2) = 2573070 bytes
-SHA1 (patch-ad) = f3a988a6b675a389d8d307fe1a90dde81ba98df5
+SHA1 (tar-1.28.tar.bz2) = 668ea52014ef7e70afc4ff7324410ee32f2970ef
+RMD160 (tar-1.28.tar.bz2) = a2edf2a854fa9a7bc7383638038a7465ae8bba51
+Size (tar-1.28.tar.bz2) = 2693989 bytes
+SHA1 (patch-Makefile.in) = 78cc142b9370317c52215c106ea1e7217e71f9b5
+SHA1 (patch-configure) = 9d3b26ab03c8a0a30c3dbfbdeadae4d14b7fd8dc
 SHA1 (patch-gnu_readlinkat.c) = b1ddbf5159db92df9186354f27db5c9cb93b9afa
+SHA1 (patch-lib_xattr-at.c) = c69631c118558c0c056feb5b55188b2b4c92cc19
+SHA1 (patch-src_Makefile.in) = 2e6c93b00f4c291a68884663968625e784103c3b
+SHA1 (patch-src_system.c) = cd9f7358fa93ed0ba4a1b3fffdae5d7f84ef4791

archivers/gtar-base/files/gtar.1

@@ -1,611 +0,0 @@
-.\"
-.\" $NetBSD: gtar.1,v 1.5 2014/03/12 13:32:14 fhajny Exp $
-.TH TAR "1" "March 2014" "tar 1.27.1" "User Commands"
-.SH NAME
-tar \- The GNU version of the tar archiving utility
-.SH SYNOPSIS
-.B tar
-[\fIOPTION\fR...] [\fIFILE\fR]...
-.SH DESCRIPTION
-GNU 'tar' saves many files together into a single tape or disk archive, and can
-restore individual files from the archive.
-.SH EXAMPLES
-.TP
-tar \-cf archive.tar foo bar
-# Create archive.tar from files foo and bar.
-.TP
-tar \-tvf archive.tar
-# List all files in archive.tar verbosely.
-.TP
-tar \-xf archive.tar
-# Extract all files from archive.tar.
-.IP
-Main operation mode:
-.TP
-\-A, \-\-catenate, \-\-concatenate
-append tar files to an archive
-.TP
-\-c, \-\-create
-create a new archive
-.TP
-\-d, \-\-diff, \-\-compare
-find differences between archive and file system
-.TP
-\-\-delete
-delete from the archive (not on mag tapes!)
-.TP
-\-r, \-\-append
-append files to the end of an archive
-.TP
-\-t, \-\-list
-list the contents of an archive
-.TP
-\-\-test\-label
-test the archive volume label and exit
-.TP
-\-u, \-\-update
-only append files newer than copy in archive
-.TP
-\-x, \-\-extract, \-\-get
-extract files from an archive
-.IP
-Operation modifiers:
-.TP
-\-\-check\-device
-check device numbers when creating incremental
-archives (default)
-.TP
-\-g, \-\-listed\-incremental=FILE
-handle new GNU\-format incremental backup
-.TP
-\-G, \-\-incremental
-handle old GNU\-format incremental backup
-.TP
-\-\-ignore\-failed\-read
-do not exit with nonzero on unreadable files
-.TP
-\-\-level=NUMBER
-dump level for created listed\-incremental archive
-.TP
-\-n, \-\-seek
-archive is seekable
-.TP
-\-\-no\-check\-device
-do not check device numbers when creating
-incremental archives
-.TP
-\-\-no\-seek
-archive is not seekable
-.TP
-\-\-occurrence[=NUMBER]
-process only the NUMBERth occurrence of each file
-in the archive; this option is valid only in
-conjunction with one of the subcommands \-\-delete,
-\-\-diff, \-\-extract or \-\-list and when a list of
-files is given either on the command line or via
-the \-T option; NUMBER defaults to 1
-.TP
-\-\-sparse\-version=MAJOR[.MINOR]
-set version of the sparse format to use (implies
-\-\-sparse)
-.TP
-\-S, \-\-sparse
-handle sparse files efficiently
-.IP
-Overwrite control:
-.TP
-\-k, \-\-keep\-old\-files
-don't replace existing files when extracting,
-treat them as errors
-.TP
-\-\-keep\-directory\-symlink
-preserve existing symlinks to directories when
-extracting
-.TP
-\-\-keep\-newer\-files
-don't replace existing files that are newer than
-their archive copies
-.TP
-\-\-no\-overwrite\-dir
-preserve metadata of existing directories
-.TP
-\-\-overwrite
-overwrite existing files when extracting
-.TP
-\-\-overwrite\-dir
-overwrite metadata of existing directories when
-extracting (default)
-.TP
-\-\-recursive\-unlink
-empty hierarchies prior to extracting directory
-.TP
-\-\-remove\-files
-remove files after adding them to the archive
-.TP
-\-\-skip\-old\-files
-don't replace existing files when extracting,
-silently skip over them
-.TP
-\-U, \-\-unlink\-first
-remove each file prior to extracting over it
-.TP
-\-W, \-\-verify
-attempt to verify the archive after writing it
-.IP
-Select output stream:
-.HP
-\-\-ignore\-command\-error ignore exit codes of children
-.TP
-\-\-no\-ignore\-command\-error
-treat non\-zero exit codes of children as
-error
-.TP
-\-O, \-\-to\-stdout
-extract files to standard output
-.TP
-\-\-to\-command=COMMAND
-pipe extracted files to another program
-.IP
-Handling of file attributes:
-.TP
-\-\-atime\-preserve[=METHOD]
-preserve access times on dumped files, either
-by restoring the times after reading
-(METHOD='replace'; default) or by not setting the
-times in the first place (METHOD='system')
-.TP
-\-\-delay\-directory\-restore
-delay setting modification times and
-permissions of extracted directories until the end
-of extraction
-.TP
-\-\-group=NAME
-force NAME as group for added files
-.TP
-\-\-mode=CHANGES
-force (symbolic) mode CHANGES for added files
-.TP
-\-\-mtime=DATE\-OR\-FILE
-set mtime for added files from DATE\-OR\-FILE
-.TP
-\-m, \-\-touch
-don't extract file modified time
-.TP
-\-\-no\-delay\-directory\-restore
-cancel the effect of \-\-delay\-directory\-restore
-option
-.TP
-\-\-no\-same\-owner
-extract files as yourself (default for ordinary
-users)
-.TP
-\-\-no\-same\-permissions
-apply the user's umask when extracting permissions
-from the archive (default for ordinary users)
-.TP
-\-\-numeric\-owner
-always use numbers for user/group names
-.TP
-\-\-owner=NAME
-force NAME as owner for added files
-.TP
-\-p, \-\-preserve\-permissions, \-\-same\-permissions
-extract information about file permissions
-(default for superuser)
-.TP
-\-\-preserve
-same as both \-p and \-s
-.TP
-\-\-same\-owner
-try extracting files with the same ownership as
-exists in the archive (default for superuser)
-.TP
-\-s, \-\-preserve\-order, \-\-same\-order
-member arguments are listed in the same order as
-the files in the archive
-.IP
-Handling of extended file attributes:
-.TP
-\-\-acls
-Enable the POSIX ACLs support
-.TP
-\-\-no\-acls
-Disable the POSIX ACLs support
-.TP
-\-\-no\-selinux
-Disable the SELinux context support
-.TP
-\-\-no\-xattrs
-Disable extended attributes support
-.TP
-\-\-selinux
-Enable the SELinux context support
-.TP
-\-\-xattrs
-Enable extended attributes support
-.TP
-\-\-xattrs\-exclude=MASK
-specify the exclude pattern for xattr keys
-.TP
-\-\-xattrs\-include=MASK
-specify the include pattern for xattr keys
-.IP
-Device selection and switching:
-.TP
-\-f, \-\-file=ARCHIVE
-use archive file or device ARCHIVE
-.TP
-\-\-force\-local
-archive file is local even if it has a colon
-.TP
-\-F, \-\-info\-script=NAME, \-\-new\-volume\-script=NAME
-run script at end of each tape (implies \-M)
-.TP
-\-L, \-\-tape\-length=NUMBER
-change tape after writing NUMBER x 1024 bytes
-.TP
-\-M, \-\-multi\-volume
-create/list/extract multi\-volume archive
-.TP
-\-\-rmt\-command=COMMAND
-use given rmt COMMAND instead of rmt
-.TP
-\-\-rsh\-command=COMMAND
-use remote COMMAND instead of rsh
-.TP
-\-\-volno\-file=FILE
-use/update the volume number in FILE
-.IP
-Device blocking:
-.TP
-\-b, \-\-blocking\-factor=BLOCKS
-BLOCKS x 512 bytes per record
-.TP
-\-B, \-\-read\-full\-records
-reblock as we read (for 4.2BSD pipes)
-.TP
-\-i, \-\-ignore\-zeros
-ignore zeroed blocks in archive (means EOF)
-.TP
-\-\-record\-size=NUMBER
-NUMBER of bytes per record, multiple of 512
-.IP
-Archive format selection:
-.TP
-\-H, \-\-format=FORMAT
-create archive of the given format
-.IP
-FORMAT is one of the following:
-.TP
-gnu
-GNU tar 1.13.x format
-.TP
-oldgnu
-GNU format as per tar <= 1.12
-.TP
-pax
-POSIX 1003.1\-2001 (pax) format
-.TP
-posix
-same as pax
-.TP
-ustar
-POSIX 1003.1\-1988 (ustar) format
-.TP
-v7
-old V7 tar format
-.TP
-\-\-old\-archive, \-\-portability
-same as \-\-format=v7
-.TP
-\-\-pax\-option=keyword[[:]=value][,keyword[[:]=value]]...
-control pax keywords
-.TP
-\-\-posix
-same as \-\-format=posix
-.TP
-\-V, \-\-label=TEXT
-create archive with volume name TEXT; at
-list/extract time, use TEXT as a globbing pattern
-for volume name
-.IP
-Compression options:
-.TP
-\-a, \-\-auto\-compress
-use archive suffix to determine the compression
-program
-.TP
-\-I, \-\-use\-compress\-program=PROG
-filter through PROG (must accept \-d)
-.TP
-\-j, \-\-bzip2
-filter the archive through bzip2
-.TP
-\-J, \-\-xz
-filter the archive through xz
-.TP
-\-\-lzip
-filter the archive through lzip
-.TP
-\-\-lzma
-filter the archive through lzma
-.HP
-\-\-lzop
-.TP
-\-\-no\-auto\-compress
-do not use archive suffix to determine the
-compression program
-.TP
-\-z, \-\-gzip, \-\-gunzip, \-\-ungzip
-filter the archive through gzip
-.TP
-\-Z, \-\-compress, \-\-uncompress
-filter the archive through compress
-.IP
-Local file selection:
-.TP
-\-\-add\-file=FILE
-add given FILE to the archive (useful if its name
-starts with a dash)
-.TP
-\-\-backup[=CONTROL]
-backup before removal, choose version CONTROL
-.TP
-\-C, \-\-directory=DIR
-change to directory DIR
-.TP
-\-\-exclude=PATTERN
-exclude files, given as a PATTERN
-.TP
-\-\-exclude\-backups
-exclude backup and lock files
-.TP
-\-\-exclude\-caches
-exclude contents of directories containing
-CACHEDIR.TAG, except for the tag file itself
-.TP
-\-\-exclude\-caches\-all
-exclude directories containing CACHEDIR.TAG
-.TP
-\-\-exclude\-caches\-under exclude everything under directories containing
-CACHEDIR.TAG
-.TP
-\-\-exclude\-tag=FILE
-exclude contents of directories containing FILE,
-except for FILE itself
-.HP
-\-\-exclude\-tag\-all=FILE exclude directories containing FILE
-.TP
-\-\-exclude\-tag\-under=FILE
-exclude everything under directories
-containing FILE
-.TP
-\-\-exclude\-vcs
-exclude version control system directories
-.TP
-\-h, \-\-dereference
-follow symlinks; archive and dump the files they
-point to
-.TP
-\-\-hard\-dereference
-follow hard links; archive and dump the files they
-refer to
-.TP
-\-K, \-\-starting\-file=MEMBER\-NAME
-begin at member MEMBER\-NAME when reading the
-archive
-.TP
-\-\-newer\-mtime=DATE
-compare date and time when data changed only
-.TP
-\-\-no\-null
-disable the effect of the previous \-\-null option
-.TP
-\-\-no\-recursion
-avoid descending automatically in directories
-.TP
-\-\-no\-unquote
-do not unquote filenames read with \-T
-.HP
-\-\-null                 \-T reads null\-terminated names, disable \-C
-.TP
-\-N, \-\-newer=DATE\-OR\-FILE, \-\-after\-date=DATE\-OR\-FILE
-only store files newer than DATE\-OR\-FILE
-.TP
-\-\-one\-file\-system
-stay in local file system when creating archive
-.TP
-\-P, \-\-absolute\-names
-don't strip leading '/'s from file names
-.TP
-\-\-recursion
-recurse into directories (default)
-.TP
-\-\-suffix=STRING
-backup before removal, override usual suffix ('~'
-unless overridden by environment variable
-SIMPLE_BACKUP_SUFFIX)
-.TP
-\-T, \-\-files\-from=FILE
-get names to extract or create from FILE
-.TP
-\-\-unquote
-unquote filenames read with \-T (default)
-.TP
-\-X, \-\-exclude\-from=FILE
-exclude patterns listed in FILE
-.IP
-File name transformations:
-.TP
-\-\-strip\-components=NUMBER
-strip NUMBER leading components from file
-names on extraction
-.TP
-\-\-transform=EXPRESSION, \-\-xform=EXPRESSION
-use sed replace EXPRESSION to transform file
-names
-.IP
-File name matching options (affect both exclude and include patterns):
-.TP
-\-\-anchored
-patterns match file name start
-.TP
-\-\-ignore\-case
-ignore case
-.TP
-\-\-no\-anchored
-patterns match after any '/' (default for
-exclusion)
-.TP
-\-\-no\-ignore\-case
-case sensitive matching (default)
-.TP
-\-\-no\-wildcards
-verbatim string matching
-.TP
-\-\-no\-wildcards\-match\-slash
-wildcards do not match '/'
-.TP
-\-\-wildcards
-use wildcards (default for exclusion)
-.TP
-\-\-wildcards\-match\-slash
-wildcards match '/' (default for exclusion)
-.IP
-Informative output:
-.TP
-\-\-checkpoint[=NUMBER]
-display progress messages every NUMBERth record
-(default 10)
-.TP
-\-\-checkpoint\-action=ACTION
-execute ACTION on each checkpoint
-.TP
-\-\-full\-time
-print file time to its full resolution
-.TP
-\-\-index\-file=FILE
-send verbose output to FILE
-.TP
-\-l, \-\-check\-links
-print a message if not all links are dumped
-.TP
-\-\-no\-quote\-chars=STRING
-disable quoting for characters from STRING
-.TP
-\-\-quote\-chars=STRING
-additionally quote characters from STRING
-.TP
-\-\-quoting\-style=STYLE
-set name quoting style; see below for valid STYLE
-values
-.TP
-\-R, \-\-block\-number
-show block number within archive with each message
-.TP
-\-\-show\-defaults
-show tar defaults
-.TP
-\-\-show\-omitted\-dirs
-when listing or extracting, list each directory
-that does not match search criteria
-.TP
-\-\-show\-snapshot\-field\-ranges
-show valid ranges for snapshot\-file fields
-.TP
-\-\-show\-transformed\-names, \-\-show\-stored\-names
-show file or archive names after transformation
-.TP
-\-\-totals[=SIGNAL]
-print total bytes after processing the archive;
-with an argument \- print total bytes when this
-SIGNAL is delivered; Allowed signals are: SIGHUP,
-SIGQUIT, SIGINT, SIGUSR1 and SIGUSR2; the names
-without SIG prefix are also accepted
-.TP
-\-\-utc
-print file modification times in UTC
-.TP
-\-v, \-\-verbose
-verbosely list files processed
-.TP
-\-\-warning=KEYWORD
-warning control
-.TP
-\-w, \-\-interactive, \-\-confirmation
-ask for confirmation for every action
-.IP
-Compatibility options:
-.TP
-\-o
-when creating, same as \-\-old\-archive; when
-extracting, same as \-\-no\-same\-owner
-.IP
-Other options:
-.TP
-\-?, \-\-help
-give this help list
-.TP
-\-\-restrict
-disable use of some potentially harmful options
-.TP
-\-\-usage
-give a short usage message
-.TP
-\-\-version
-print program version
-.PP
-Mandatory or optional arguments to long options are also mandatory or optional
-for any corresponding short options.
-.PP
-The backup suffix is '~', unless set with \-\-suffix or SIMPLE_BACKUP_SUFFIX.
-The version control may be set with \-\-backup or VERSION_CONTROL, values are:
-.TP
-none, off
-never make backups
-.TP
-t, numbered
-make numbered backups
-.TP
-nil, existing
-numbered if numbered backups exist, simple otherwise
-.TP
-never, simple
-always make simple backups
-.PP
-Valid arguments for the \-\-quoting\-style option are:
-.IP
-literal
-shell
-shell\-always
-c
-c\-maybe
-escape
-locale
-clocale
-.PP
-*This* tar defaults to:
-\-\-format=gnu \-f\- \-b20 \-\-quoting\-style=escape
-\-\-rmt\-command=/opt/local/libexec/grmt \-\-rsh\-command=/usr/bin/rsh
-.SH AUTHOR
-Written by John Gilmore and Jay Fenlason.
-.SH "REPORTING BUGS"
-Report bugs to <bug\-tar@gnu.org>.
-.SH COPYRIGHT
-Copyright \(co 2013 Free Software Foundation, Inc.
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
-.br
-This is free software: you are free to change and redistribute it.
-There is NO WARRANTY, to the extent permitted by law.
-.SH "SEE ALSO"
-The full documentation for
-.B tar
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B tar
-programs are properly installed at your site, the command
-.IP
-.B info tar
-.PP
-should give you access to the complete manual.

archivers/gtar-base/patches/patch-Makefile.in

@@ -0,0 +1,16 @@
+$NetBSD: patch-Makefile.in,v 1.1 2014/08/21 20:44:16 wiz Exp $
+
+Don't install documentation with this package, it is in gtar-info
+(to reduce dependencies when gtar is used for bootstrapping).
+
+--- Makefile.in.orig	2014-07-27 20:33:48.000000000 +0000
++++ Makefile.in
+@@ -1278,7 +1278,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ ACLOCAL_AMFLAGS = -I m4
+ EXTRA_DIST = ChangeLog.1 Make.rules
+-SUBDIRS = doc gnu lib rmt src scripts po tests
++SUBDIRS = gnu lib rmt src scripts po tests
+ gen_start_date = 2009-03-06
+ prev_change_log = ChangeLog.CVS
+ changelog_dir = .

archivers/gtar-base/patches/patch-ad

@@ -1,17 +0,0 @@
-$NetBSD: patch-ad,v 1.11 2011/05/11 07:49:59 adam Exp $
-
-Don't install documentation with this package, it is in
-gtar-info (to reduce dependencies when gtar is used for
-bootstrapping).
-
---- Makefile.in.orig	2010-11-07 13:53:49.000000000 +0000
-+++ Makefile.in
-@@ -1028,7 +1028,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- ACLOCAL_AMFLAGS = -I m4
- EXTRA_DIST = ChangeLog.1 Make.rules
--SUBDIRS = doc gnu lib rmt src scripts po tests
-+SUBDIRS = gnu lib rmt src scripts po tests
- gen_start_date = 2009-03-06
- prev_change_log = ChangeLog.CVS
- changelog_dir = .

archivers/gtar-base/patches/patch-configure

@@ -0,0 +1,207 @@
+$NetBSD: patch-configure,v 1.1 2014/08/21 20:44:16 wiz Exp $
+
+* Make GNU tar 1.28 detect the presence of the GNU/Linux xattrs
+  interface it expects.
+
+  Upstream report:
+
+    https://lists.gnu.org/archive/html/bug-tar/2014-08/msg00001.html
+
+--- configure.orig	2014-07-27 20:33:47.000000000 +0000
++++ configure
+@@ -663,8 +663,6 @@ RSH
+ LIBOBJS
+ TAR_COND_GRANTPT_FALSE
+ TAR_COND_GRANTPT_TRUE
+-TAR_LIB_ATTR_FALSE
+-TAR_LIB_ATTR_TRUE
+ TAR_COND_XATTR_H_FALSE
+ TAR_COND_XATTR_H_TRUE
+ GNULIB_TEST_WARN_CFLAGS
+@@ -34994,41 +34975,6 @@ else
+   TAR_COND_XATTR_H_FALSE=
+ fi
+ 
+-   if false; then
+-  TAR_LIB_ATTR_TRUE=
+-  TAR_LIB_ATTR_FALSE='#'
+-else
+-  TAR_LIB_ATTR_TRUE='#'
+-  TAR_LIB_ATTR_FALSE=
+-fi
+-
+-  if test "$ac_cv_header_sys_xattr_h" = yes; then
+-    for ac_func in getxattr  fgetxattr  lgetxattr \
+-                   setxattr  fsetxattr  lsetxattr \
+-                   listxattr flistxattr llistxattr
+-do :
+-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+- # only when functions are present
+-
+-$as_echo "#define HAVE_SYS_XATTR_H 1" >>confdefs.h
+-
+-        if test "$with_xattrs" != no; then
+-
+-$as_echo "#define HAVE_XATTRS /**/" >>confdefs.h
+-
+-        fi
+-
+-fi
+-done
+-
+-  fi
+-
+-  # If <sys/xattr.h> is not found, then check for <attr/xattr.h>
+   if test "$ac_cv_header_sys_xattr_h" != yes; then
+     for ac_header in attr/xattr.h
+ do :
+@@ -35050,13 +34996,20 @@ else
+   TAR_COND_XATTR_H_FALSE=
+ fi
+ 
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgetxattr in -lattr" >&5
+-$as_echo_n "checking for fgetxattr in -lattr... " >&6; }
+-if ${ac_cv_lib_attr_fgetxattr+:} false; then :
++  fi
++
++          if test "$with_xattrs" != no; then
++    for i in getxattr  fgetxattr  lgetxattr \
++             setxattr  fsetxattr  lsetxattr \
++             listxattr flistxattr llistxattr
++    do
++      as_ac_Search=`$as_echo "ac_cv_search_$i" | $as_tr_sh`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing $i" >&5
++$as_echo_n "checking for library containing $i... " >&6; }
++if eval \${$as_ac_Search+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lattr  $LIBS"
++  ac_func_search_save_LIBS=$LIBS
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -35066,68 +35019,57 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char fgetxattr ();
++char $i ();
+ int
+ main ()
+ {
+-return fgetxattr ();
++return $i ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_attr_fgetxattr=yes
+-else
+-  ac_cv_lib_attr_fgetxattr=no
++for ac_lib in '' attr; do
++  if test -z "$ac_lib"; then
++    ac_res="none required"
++  else
++    ac_res=-l$ac_lib
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++  fi
++  if ac_fn_c_try_link "$LINENO"; then :
++  eval "$as_ac_Search=\$ac_res"
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_attr_fgetxattr" >&5
+-$as_echo "$ac_cv_lib_attr_fgetxattr" >&6; }
+-if test "x$ac_cv_lib_attr_fgetxattr" = xyes; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBATTR 1
+-_ACEOF
+-
+-  LIBS="-lattr $LIBS"
+-
++    conftest$ac_exeext
++  if eval \${$as_ac_Search+:} false; then :
++  break
+ fi
++done
++if eval \${$as_ac_Search+:} false; then :
+ 
+-     if test "$ac_cv_lib_attr_fgetxattr" = yes; then
+-  TAR_LIB_ATTR_TRUE=
+-  TAR_LIB_ATTR_FALSE='#'
+ else
+-  TAR_LIB_ATTR_TRUE='#'
+-  TAR_LIB_ATTR_FALSE=
++  eval "$as_ac_Search=no"
++fi
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
+ fi
++eval ac_res=\$$as_ac_Search
++	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++eval ac_res=\$$as_ac_Search
++if test "$ac_res" != no; then :
++  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+ 
+-    if test "$ac_cv_header_attr_xattr_h" = yes; then
+-      for ac_func in getxattr  fgetxattr  lgetxattr \
+-                     setxattr  fsetxattr  lsetxattr \
+-                     listxattr flistxattr llistxattr
+-do :
+-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+- # only when functions are present
++fi
+ 
+-$as_echo "#define HAVE_ATTR_XATTR_H 1" >>confdefs.h
++      eval found=\$ac_cv_search_$i
++      test "$found" = "no" && break
++    done
+ 
+-          if test "$with_xattrs" != no; then
++    if test "$found" != no; then
+ 
+ $as_echo "#define HAVE_XATTRS /**/" >>confdefs.h
+ 
+           fi
+-
+-fi
+-done
+-
+-    fi
+   fi
+ 
+ 
+@@ -38187,18 +37836,10 @@ if test -z "${TAR_COND_XATTR_H_TRUE}" &&
+   as_fn_error $? "conditional \"TAR_COND_XATTR_H\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+-if test -z "${TAR_LIB_ATTR_TRUE}" && test -z "${TAR_LIB_ATTR_FALSE}"; then
+-  as_fn_error $? "conditional \"TAR_LIB_ATTR\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+ if test -z "${TAR_COND_XATTR_H_TRUE}" && test -z "${TAR_COND_XATTR_H_FALSE}"; then
+   as_fn_error $? "conditional \"TAR_COND_XATTR_H\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+-if test -z "${TAR_LIB_ATTR_TRUE}" && test -z "${TAR_LIB_ATTR_FALSE}"; then
+-  as_fn_error $? "conditional \"TAR_LIB_ATTR\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+ if test -z "${TAR_COND_GRANTPT_TRUE}" && test -z "${TAR_COND_GRANTPT_FALSE}"; then
+   as_fn_error $? "conditional \"TAR_COND_GRANTPT\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5

archivers/gtar-base/patches/patch-lib_xattr-at.c

@@ -0,0 +1,33 @@
+$NetBSD: patch-lib_xattr-at.c,v 1.1 2014/08/21 20:44:16 wiz Exp $
+
+* Make GNU tar 1.28 detect the presence of the GNU/Linux xattrs
+  interface it expects.
+
+  Upstream report:
+
+    https://lists.gnu.org/archive/html/bug-tar/2014-08/msg00001.html
+
+  In this patch, quoting from the upstream patch by Pavel Raiskup:
+
+    Do not build when HAVE_XATTRS is not defined.
+
+--- lib/xattr-at.c.orig	2014-02-10 11:42:45.000000000 -0600
++++ lib/xattr-at.c	2014-08-19 09:40:54.000000000 -0500
+@@ -18,6 +18,11 @@
+ 
+ #include <config.h>
+ 
++/* Temporarily don't build.  We are unable to build on (probably not only)
++   darwin due to lack of l*xattr callbacks (XATTR_NOFOLLOW is alternative) and
++   different function definitions. */
++#ifdef HAVE_XATTRS
++
+ #include "xattr-at.h"
+ #include "openat.h"
+ 
+@@ -108,3 +113,5 @@
+ #undef AT_FUNC_RESULT
+ #undef AT_FUNC_POST_FILE_PARAM_DECLS
+ #undef AT_FUNC_POST_FILE_ARGS
++
++#endif

archivers/gtar-base/patches/patch-src_Makefile.in

@@ -0,0 +1,29 @@
+$NetBSD: patch-src_Makefile.in,v 1.3 2014/08/21 20:44:16 wiz Exp $
+
+* Make GNU tar 1.28 detect the presence of the GNU/Linux xattrs
+  interface it expects.
+
+  Upstream report:
+
+    https://lists.gnu.org/archive/html/bug-tar/2014-08/msg00001.html
+
+--- src/Makefile.in.orig	2014-07-27 20:33:48.000000000 +0000
++++ src/Makefile.in
+@@ -99,7 +99,6 @@ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+ bin_PROGRAMS = tar$(EXEEXT)
+-@TAR_LIB_ATTR_TRUE@am__append_1 = -lattr
+ subdir = src
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ 	$(top_srcdir)/build-aux/depcomp $(noinst_HEADERS)
+@@ -1225,8 +1224,7 @@ tar_SOURCES = \
+ AM_CPPFLAGS = -I$(top_srcdir)/gnu -I../ -I../gnu -I$(top_srcdir)/lib -I../lib
+ AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
+ LDADD = ../lib/libtar.a ../gnu/libgnu.a $(LIBINTL) $(LIBICONV)
+-tar_LDADD = $(LIBS) $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS) \
+-	$(LIB_SELINUX) $(am__append_1)
++tar_LDADD = $(LIBS) $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS) $(LIB_SELINUX)
+ all: all-am
+ 
+ .SUFFIXES:

archivers/gtar-base/patches/patch-src_system.c

@@ -0,0 +1,46 @@
+$NetBSD: patch-src_system.c,v 1.2 2015/01/26 12:41:53 jperkin Exp $
+
+Do not call into gettext which may not be async-signal-safe in between fork
+and exec.  Fixes crashes on OSX when LC_ALL is unset.
+
+Thanks to http://article.gmane.org/gmane.os.macosx.fink.devel/21882 for the
+diagnosis and fix.
+
+--- src/system.c.orig	2014-02-25 22:26:02.000000000 +0000
++++ src/system.c
+@@ -344,7 +344,7 @@ sys_child_open_for_compress (void)
+ 
+   /* The new born child tar is here!  */
+ 
+-  set_program_name (_("tar (child)"));
++  set_program_name (N_("tar (child)"));
+   signal (SIGPIPE, SIG_DFL);
+ 
+   xdup2 (parent_pipe[PREAD], STDIN_FILENO);
+@@ -389,7 +389,7 @@ sys_child_open_for_compress (void)
+     {
+       /* The newborn grandchild tar is here!  Launch the compressor.  */
+ 
+-      set_program_name (_("tar (grandchild)"));
++      set_program_name (N_("tar (grandchild)"));
+ 
+       xdup2 (child_pipe[PWRITE], STDOUT_FILENO);
+       xclose (child_pipe[PREAD]);
+@@ -523,7 +523,7 @@ sys_child_open_for_uncompress (void)
+ 
+   /* The newborn child tar is here!  */
+ 
+-  set_program_name (_("tar (child)"));
++  set_program_name (N_("tar (child)"));
+   signal (SIGPIPE, SIG_DFL);
+ 
+   xdup2 (parent_pipe[PWRITE], STDOUT_FILENO);
+@@ -558,7 +558,7 @@ sys_child_open_for_uncompress (void)
+     {
+       /* The newborn grandchild tar is here!  Launch the uncompressor.  */
+ 
+-      set_program_name (_("tar (grandchild)"));
++      set_program_name (N_("tar (grandchild)"));
+ 
+       xdup2 (child_pipe[PREAD], STDIN_FILENO);
+       xclose (child_pipe[PWRITE]);

archivers/gtar-info/Makefile

@@ -1,19 +1,11 @@
-# $NetBSD: Makefile,v 1.33 2014/02/24 08:16:56 adam Exp $
+# $NetBSD: Makefile,v 1.35 2014/10/09 13:44:32 wiz Exp $
+
+.include "../../archivers/gtar/Makefile.common"
 
-DISTNAME=	tar-1.27.1
 PKGNAME=	${DISTNAME:S/tar/gtar-info/}
-SVR4_PKGNAME=	gtari
-CATEGORIES=	archivers
-MASTER_SITES=	${MASTER_SITE_GNU:=tar/}
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.gnu.org/software/tar/tar.html
 COMMENT=	Info format documentation for the GNU tape archiver
 LICENSE=	gnu-fdl-v1.1
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 NO_CONFIGURE=		yes
 NO_BUILD=		yes
 INFO_FILES=		yes

archivers/gtar-info/distinfo

@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.12 2014/02/24 08:16:56 adam Exp $
-
-SHA1 (tar-1.27.1.tar.bz2) = 67aa31d0d497849c05ba5ea6eb41cff130407751
-RMD160 (tar-1.27.1.tar.bz2) = a99ccfd874ac72c1e0feec2d86423c3e5bcd19fb
-Size (tar-1.27.1.tar.bz2) = 2573070 bytes

archivers/gtar/Makefile

@@ -1,12 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2014/02/24 08:16:56 adam Exp $
+# $NetBSD: Makefile,v 1.44 2014/08/17 16:28:18 wiz Exp $
 
-DISTNAME=	gtar-1.27.1
-CATEGORIES=	archivers
-MASTER_SITES=	# empty
-DISTFILES=	# empty
+.include "../../archivers/gtar/Makefile.common"
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.gnu.org/software/tar/tar.html
+PKGNAME=	g${DISTNAME}
 COMMENT=	The "meta-package" for the GNU tape archiver (tar)
 LICENSE=	gnu-gpl-v3 AND gnu-fdl-v1.1
 
@@ -15,6 +11,4 @@ META_PACKAGE=	yes
 DEPENDS+=	gtar-base-${PKGVERSION_NOREV}{,nb*}:../../archivers/gtar-base
 DEPENDS+=	gtar-info-${PKGVERSION_NOREV}{,nb*}:../../archivers/gtar-info
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 .include "../../mk/bsd.pkg.mk"

archivers/gtar/Makefile.common

@@ -0,0 +1,18 @@
+# $NetBSD: Makefile.common,v 1.1 2014/08/17 16:28:18 wiz Exp $
+#
+# used by archivers/gtar-base/Makefile
+# used by archivers/gtar-info/Makefile
+# used by archivers/gtar/Makefile
+
+DISTNAME=	tar-1.28
+CATEGORIES=	archivers
+MASTER_SITES=	${MASTER_SITE_GNU:=tar/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.gnu.org/software/tar/tar.html
+COMMENT=	The GNU tape archiver with remote magnetic tape support
+LICENSE=	gnu-gpl-v3
+
+PATCHDIR=	${.CURDIR}/../../archivers/gtar-base/patches
+DISTINFO_FILE=	${.CURDIR}/../../archivers/gtar-base/distinfo

archivers/gzip/Makefile

@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2013/10/29 13:32:07 obache Exp $
+# $NetBSD: Makefile,v 1.31 2014/10/09 14:05:51 wiz Exp $
 
 DISTNAME=	gzip-1.6
-SVR4_PKGNAME=	gzip
 CATEGORIES=	archivers
 #MASTER_SITES=	${MASTER_SITE_GNU:=gzip/}
 #EXTRACT_SUFX=	.tar.xz
@@ -13,8 +12,6 @@ HOMEPAGE=	http://www.gnu.org/software/gzip/gzip.html
 COMMENT=	Compress or expand files
 LICENSE=	gnu-gpl-v2
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 CONFLICTS+=		gzip-base-[0-9]* gzip-info-[0-9]*
 
 GNU_CONFIGURE=	yes

archivers/gzrecover/Makefile

@@ -1,21 +1,25 @@
-# $NetBSD: Makefile,v 1.8 2012/09/11 19:46:55 asau Exp $
+# $NetBSD: Makefile,v 1.11 2014/12/15 11:55:04 jperkin Exp $
 #
 
-DISTNAME=		gzrt-0.5
-PKGNAME=		gzrecover-0.5
+DISTNAME=		gzrt-0.8
+PKGNAME=		gzrecover-0.8
 CATEGORIES=		archivers
 MASTER_SITES=		http://www.urbanophile.com/arenn/hacking/gzrt/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.urbanophile.com/arenn/hacking/gzrt/
 COMMENT=		GZip Recovery Toolkit
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
+LICENSE=		gnu-gpl-v2
 
 BUILD_TARGET=		gzrecover
 
 INSTALLATION_DIRS=	bin
 
+SUBST_CLASSES+=		lz
+SUBST_STAGE.lz=		pre-configure
+SUBST_FILES.lz=		Makefile
+SUBST_SED.lz=		-e 's|-lz|-L${BUILDLINK_PREFIX.zlib}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.zlib}/lib -lz|g'
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gzrecover ${DESTDIR}${PREFIX}/bin
 

archivers/gzrecover/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2008/04/24 21:19:31 wiz Exp $
+$NetBSD: distinfo,v 1.4 2014/11/20 07:41:06 mef Exp $
 
-SHA1 (gzrt-0.5.tar.gz) = 99f1320dc795da666cd17d331c359e5c2433c129
-RMD160 (gzrt-0.5.tar.gz) = e14e80de9b5e9abee8c68e6f2a9164c038b1d3a9
-Size (gzrt-0.5.tar.gz) = 5559 bytes
+SHA1 (gzrt-0.8.tar.gz) = a354901b7aa2192bafdc34f43fbfde3cd7de2822
+RMD160 (gzrt-0.8.tar.gz) = 3d35163f9351f1f496f69a143b0353448de50b22
+Size (gzrt-0.8.tar.gz) = 7311 bytes

archivers/ha/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2013/09/18 20:58:35 asau Exp $
+# $NetBSD: Makefile,v 1.32 2014/10/09 14:05:51 wiz Exp $
 
 DISTNAME=	ha0999
 PKGNAME=	ha-0.999b
@@ -10,8 +10,6 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	The HA archiver using the HSC compression method
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 WRKSRC=		${WRKDIR}
 
 MAKE_FILE=	makefile.nix

archivers/hpack/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2012/09/11 19:46:55 asau Exp $
+# $NetBSD: Makefile,v 1.38 2014/10/09 14:05:52 wiz Exp $
 
 DISTNAME=	hpack79src
 PKGNAME=	hpack-0.79
@@ -9,8 +9,6 @@ MASTER_SITES=	ftp://ftp.franken.de/pub/crypt/misc/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Multi-System Archiver with open keys PGP-based security
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 CRYPTO=		yes
 
 DIST_SUBDIR=	${PKGNAME_NOREV}

archivers/hs-zlib/DESCR

@@ -0,0 +1,8 @@
+This package provides a pure interface for compressing and decompressing
+streams of data represented as lazy ByteStrings. It uses the zlib C library
+so it has high performance. It supports the "zlib", "gzip" and "raw"
+compression formats.
+
+It provides a convenient high level API suitable for most tasks and for the
+few cases where more control is needed it provides access to the full zlib
+feature set.

archivers/hs-zlib/Makefile

@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2014/08/12 21:22:13 szptvlfn Exp $
+
+DISTNAME=	zlib-0.5.4.1
+CATEGORIES=	archivers
+
+MAINTAINER=	pho@cielonegro.org
+COMMENT=	Compression and decompression in the gzip and zlib formats
+LICENSE=	modified-bsd
+
+.include "../../mk/haskell.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"

archivers/hs-zlib/PLIST

@@ -0,0 +1,29 @@
+@comment $NetBSD: PLIST,v 1.1 2014/08/12 21:22:13 szptvlfn Exp $
+lib/zlib-${PKGVERSION}/${HASKELL_VERSION}/Codec/Compression/GZip.hi
+lib/zlib-${PKGVERSION}/${HASKELL_VERSION}/Codec/Compression/Zlib.hi
+lib/zlib-${PKGVERSION}/${HASKELL_VERSION}/Codec/Compression/Zlib/Internal.hi
+lib/zlib-${PKGVERSION}/${HASKELL_VERSION}/Codec/Compression/Zlib/Raw.hi
+lib/zlib-${PKGVERSION}/${HASKELL_VERSION}/Codec/Compression/Zlib/Stream.hi
+lib/zlib-${PKGVERSION}/${HASKELL_VERSION}/HSzlib-${PKGVERSION}.o
+lib/zlib-${PKGVERSION}/${HASKELL_VERSION}/libHSzlib-${PKGVERSION}.a
+lib/zlib-${PKGVERSION}/${HASKELL_VERSION}/package-description
+share/doc/zlib-${PKGVERSION}/LICENSE
+${PLIST.doc}share/doc/zlib-${PKGVERSION}/html/Codec-Compression-GZip.html
+${PLIST.doc}share/doc/zlib-${PKGVERSION}/html/Codec-Compression-Zlib-Internal.html
+${PLIST.doc}share/doc/zlib-${PKGVERSION}/html/Codec-Compression-Zlib-Raw.html
+${PLIST.doc}share/doc/zlib-${PKGVERSION}/html/Codec-Compression-Zlib.html
+${PLIST.doc}share/doc/zlib-${PKGVERSION}/html/doc-index.html
+${PLIST.doc}share/doc/zlib-${PKGVERSION}/html/frames.html
+${PLIST.doc}share/doc/zlib-${PKGVERSION}/html/haddock-util.js
+${PLIST.doc}share/doc/zlib-${PKGVERSION}/html/hslogo-16.png
+${PLIST.doc}share/doc/zlib-${PKGVERSION}/html/index-frames.html
+${PLIST.doc}share/doc/zlib-${PKGVERSION}/html/index.html
+${PLIST.doc}share/doc/zlib-${PKGVERSION}/html/mini_Codec-Compression-GZip.html
+${PLIST.doc}share/doc/zlib-${PKGVERSION}/html/mini_Codec-Compression-Zlib-Internal.html
+${PLIST.doc}share/doc/zlib-${PKGVERSION}/html/mini_Codec-Compression-Zlib-Raw.html
+${PLIST.doc}share/doc/zlib-${PKGVERSION}/html/mini_Codec-Compression-Zlib.html
+${PLIST.doc}share/doc/zlib-${PKGVERSION}/html/minus.gif
+${PLIST.doc}share/doc/zlib-${PKGVERSION}/html/ocean.css
+${PLIST.doc}share/doc/zlib-${PKGVERSION}/html/plus.gif
+${PLIST.doc}share/doc/zlib-${PKGVERSION}/html/synopsis.png
+${PLIST.doc}share/doc/zlib-${PKGVERSION}/html/zlib.haddock

archivers/hs-zlib/buildlink3.mk

@@ -0,0 +1,15 @@
+# $NetBSD: buildlink3.mk,v 1.2 2014/08/29 14:08:38 szptvlfn Exp $
+
+BUILDLINK_TREE+=	hs-zlib
+
+.if !defined(HS_ZLIB_BUILDLINK3_MK)
+HS_ZLIB_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.hs-zlib+=	hs-zlib>=0.5.4
+BUILDLINK_ABI_DEPENDS.hs-zlib+=	hs-zlib>=0.5.4.1
+BUILDLINK_PKGSRCDIR.hs-zlib?=	../../archivers/hs-zlib
+
+.include "../../devel/zlib/buildlink3.mk"
+.endif	# HS_ZLIB_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-hs-zlib

archivers/hs-zlib/distinfo

@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2014/08/12 21:22:13 szptvlfn Exp $
+
+SHA1 (zlib-0.5.4.1.tar.gz) = ac9b93c09801df507091eece3913d2102dbeabaf
+RMD160 (zlib-0.5.4.1.tar.gz) = 9ed49e79e239604958a9c385cca75747fafc2713
+Size (zlib-0.5.4.1.tar.gz) = 127760 bytes

archivers/jamjar/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2012/10/13 09:34:49 skrll Exp $
+# $NetBSD: Makefile,v 1.20 2014/10/09 14:05:52 wiz Exp $
 #
 
 DISTNAME=	jamjar-0.7.1
@@ -11,8 +11,6 @@ COMMENT=	Acunia version of the jar archiver
 
 BUILD_DEPENDS+=	acunia-jam>=1.0:../../devel/acunia-jam
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 WRKSRC=		${WRKDIR}/jamjar
 
 EVAL_PREFIX+=	ACUNIA_JAM_PREFIX=acunia-jam

archivers/lbrate/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/09/11 19:46:56 asau Exp $
+# $NetBSD: Makefile,v 1.15 2014/10/09 14:05:52 wiz Exp $
 
 DISTNAME=	lbrate-1.1
 PKGREVISION=	1
@@ -9,8 +9,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://rus.members.beeb.net/lbrate.html
 COMMENT=	Extract/decompress CP/M LBR archives
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 MAKE_FLAGS+=	PREFIX=${PREFIX:Q}
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/doc/lbrate

archivers/lcab/Makefile

@@ -1,15 +1,13 @@
-# $NetBSD: Makefile,v 1.13 2012/09/11 19:46:56 asau Exp $
+# $NetBSD: Makefile,v 1.15 2014/12/30 08:18:52 plunky Exp $
 #
 
 DISTNAME=		lcab-1.0b12
 CATEGORIES=		archivers
 MASTER_SITES=		${MASTER_SITE_FREEBSD}
 
-MAINTAINER=		plunky@rya-online.net
 HOMEPAGE=		http://ohnopub.net/~ohnobinki/lcab
 COMMENT=		Microsoft cabinet (.CAB) file creator
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
+LICENSE=		gnu-gpl-v2
 
 GNU_CONFIGURE=		yes
 

archivers/lha/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2012/09/11 19:46:56 asau Exp $
+# $NetBSD: Makefile,v 1.39 2014/10/09 14:05:52 wiz Exp $
 
 DISTNAME=	lha-114i
 PKGNAME=	lha-114.9
@@ -17,8 +17,6 @@ NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_FTP=	${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 .include "../../mk/bsd.prefs.mk"
 
 MAKE_FLAGS+=	MAKE=${MAKE_PROGRAM:Q}

archivers/libarchive/Makefile

@@ -1,21 +1,12 @@
-# $NetBSD: Makefile,v 1.39 2014/02/12 23:17:32 tron Exp $
-#
+# $NetBSD: Makefile,v 1.41 2015/01/17 12:44:47 adam Exp $
 
-DISTNAME=	libarchive-2.8.4
-PKGREVISION=	3
-CATEGORIES=	archivers
-MASTER_SITES=	# empty
-DISTFILES=	# empty
+.include "Makefile.common"
 
-MAINTAINER=	joerg@NetBSD.org
-HOMEPAGE=	http://code.google.com/p/libarchive/
 COMMENT=	Library to read/create different archive formats
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-
-CONFIGURE_ARGS+=	--disable-bsdtar --without-expat --without-xml2 \
-			--disable-bsdcpio
+USE_LIBTOOL=		yes
+CONFIGURE_ARGS+=	--disable-bsdcpio
+CONFIGURE_ARGS+=	--disable-bsdtar
 
 do-extract:
 	${CP} -r ${FILESDIR} ${WRKSRC}
@@ -24,7 +15,7 @@ do-extract:
 
 .if ${OPSYS} == SunOS
 # workaround for pkg/45491
-CONFIGURE_ENV+=	ac_cv_header_ext2fs_ext2_fs_h=no
+CONFIGURE_ENV+=		ac_cv_header_ext2fs_ext2_fs_h=no
 .endif
 
 .include "../../archivers/bzip2/buildlink3.mk"

archivers/libarchive/Makefile.common

@@ -0,0 +1,19 @@
+# $NetBSD: Makefile.common,v 1.2 2015/02/08 00:14:33 wiz Exp $
+# used by archivers/bsdtar/Makefile
+# used by archivers/libarchive/Makefile
+
+DISTNAME=	libarchive-3.1.2
+CATEGORIES=	archivers
+MASTER_SITES=	http://www.libarchive.org/downloads/
+DISTFILES=	# empty
+
+MAINTAINER?=	joerg@NetBSD.org
+HOMEPAGE=	http://www.libarchive.org/
+LICENSE=	2-clause-bsd
+
+TEST_TARGET=		check
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--without-expat
+CONFIGURE_ARGS+=	--without-lzo2
+CONFIGURE_ARGS+=	--without-nettle
+CONFIGURE_ARGS+=	--without-xml2

archivers/libarchive/PLIST

@@ -1,16 +1,42 @@
-@comment $NetBSD: PLIST,v 1.7 2010/02/20 03:56:14 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2015/01/17 12:44:47 adam Exp $
 include/archive.h
 include/archive_entry.h
 lib/libarchive.la
 lib/pkgconfig/libarchive.pc
 man/man3/archive_entry.3
+man/man3/archive_entry_acl.3
+man/man3/archive_entry_linkify.3
+man/man3/archive_entry_paths.3
+man/man3/archive_entry_perms.3
+man/man3/archive_entry_stat.3
+man/man3/archive_entry_time.3
 man/man3/archive_read.3
+man/man3/archive_read_data.3
 man/man3/archive_read_disk.3
+man/man3/archive_read_extract.3
+man/man3/archive_read_filter.3
+man/man3/archive_read_format.3
+man/man3/archive_read_free.3
+man/man3/archive_read_header.3
+man/man3/archive_read_new.3
+man/man3/archive_read_open.3
+man/man3/archive_read_set_options.3
 man/man3/archive_util.3
 man/man3/archive_write.3
+man/man3/archive_write_blocksize.3
+man/man3/archive_write_data.3
 man/man3/archive_write_disk.3
-man/man3/libarchive_internals.3
+man/man3/archive_write_filter.3
+man/man3/archive_write_finish_entry.3
+man/man3/archive_write_format.3
+man/man3/archive_write_free.3
+man/man3/archive_write_header.3
+man/man3/archive_write_new.3
+man/man3/archive_write_open.3
+man/man3/archive_write_set_options.3
 man/man3/libarchive.3
+man/man3/libarchive_changes.3
+man/man3/libarchive_internals.3
 man/man5/cpio.5
 man/man5/libarchive-formats.5
 man/man5/mtree.5

archivers/libarchive/buildlink3.mk

@@ -1,17 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.7 2012/05/07 01:53:12 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2015/01/17 12:44:47 adam Exp $
 
 BUILDLINK_TREE+=	libarchive
 
 .if !defined(LIBARCHIVE_BUILDLINK3_MK)
 LIBARCHIVE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libarchive+=	libarchive>=2.2
-BUILDLINK_ABI_DEPENDS.libarchive+=	libarchive>=2.8.4nb1
+BUILDLINK_API_DEPENDS.libarchive+=	libarchive>=3.1
+BUILDLINK_ABI_DEPENDS.libarchive+=	libarchive>=3.1.2
 BUILDLINK_PKGSRCDIR.libarchive?=	../../archivers/libarchive
 
-CHECK_BUILTIN.libarchive:=     yes
+CHECK_BUILTIN.libarchive:=	yes
 .include "../../archivers/libarchive/builtin.mk"
-CHECK_BUILTIN.libarchive:=     no
+CHECK_BUILTIN.libarchive:=	no
 
 # A built-in libarchive is always using built-in zlib, bzip2, and xz.
 .if empty(USE_BUILTIN.libarchive:M[yY][eE][sS])

archivers/libarchive/files/COPYING

@@ -16,8 +16,8 @@ the actual statements in the files are controlling.
   a 3-clause UC Regents copyright; please read the individual source
   files for details:
    libarchive/archive_entry.c
-   libarchive/archive_read_support_compression_compress.c
-   libarchive/archive_write_set_compression_compress.c
+   libarchive/archive_read_support_filter_compress.c
+   libarchive/archive_write_set_filter_compress.c
    libarchive/mtree.5
    tar/matching.c
 

archivers/libarchive/files/INSTALL

@@ -19,7 +19,7 @@ configure script and other build files:
 To create a distribution, please use the 'distcheck' target:
     /bin/sh build/autogen.sh && ./configure && make distcheck
 
-On non-Unix-like systems, use the "cmake" utility (available from
+On Unix-like and non-Unix-like systems, use the "cmake" utility (available from
 http://cmake.org/) to generate suitable build files for your platform.
 Cmake requires the name of the directory containing CmakeLists.txt and
 the "generator" to use for your build environment.  For example, to
@@ -27,4 +27,9 @@ build with Xcode on Mac OS, you can use the following command:
     cmake -G "Xcode" ~/libarchive-download-dir/
 The result will be appropriate makefiles, solution files, or project
 files that can be used with the corresponding development tool.
+The default on Unix-like systems is to generate Makefiles, so you
+can also use cmake instead of the configure script:
+    cmake ~/libarchive-download-dir/
+    make
+    make install
 See the libarchive Wiki or the cmake site for further documentation.

archivers/libarchive/files/Makefile.am

@@ -21,10 +21,11 @@ TESTS= libarchive_test $(bsdtar_test_programs) $(bsdcpio_test_programs)
 TESTS_ENVIRONMENT= $(libarchive_TESTS_ENVIRONMENT) $(bsdtar_TESTS_ENVIRONMENT) $(bsdcpio_TESTS_ENVIRONMENT)
 # Always build and test both bsdtar and bsdcpio as part of 'distcheck'
 DISTCHECK_CONFIGURE_FLAGS = --enable-bsdtar --enable-bsdcpio
-# Uncommenting this line can help diagnose some errors.  This is ordinarily
-# enabled in the libarchive development branch but is disabled
-# for libarchive production releases.
-#AM_CFLAGS=-Wall -Werror
+COMMON_CFLAGS=-Wall -Wformat -Wformat-security
+# The next line is commented out by default in shipping libarchive releases.
+# It is uncommented by default in trunk.
+# DEV_CFLAGS=-Werror -Wextra -Wunused -Wshadow -Wmissing-prototypes -Wcast-qual
+AM_CFLAGS=$(COMMON_CFLAGS) $(DEV_CFLAGS)
 PLATFORMCPPFLAGS = @PLATFORMCPPFLAGS@
 AM_CPPFLAGS=$(PLATFORMCPPFLAGS)
 
@@ -38,7 +39,6 @@ EXTRA_DIST= \
 	build/clean.sh			\
 	build/cmake			\
 	build/version			\
-	build/windows			\
 	contrib				\
 	doc				\
 	examples			\
@@ -60,12 +60,6 @@ dist-hook:
 	-rm -f $(distdir)/*/Makefile $(distdir)/*/*/Makefile
 	cd $(distdir)/doc && /bin/sh update.sh
 
-# Verify cmake builds as part of the acceptance
-distcheck-hook:
-	mkdir $(distdir)/_build/cmtest
-	cd $(distdir)/_build/cmtest && cmake ../.. && make && make test
-	rm -rf $(distdir)/_build/cmtest
-
 #
 # Extra rules for cleanup
 #
@@ -93,24 +87,43 @@ distclean-local:
 include_HEADERS= libarchive/archive.h libarchive/archive_entry.h
 
 libarchive_la_SOURCES=						\
+	libarchive/archive_acl.c				\
+	libarchive/archive_acl_private.h			\
 	libarchive/archive_check_magic.c			\
+	libarchive/archive_cmdline.c				\
+	libarchive/archive_cmdline_private.h			\
 	libarchive/archive_crc32.h				\
+	libarchive/archive_crypto.c				\
+	libarchive/archive_crypto_private.h			\
 	libarchive/archive_endian.h				\
 	libarchive/archive_entry.c				\
 	libarchive/archive_entry.h				\
 	libarchive/archive_entry_copy_stat.c			\
 	libarchive/archive_entry_link_resolver.c		\
+	libarchive/archive_entry_locale.h			\
 	libarchive/archive_entry_private.h			\
+	libarchive/archive_entry_sparse.c			\
 	libarchive/archive_entry_stat.c				\
 	libarchive/archive_entry_strmode.c			\
 	libarchive/archive_entry_xattr.c			\
-	libarchive/archive_hash.h				\
+	libarchive/archive_getdate.c				\
+	libarchive/archive_match.c				\
+	libarchive/archive_options.c				\
+	libarchive/archive_options_private.h			\
+	libarchive/archive_pathmatch.c				\
+	libarchive/archive_pathmatch.h				\
 	libarchive/archive_platform.h				\
+	libarchive/archive_ppmd_private.h			\
+	libarchive/archive_ppmd7.c				\
+	libarchive/archive_ppmd7_private.h			\
 	libarchive/archive_private.h				\
+	libarchive/archive_rb.c					\
+	libarchive/archive_rb.h					\
 	libarchive/archive_read.c				\
+	libarchive/archive_read_append_filter.c			\
 	libarchive/archive_read_data_into_fd.c			\
-	libarchive/archive_read_disk.c				\
 	libarchive/archive_read_disk_entry_from_file.c		\
+	libarchive/archive_read_disk_posix.c			\
 	libarchive/archive_read_disk_private.h			\
 	libarchive/archive_read_disk_set_standard_lookup.c	\
 	libarchive/archive_read_extract.c			\
@@ -119,32 +132,44 @@ libarchive_la_SOURCES=						\
 	libarchive/archive_read_open_filename.c			\
 	libarchive/archive_read_open_memory.c			\
 	libarchive/archive_read_private.h			\
-	libarchive/archive_read_support_compression_all.c	\
-	libarchive/archive_read_support_compression_bzip2.c	\
-	libarchive/archive_read_support_compression_compress.c	\
-	libarchive/archive_read_support_compression_gzip.c	\
-	libarchive/archive_read_support_compression_none.c	\
-	libarchive/archive_read_support_compression_program.c	\
-	libarchive/archive_read_support_compression_rpm.c	\
-	libarchive/archive_read_support_compression_uu.c	\
-	libarchive/archive_read_support_compression_xz.c	\
+	libarchive/archive_read_set_format.c			\
+	libarchive/archive_read_set_options.c			\
+	libarchive/archive_read_support_filter_all.c		\
+	libarchive/archive_read_support_filter_bzip2.c		\
+	libarchive/archive_read_support_filter_compress.c	\
+	libarchive/archive_read_support_filter_grzip.c		\
+	libarchive/archive_read_support_filter_gzip.c		\
+	libarchive/archive_read_support_filter_lrzip.c		\
+	libarchive/archive_read_support_filter_lzop.c		\
+	libarchive/archive_read_support_filter_none.c		\
+	libarchive/archive_read_support_filter_program.c	\
+	libarchive/archive_read_support_filter_rpm.c		\
+	libarchive/archive_read_support_filter_uu.c		\
+	libarchive/archive_read_support_filter_xz.c		\
+	libarchive/archive_read_support_format_7zip.c		\
 	libarchive/archive_read_support_format_all.c		\
 	libarchive/archive_read_support_format_ar.c		\
+	libarchive/archive_read_support_format_by_code.c	\
+	libarchive/archive_read_support_format_cab.c		\
 	libarchive/archive_read_support_format_cpio.c		\
 	libarchive/archive_read_support_format_empty.c		\
 	libarchive/archive_read_support_format_iso9660.c	\
+	libarchive/archive_read_support_format_lha.c		\
 	libarchive/archive_read_support_format_mtree.c		\
+	libarchive/archive_read_support_format_rar.c		\
 	libarchive/archive_read_support_format_raw.c		\
 	libarchive/archive_read_support_format_tar.c		\
 	libarchive/archive_read_support_format_xar.c		\
 	libarchive/archive_read_support_format_zip.c		\
 	libarchive/archive_string.c				\
 	libarchive/archive_string.h				\
+	libarchive/archive_string_composition.h			\
 	libarchive/archive_string_sprintf.c			\
 	libarchive/archive_util.c				\
 	libarchive/archive_virtual.c				\
 	libarchive/archive_write.c				\
-	libarchive/archive_write_disk.c				\
+	libarchive/archive_write_disk_acl.c			\
+	libarchive/archive_write_disk_posix.c			\
 	libarchive/archive_write_disk_private.h			\
 	libarchive/archive_write_disk_set_standard_lookup.c	\
 	libarchive/archive_write_open_fd.c			\
@@ -152,48 +177,90 @@ libarchive_la_SOURCES=						\
 	libarchive/archive_write_open_filename.c		\
 	libarchive/archive_write_open_memory.c			\
 	libarchive/archive_write_private.h			\
-	libarchive/archive_write_set_compression_bzip2.c	\
-	libarchive/archive_write_set_compression_compress.c	\
-	libarchive/archive_write_set_compression_gzip.c		\
-	libarchive/archive_write_set_compression_none.c		\
-	libarchive/archive_write_set_compression_program.c	\
-	libarchive/archive_write_set_compression_xz.c		\
+	libarchive/archive_write_add_filter.c			\
+	libarchive/archive_write_add_filter_b64encode.c		\
+	libarchive/archive_write_add_filter_by_name.c		\
+	libarchive/archive_write_add_filter_bzip2.c		\
+	libarchive/archive_write_add_filter_compress.c		\
+	libarchive/archive_write_add_filter_grzip.c		\
+	libarchive/archive_write_add_filter_gzip.c		\
+	libarchive/archive_write_add_filter_lrzip.c		\
+	libarchive/archive_write_add_filter_lzop.c		\
+	libarchive/archive_write_add_filter_none.c		\
+	libarchive/archive_write_add_filter_program.c		\
+	libarchive/archive_write_add_filter_uuencode.c		\
+	libarchive/archive_write_add_filter_xz.c		\
 	libarchive/archive_write_set_format.c			\
+	libarchive/archive_write_set_format_7zip.c		\
 	libarchive/archive_write_set_format_ar.c		\
 	libarchive/archive_write_set_format_by_name.c		\
 	libarchive/archive_write_set_format_cpio.c		\
 	libarchive/archive_write_set_format_cpio_newc.c		\
+	libarchive/archive_write_set_format_iso9660.c		\
 	libarchive/archive_write_set_format_mtree.c		\
 	libarchive/archive_write_set_format_pax.c		\
 	libarchive/archive_write_set_format_shar.c		\
 	libarchive/archive_write_set_format_ustar.c		\
+	libarchive/archive_write_set_format_v7tar.c		\
+	libarchive/archive_write_set_format_gnutar.c		\
+	libarchive/archive_write_set_format_xar.c		\
 	libarchive/archive_write_set_format_zip.c		\
+	libarchive/archive_write_set_options.c			\
 	libarchive/config_freebsd.h				\
-	libarchive/filter_fork.c				\
+	libarchive/filter_fork_posix.c				\
 	libarchive/filter_fork.h
 
 if INC_WINDOWS_FILES
 libarchive_la_SOURCES+=						\
 	libarchive/archive_entry_copy_bhfi.c			\
+	libarchive/archive_read_disk_windows.c			\
 	libarchive/archive_windows.h				\
 	libarchive/archive_windows.c				\
+	libarchive/archive_write_disk_windows.c			\
 	libarchive/filter_fork_windows.c
 endif
 
 # -no-undefined marks that libarchive doesn't rely on symbols
 # defined in the application.  This is mandatory for cygwin.
 libarchive_la_LDFLAGS= -no-undefined -version-info $(ARCHIVE_LIBTOOL_VERSION)
+libarchive_la_LIBADD= $(LTLIBICONV)
 
 # Manpages to install
 libarchive_man_MANS=						\
 	libarchive/archive_entry.3				\
+	libarchive/archive_entry_acl.3				\
+	libarchive/archive_entry_linkify.3			\
+	libarchive/archive_entry_paths.3			\
+	libarchive/archive_entry_perms.3			\
+	libarchive/archive_entry_stat.3				\
+	libarchive/archive_entry_time.3				\
 	libarchive/archive_read.3				\
+	libarchive/archive_read_data.3				\
 	libarchive/archive_read_disk.3				\
+	libarchive/archive_read_extract.3			\
+	libarchive/archive_read_filter.3			\
+	libarchive/archive_read_format.3			\
+	libarchive/archive_read_free.3				\
+	libarchive/archive_read_header.3			\
+	libarchive/archive_read_new.3				\
+	libarchive/archive_read_open.3				\
+	libarchive/archive_read_set_options.3			\
 	libarchive/archive_util.3				\
 	libarchive/archive_write.3				\
+	libarchive/archive_write_blocksize.3			\
+	libarchive/archive_write_data.3				\
 	libarchive/archive_write_disk.3				\
+	libarchive/archive_write_filter.3			\
+	libarchive/archive_write_finish_entry.3	 		\
+	libarchive/archive_write_format.3			\
+	libarchive/archive_write_free.3				\
+	libarchive/archive_write_header.3			\
+	libarchive/archive_write_new.3				\
+	libarchive/archive_write_open.3				\
+	libarchive/archive_write_set_options.3			\
 	libarchive/cpio.5					\
 	libarchive/libarchive.3					\
+	libarchive/libarchive_changes.3				\
 	libarchive/libarchive_internals.3			\
 	libarchive/libarchive-formats.5				\
 	libarchive/mtree.5					\
@@ -201,7 +268,6 @@ libarchive_man_MANS=						\
 
 # Additional libarchive files to include in the distribution
 libarchive_EXTRA_DIST=			\
-	libarchive/test/list.h		\
 	libarchive/archive_windows.c	\
 	libarchive/archive_windows.h	\
 	libarchive/filter_fork_windows.c	\
@@ -212,6 +278,11 @@ libarchive_EXTRA_DIST=			\
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = build/pkgconfig/libarchive.pc
 
+# Sources needed by all test programs
+test_utils_SOURCES= \
+	test_utils/test_utils.c \
+	test_utils/test_utils.h
+
 #
 #
 # libarchive_test program
@@ -219,117 +290,219 @@ pkgconfig_DATA = build/pkgconfig/libarchive.pc
 #
 libarchive_test_SOURCES=					\
 	$(libarchive_la_SOURCES)				\
+	$(test_utils_SOURCES)					\
 	libarchive/test/main.c					\
 	libarchive/test/read_open_memory.c			\
 	libarchive/test/test.h					\
-	libarchive/test/test_acl_basic.c			\
-	libarchive/test/test_acl_freebsd.c			\
+	libarchive/test/test_acl_freebsd_posix1e.c		\
+	libarchive/test/test_acl_freebsd_nfs4.c			\
+	libarchive/test/test_acl_nfs4.c				\
 	libarchive/test/test_acl_pax.c				\
+	libarchive/test/test_acl_posix1e.c			\
 	libarchive/test/test_archive_api_feature.c		\
+	libarchive/test/test_archive_clear_error.c		\
+	libarchive/test/test_archive_cmdline.c			\
+	libarchive/test/test_archive_crypto.c			\
+	libarchive/test/test_archive_getdate.c			\
+	libarchive/test/test_archive_match_owner.c		\
+	libarchive/test/test_archive_match_path.c		\
+	libarchive/test/test_archive_match_time.c		\
+	libarchive/test/test_archive_pathmatch.c		\
+	libarchive/test/test_archive_read_close_twice.c		\
+	libarchive/test/test_archive_read_close_twice_open_fd.c	\
+	libarchive/test/test_archive_read_close_twice_open_filename.c	\
+	libarchive/test/test_archive_read_multiple_data_objects.c	\
+	libarchive/test/test_archive_read_next_header_empty.c	\
+	libarchive/test/test_archive_read_next_header_raw.c	\
+	libarchive/test/test_archive_read_open2.c		\
+	libarchive/test/test_archive_read_set_filter_option.c	\
+	libarchive/test/test_archive_read_set_format_option.c	\
+	libarchive/test/test_archive_read_set_option.c		\
+	libarchive/test/test_archive_read_set_options.c		\
+	libarchive/test/test_archive_read_support.c		\
+	libarchive/test/test_archive_set_error.c		\
+	libarchive/test/test_archive_string.c			\
+	libarchive/test/test_archive_string_conversion.c	\
+	libarchive/test/test_archive_write_add_filter_by_name.c	\
+	libarchive/test/test_archive_write_set_filter_option.c	\
+	libarchive/test/test_archive_write_set_format_by_name.c	\
+	libarchive/test/test_archive_write_set_format_option.c	\
+	libarchive/test/test_archive_write_set_option.c		\
+	libarchive/test/test_archive_write_set_options.c	\
 	libarchive/test/test_bad_fd.c				\
 	libarchive/test/test_compat_bzip2.c			\
 	libarchive/test/test_compat_cpio.c			\
 	libarchive/test/test_compat_gtar.c			\
 	libarchive/test/test_compat_gzip.c			\
+	libarchive/test/test_compat_lzip.c			\
 	libarchive/test/test_compat_lzma.c			\
+	libarchive/test/test_compat_lzop.c			\
+	libarchive/test/test_compat_mac.c			\
+	libarchive/test/test_compat_pax_libarchive_2x.c		\
 	libarchive/test/test_compat_solaris_tar_acl.c		\
+	libarchive/test/test_compat_solaris_pax_sparse.c	\
 	libarchive/test/test_compat_tar_hardlink.c		\
+	libarchive/test/test_compat_uudecode.c			\
 	libarchive/test/test_compat_xz.c			\
 	libarchive/test/test_compat_zip.c			\
 	libarchive/test/test_empty_write.c			\
 	libarchive/test/test_entry.c				\
-	libarchive/test/test_extattr_freebsd.c			\
-	libarchive/test/test_fuzz.c				\
 	libarchive/test/test_entry_strmode.c			\
+	libarchive/test/test_extattr_freebsd.c			\
+	libarchive/test/test_filter_count.c			\
+	libarchive/test/test_fuzz.c				\
+	libarchive/test/test_gnutar_filename_encoding.c		\
 	libarchive/test/test_link_resolver.c			\
+	libarchive/test/test_open_failure.c			\
 	libarchive/test/test_open_fd.c				\
 	libarchive/test/test_open_file.c			\
 	libarchive/test/test_open_filename.c			\
 	libarchive/test/test_pax_filename_encoding.c		\
-	libarchive/test/test_read_compress_program.c		\
 	libarchive/test/test_read_data_large.c			\
 	libarchive/test/test_read_disk.c			\
+	libarchive/test/test_read_disk_directory_traversals.c	\
 	libarchive/test/test_read_disk_entry_from_file.c	\
 	libarchive/test/test_read_extract.c			\
 	libarchive/test/test_read_file_nonexistent.c		\
+	libarchive/test/test_read_filter_grzip.c		\
+	libarchive/test/test_read_filter_lrzip.c		\
+	libarchive/test/test_read_filter_lzop.c			\
+	libarchive/test/test_read_filter_lzop_multiple_parts.c	\
+	libarchive/test/test_read_filter_program.c		\
+	libarchive/test/test_read_filter_program_signature.c	\
+	libarchive/test/test_read_filter_uudecode.c		\
+	libarchive/test/test_read_format_7zip.c			\
 	libarchive/test/test_read_format_ar.c			\
+	libarchive/test/test_read_format_cab.c			\
+	libarchive/test/test_read_format_cab_filename.c		\
+	libarchive/test/test_read_format_cpio_afio.c		\
 	libarchive/test/test_read_format_cpio_bin.c		\
 	libarchive/test/test_read_format_cpio_bin_Z.c		\
 	libarchive/test/test_read_format_cpio_bin_be.c		\
 	libarchive/test/test_read_format_cpio_bin_bz2.c		\
 	libarchive/test/test_read_format_cpio_bin_gz.c		\
+	libarchive/test/test_read_format_cpio_bin_lzip.c	\
 	libarchive/test/test_read_format_cpio_bin_lzma.c	\
 	libarchive/test/test_read_format_cpio_bin_xz.c		\
+	libarchive/test/test_read_format_cpio_filename.c	\
 	libarchive/test/test_read_format_cpio_odc.c		\
 	libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.c	\
 	libarchive/test/test_read_format_cpio_svr4_gzip.c	\
 	libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c	\
 	libarchive/test/test_read_format_cpio_svr4c_Z.c		\
 	libarchive/test/test_read_format_empty.c		\
+	libarchive/test/test_read_format_gtar_filename.c	\
 	libarchive/test/test_read_format_gtar_gz.c		\
 	libarchive/test/test_read_format_gtar_lzma.c		\
 	libarchive/test/test_read_format_gtar_sparse.c		\
-	libarchive/test/test_read_format_iso_gz.c		\
+	libarchive/test/test_read_format_iso_Z.c		\
 	libarchive/test/test_read_format_iso_multi_extent.c	\
+	libarchive/test/test_read_format_iso_xorriso.c		\
 	libarchive/test/test_read_format_isojoliet_bz2.c	\
 	libarchive/test/test_read_format_isojoliet_long.c	\
 	libarchive/test/test_read_format_isojoliet_rr.c		\
+	libarchive/test/test_read_format_isojoliet_versioned.c	\
 	libarchive/test/test_read_format_isorr_bz2.c		\
 	libarchive/test/test_read_format_isorr_ce.c		\
 	libarchive/test/test_read_format_isorr_new_bz2.c	\
 	libarchive/test/test_read_format_isorr_rr_moved.c	\
 	libarchive/test/test_read_format_isozisofs_bz2.c	\
+	libarchive/test/test_read_format_lha.c			\
+	libarchive/test/test_read_format_lha_filename.c		\
 	libarchive/test/test_read_format_mtree.c		\
 	libarchive/test/test_read_format_pax_bz2.c		\
+	libarchive/test/test_read_format_rar.c			\
 	libarchive/test/test_read_format_raw.c			\
 	libarchive/test/test_read_format_tar.c			\
 	libarchive/test/test_read_format_tar_empty_filename.c	\
+	libarchive/test/test_read_format_tar_filename.c		\
 	libarchive/test/test_read_format_tbz.c			\
 	libarchive/test/test_read_format_tgz.c			\
 	libarchive/test/test_read_format_tlz.c			\
 	libarchive/test/test_read_format_txz.c			\
 	libarchive/test/test_read_format_tz.c			\
+	libarchive/test/test_read_format_ustar_filename.c	\
 	libarchive/test/test_read_format_xar.c			\
 	libarchive/test/test_read_format_zip.c			\
+	libarchive/test/test_read_format_zip_comment_stored.c	\
+	libarchive/test/test_read_format_zip_filename.c		\
+	libarchive/test/test_read_format_zip_mac_metadata.c	\
+	libarchive/test/test_read_format_zip_sfx.c		\
 	libarchive/test/test_read_large.c			\
 	libarchive/test/test_read_pax_truncated.c		\
 	libarchive/test/test_read_position.c			\
+	libarchive/test/test_read_set_format.c			\
 	libarchive/test/test_read_truncated.c			\
-	libarchive/test/test_read_uu.c				\
+	libarchive/test/test_read_truncated_filter.c		\
+	libarchive/test/test_sparse_basic.c			\
 	libarchive/test/test_tar_filenames.c			\
 	libarchive/test/test_tar_large.c			\
 	libarchive/test/test_ustar_filenames.c			\
-	libarchive/test/test_write_compress.c			\
-	libarchive/test/test_write_compress_bzip2.c		\
-	libarchive/test/test_write_compress_gzip.c		\
-	libarchive/test/test_write_compress_lzma.c		\
-	libarchive/test/test_write_compress_program.c		\
-	libarchive/test/test_write_compress_xz.c		\
+	libarchive/test/test_ustar_filename_encoding.c		\
 	libarchive/test/test_write_disk.c			\
+	libarchive/test/test_write_disk_appledouble.c		\
 	libarchive/test/test_write_disk_failures.c		\
 	libarchive/test/test_write_disk_hardlink.c		\
+	libarchive/test/test_write_disk_hfs_compression.c	\
+	libarchive/test/test_write_disk_lookup.c		\
+	libarchive/test/test_write_disk_mac_metadata.c		\
+	libarchive/test/test_write_disk_no_hfs_compression.c	\
 	libarchive/test/test_write_disk_perms.c			\
 	libarchive/test/test_write_disk_secure.c		\
 	libarchive/test/test_write_disk_sparse.c		\
 	libarchive/test/test_write_disk_symlink.c		\
 	libarchive/test/test_write_disk_times.c			\
+	libarchive/test/test_write_filter_b64encode.c		\
+	libarchive/test/test_write_filter_bzip2.c		\
+	libarchive/test/test_write_filter_compress.c		\
+	libarchive/test/test_write_filter_gzip.c		\
+	libarchive/test/test_write_filter_gzip_timestamp.c	\
+	libarchive/test/test_write_filter_lrzip.c		\
+	libarchive/test/test_write_filter_lzip.c		\
+	libarchive/test/test_write_filter_lzma.c		\
+	libarchive/test/test_write_filter_lzop.c		\
+	libarchive/test/test_write_filter_program.c		\
+	libarchive/test/test_write_filter_uuencode.c		\
+	libarchive/test/test_write_filter_xz.c			\
+	libarchive/test/test_write_format_7zip.c		\
+	libarchive/test/test_write_format_7zip_empty.c		\
+	libarchive/test/test_write_format_7zip_large.c		\
 	libarchive/test/test_write_format_ar.c			\
 	libarchive/test/test_write_format_cpio.c		\
 	libarchive/test/test_write_format_cpio_empty.c		\
-	libarchive/test/test_write_format_cpio_odc.c		\
 	libarchive/test/test_write_format_cpio_newc.c		\
+	libarchive/test/test_write_format_cpio_odc.c		\
+	libarchive/test/test_write_format_gnutar.c		\
+	libarchive/test/test_write_format_iso9660.c		\
+	libarchive/test/test_write_format_iso9660_boot.c	\
+	libarchive/test/test_write_format_iso9660_empty.c	\
+	libarchive/test/test_write_format_iso9660_filename.c	\
+	libarchive/test/test_write_format_iso9660_zisofs.c	\
 	libarchive/test/test_write_format_mtree.c		\
+	libarchive/test/test_write_format_mtree_absolute_path.c	\
+	libarchive/test/test_write_format_mtree_classic.c	\
+	libarchive/test/test_write_format_mtree_classic_indent.c\
+	libarchive/test/test_write_format_mtree_fflags.c	\
+	libarchive/test/test_write_format_mtree_no_separator.c	\
+	libarchive/test/test_write_format_mtree_quoted_filename.c\
 	libarchive/test/test_write_format_pax.c			\
 	libarchive/test/test_write_format_shar_empty.c		\
 	libarchive/test/test_write_format_tar.c			\
 	libarchive/test/test_write_format_tar_empty.c		\
+	libarchive/test/test_write_format_tar_sparse.c		\
 	libarchive/test/test_write_format_tar_ustar.c		\
+	libarchive/test/test_write_format_tar_v7tar.c		\
+	libarchive/test/test_write_format_xar.c			\
+	libarchive/test/test_write_format_xar_empty.c		\
 	libarchive/test/test_write_format_zip.c			\
 	libarchive/test/test_write_format_zip_empty.c		\
 	libarchive/test/test_write_format_zip_no_compression.c	\
-	libarchive/test/test_write_open_memory.c
+	libarchive/test/test_write_open_memory.c		\
+	libarchive/test/test_write_zip_set_compression_store.c	\
+	libarchive/test/test_zip_filename_encoding.c
 
-libarchive_test_CPPFLAGS= -I$(top_srcdir)/libarchive -I$(top_builddir)/libarchive/test -DLIBARCHIVE_STATIC $(PLATFORMCPPFLAGS)
+libarchive_test_CPPFLAGS= -I$(top_srcdir)/libarchive -I$(top_srcdir)/test_utils -I$(top_builddir)/libarchive/test -DLIBARCHIVE_STATIC $(PLATFORMCPPFLAGS)
+libarchive_test_LDADD= $(LTLIBICONV)
 
 # The "list.h" file just lists all of the tests defined in all of the sources.
 # Building it automatically provides a sanity-check on libarchive_test_SOURCES
@@ -337,28 +510,112 @@ libarchive_test_CPPFLAGS= -I$(top_srcdir)/libarchive -I$(top_builddir)/libarchiv
 libarchive/test/list.h: Makefile
 	cat $(top_srcdir)/libarchive/test/test_*.c | grep DEFINE_TEST > libarchive/test/list.h
 
-libarchive_TESTS_ENVIRONMENT= LIBARCHIVE_TEST_FILES=`cd $(top_srcdir);/bin/pwd`/libarchive/test
+libarchive_TESTS_ENVIRONMENT= LIBARCHIVE_TEST_FILES=`cd $(top_srcdir);/bin/pwd`/libarchive/test LRZIP=NOCONFIG
 
 libarchive_test_EXTRA_DIST=\
+	libarchive/test/list.h		\
+	libarchive/test/test_acl_pax.tar.uu				\
+	libarchive/test/test_archive_string_conversion.txt.Z.uu		\
 	libarchive/test/test_compat_bzip2_1.tbz.uu			\
 	libarchive/test/test_compat_bzip2_2.tbz.uu			\
 	libarchive/test/test_compat_cpio_1.cpio.uu			\
 	libarchive/test/test_compat_gtar_1.tar.uu			\
 	libarchive/test/test_compat_gzip_1.tgz.uu			\
 	libarchive/test/test_compat_gzip_2.tgz.uu			\
+	libarchive/test/test_compat_lzip_1.tlz.uu			\
+	libarchive/test/test_compat_lzip_2.tlz.uu			\
 	libarchive/test/test_compat_lzma_1.tlz.uu			\
 	libarchive/test/test_compat_lzma_2.tlz.uu			\
 	libarchive/test/test_compat_lzma_3.tlz.uu			\
+	libarchive/test/test_compat_lzop_1.tar.lzo.uu			\
+	libarchive/test/test_compat_lzop_2.tar.lzo.uu			\
+	libarchive/test/test_compat_lzop_3.tar.lzo.uu			\
+	libarchive/test/test_compat_mac-1.tar.Z.uu			\
+	libarchive/test/test_compat_mac-2.tar.Z.uu			\
+	libarchive/test/test_compat_pax_libarchive_2x.tar.Z.uu		\
 	libarchive/test/test_compat_solaris_tar_acl.tar.uu		\
+	libarchive/test/test_compat_solaris_pax_sparse_1.pax.Z.uu	\
+	libarchive/test/test_compat_solaris_pax_sparse_2.pax.Z.uu	\
 	libarchive/test/test_compat_tar_hardlink_1.tar.uu		\
 	libarchive/test/test_compat_xz_1.txz.uu				\
 	libarchive/test/test_compat_zip_1.zip.uu			\
+	libarchive/test/test_compat_zip_2.zip.uu			\
+	libarchive/test/test_compat_zip_3.zip.uu			\
+	libarchive/test/test_compat_zip_4.zip.uu			\
+	libarchive/test/test_compat_zip_5.zip.uu			\
+	libarchive/test/test_compat_zip_6.zip.uu			\
+	libarchive/test/test_compat_zip_7.xps.uu			\
 	libarchive/test/test_fuzz_1.iso.Z.uu				\
+	libarchive/test/test_fuzz.cab.uu				\
+	libarchive/test/test_fuzz.lzh.uu				\
 	libarchive/test/test_pax_filename_encoding.tar.uu		\
+	libarchive/test/test_rar_multivolume_multiple_files.part1.rar.uu \
+	libarchive/test/test_rar_multivolume_multiple_files.part2.rar.uu \
+	libarchive/test/test_rar_multivolume_multiple_files.part3.rar.uu \
+	libarchive/test/test_rar_multivolume_multiple_files.part4.rar.uu \
+	libarchive/test/test_rar_multivolume_multiple_files.part5.rar.uu \
+	libarchive/test/test_rar_multivolume_multiple_files.part6.rar.uu \
+	libarchive/test/test_rar_multivolume_single_file.part1.rar.uu	\
+	libarchive/test/test_rar_multivolume_single_file.part2.rar.uu	\
+	libarchive/test/test_rar_multivolume_single_file.part3.rar.uu	\
+	libarchive/test/test_rar_multivolume_uncompressed_files.part01.rar.uu \
+	libarchive/test/test_rar_multivolume_uncompressed_files.part02.rar.uu \
+	libarchive/test/test_rar_multivolume_uncompressed_files.part03.rar.uu \
+	libarchive/test/test_rar_multivolume_uncompressed_files.part04.rar.uu \
+	libarchive/test/test_rar_multivolume_uncompressed_files.part05.rar.uu \
+	libarchive/test/test_rar_multivolume_uncompressed_files.part06.rar.uu \
+	libarchive/test/test_rar_multivolume_uncompressed_files.part07.rar.uu \
+	libarchive/test/test_rar_multivolume_uncompressed_files.part08.rar.uu \
+	libarchive/test/test_rar_multivolume_uncompressed_files.part09.rar.uu \
+	libarchive/test/test_rar_multivolume_uncompressed_files.part10.rar.uu \
+	libarchive/test/test_read_filter_grzip.tar.grz.uu		\
+	libarchive/test/test_read_filter_lrzip.tar.lrz.uu		\
+	libarchive/test/test_read_filter_lzop.tar.lzo.uu		\
+	libarchive/test/test_read_filter_lzop_multiple_parts.tar.lzo.uu	\
+	libarchive/test/test_read_format_7zip_bcj_bzip2.7z.uu		\
+	libarchive/test/test_read_format_7zip_bcj_copy.7z.uu		\
+	libarchive/test/test_read_format_7zip_bcj_deflate.7z.uu		\
+	libarchive/test/test_read_format_7zip_bcj_lzma1.7z.uu		\
+	libarchive/test/test_read_format_7zip_bcj_lzma2.7z.uu		\
+	libarchive/test/test_read_format_7zip_bcj2_bzip2.7z.uu		\
+	libarchive/test/test_read_format_7zip_bcj2_copy_1.7z.uu		\
+	libarchive/test/test_read_format_7zip_bcj2_copy_2.7z.uu		\
+	libarchive/test/test_read_format_7zip_bcj2_copy_lzma.7z.uu	\
+	libarchive/test/test_read_format_7zip_bcj2_deflate.7z.uu	\
+	libarchive/test/test_read_format_7zip_bcj2_lzma1_1.7z.uu	\
+	libarchive/test/test_read_format_7zip_bcj2_lzma1_2.7z.uu	\
+	libarchive/test/test_read_format_7zip_bcj2_lzma2_1.7z.uu	\
+	libarchive/test/test_read_format_7zip_bcj2_lzma2_2.7z.uu	\
+	libarchive/test/test_read_format_7zip_bzip2.7z.uu		\
+	libarchive/test/test_read_format_7zip_copy.7z.uu		\
+	libarchive/test/test_read_format_7zip_copy_2.7z.uu		\
+	libarchive/test/test_read_format_7zip_deflate.7z.uu		\
+	libarchive/test/test_read_format_7zip_delta_lzma1.7z.uu		\
+	libarchive/test/test_read_format_7zip_delta_lzma2.7z.uu		\
+	libarchive/test/test_read_format_7zip_empty_archive.7z.uu	\
+	libarchive/test/test_read_format_7zip_empty_file.7z.uu		\
+	libarchive/test/test_read_format_7zip_lzma1.7z.uu		\
+	libarchive/test/test_read_format_7zip_lzma1_2.7z.uu		\
+	libarchive/test/test_read_format_7zip_lzma1_lzma2.7z.uu		\
+	libarchive/test/test_read_format_7zip_lzma2.7z.uu		\
+	libarchive/test/test_read_format_7zip_ppmd.7z.uu		\
+	libarchive/test/test_read_format_7zip_symbolic_name.7z.uu	\
 	libarchive/test/test_read_format_ar.ar.uu			\
+	libarchive/test/test_read_format_cab_1.cab.uu			\
+	libarchive/test/test_read_format_cab_2.cab.uu			\
+	libarchive/test/test_read_format_cab_3.cab.uu			\
+	libarchive/test/test_read_format_cab_filename_cp932.cab.uu	\
 	libarchive/test/test_read_format_cpio_bin_be.cpio.uu		\
+	libarchive/test/test_read_format_cpio_filename_cp866.cpio.uu	\
+	libarchive/test/test_read_format_cpio_filename_eucjp.cpio.uu	\
+	libarchive/test/test_read_format_cpio_filename_koi8r.cpio.uu	\
+	libarchive/test/test_read_format_cpio_filename_utf8_jp.cpio.uu	\
+	libarchive/test/test_read_format_cpio_filename_utf8_ru.cpio.uu	\
 	libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.rpm.uu	\
 	libarchive/test/test_read_format_cpio_svr4_gzip_rpm.rpm.uu	\
+	libarchive/test/test_read_format_gtar_filename_cp866.tar.Z.uu	\
+	libarchive/test/test_read_format_gtar_filename_eucjp.tar.Z.uu	\
+	libarchive/test/test_read_format_gtar_filename_koi8r.tar.Z.uu	\
 	libarchive/test/test_read_format_gtar_sparse_1_13.tar.uu	\
 	libarchive/test/test_read_format_gtar_sparse_1_17.tar.uu	\
 	libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tar.uu \
@@ -366,7 +623,9 @@ libarchive_test_EXTRA_DIST=\
 	libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tar.uu \
 	libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu \
 	libarchive/test/test_read_format_iso.iso.Z.uu			\
+	libarchive/test/test_read_format_iso_2.iso.Z.uu			\
 	libarchive/test/test_read_format_iso_joliet.iso.Z.uu		\
+	libarchive/test/test_read_format_iso_joliet_by_nero.iso.Z.uu	\
 	libarchive/test/test_read_format_iso_joliet_long.iso.Z.uu	\
 	libarchive/test/test_read_format_iso_joliet_rockridge.iso.Z.uu	\
 	libarchive/test/test_read_format_iso_multi_extent.iso.Z.uu	\
@@ -374,12 +633,73 @@ libarchive_test_EXTRA_DIST=\
 	libarchive/test/test_read_format_iso_rockridge_ce.iso.Z.uu	\
 	libarchive/test/test_read_format_iso_rockridge_new.iso.Z.uu	\
 	libarchive/test/test_read_format_iso_rockridge_rr_moved.iso.Z.uu\
+	libarchive/test/test_read_format_iso_xorriso.iso.Z.uu		\
 	libarchive/test/test_read_format_iso_zisofs.iso.Z.uu		\
+	libarchive/test/test_read_format_lha_filename_cp932.lzh.uu	\
+	libarchive/test/test_read_format_lha_header0.lzh.uu		\
+	libarchive/test/test_read_format_lha_header1.lzh.uu		\
+	libarchive/test/test_read_format_lha_header2.lzh.uu		\
+	libarchive/test/test_read_format_lha_header3.lzh.uu		\
+	libarchive/test/test_read_format_lha_lh0.lzh.uu			\
+	libarchive/test/test_read_format_lha_lh6.lzh.uu			\
+	libarchive/test/test_read_format_lha_lh7.lzh.uu			\
+	libarchive/test/test_read_format_lha_withjunk.lzh.uu		\
 	libarchive/test/test_read_format_mtree.mtree.uu			\
+	libarchive/test/test_read_format_mtree_nomagic.mtree.uu		\
+	libarchive/test/test_read_format_mtree_nomagic2.mtree.uu	\
+	libarchive/test/test_read_format_mtree_nomagic3.mtree.uu	\
+	libarchive/test/test_read_format_rar.rar.uu			\
+	libarchive/test/test_read_format_rar_binary_data.rar.uu		\
+	libarchive/test/test_read_format_rar_compress_best.rar.uu	\
+	libarchive/test/test_read_format_rar_compress_normal.rar.uu	\
+	libarchive/test/test_read_format_rar_multi_lzss_blocks.rar.uu	\
+	libarchive/test/test_read_format_rar_multivolume.part0001.rar.uu\
+	libarchive/test/test_read_format_rar_multivolume.part0002.rar.uu\
+	libarchive/test/test_read_format_rar_multivolume.part0003.rar.uu\
+	libarchive/test/test_read_format_rar_multivolume.part0004.rar.uu\
+	libarchive/test/test_read_format_rar_noeof.rar.uu		\
+	libarchive/test/test_read_format_rar_ppmd_lzss_conversion.rar.uu\
+	libarchive/test/test_read_format_rar_sfx.exe.uu			\
+	libarchive/test/test_read_format_rar_subblock.rar.uu		\
+	libarchive/test/test_read_format_rar_unicode.rar.uu		\
+	libarchive/test/test_read_format_rar_windows.rar.uu		\
 	libarchive/test/test_read_format_raw.data.Z.uu			\
 	libarchive/test/test_read_format_raw.data.uu			\
 	libarchive/test/test_read_format_tar_empty_filename.tar.uu	\
+	libarchive/test/test_read_format_tar_filename_koi8r.tar.Z.uu	\
+	libarchive/test/test_read_format_ustar_filename_cp866.tar.Z.uu	\
+	libarchive/test/test_read_format_ustar_filename_eucjp.tar.Z.uu	\
+	libarchive/test/test_read_format_ustar_filename_koi8r.tar.Z.uu	\
 	libarchive/test/test_read_format_zip.zip.uu			\
+	libarchive/test/test_read_format_zip_comment_stored_1.zip.uu	\
+	libarchive/test/test_read_format_zip_comment_stored_2.zip.uu	\
+	libarchive/test/test_read_format_zip_filename_cp866.zip.uu	\
+	libarchive/test/test_read_format_zip_filename_cp932.zip.uu	\
+	libarchive/test/test_read_format_zip_filename_koi8r.zip.uu	\
+	libarchive/test/test_read_format_zip_filename_utf8_jp.zip.uu	\
+	libarchive/test/test_read_format_zip_filename_utf8_ru2.zip.uu	\
+	libarchive/test/test_read_format_zip_filename_utf8_ru.zip.uu	\
+	libarchive/test/test_read_format_zip_length_at_end.zip.uu	\
+	libarchive/test/test_read_format_zip_mac_metadata.zip.uu	\
+	libarchive/test/test_read_format_zip_sfx.uu			\
+	libarchive/test/test_read_format_zip_symlink.zip.uu		\
+	libarchive/test/test_read_format_zip_ux.zip.uu			\
+	libarchive/test/test_read_large_splitted_rar_aa.uu		\
+	libarchive/test/test_read_large_splitted_rar_ab.uu		\
+	libarchive/test/test_read_large_splitted_rar_ac.uu		\
+	libarchive/test/test_read_large_splitted_rar_ad.uu		\
+	libarchive/test/test_read_large_splitted_rar_ae.uu		\
+	libarchive/test/test_read_splitted_rar_aa.uu			\
+	libarchive/test/test_read_splitted_rar_ab.uu			\
+	libarchive/test/test_read_splitted_rar_ac.uu			\
+	libarchive/test/test_read_splitted_rar_ad.uu			\
+	libarchive/test/test_splitted_rar_seek_support_aa.uu		\
+	libarchive/test/test_splitted_rar_seek_support_ab.uu		\
+	libarchive/test/test_splitted_rar_seek_support_ac.uu		\
+	libarchive/test/test_write_disk_appledouble.cpio.gz.uu	\
+	libarchive/test/test_write_disk_hfs_compression.tgz.uu		\
+	libarchive/test/test_write_disk_mac_metadata.tar.gz.uu		\
+	libarchive/test/test_write_disk_no_hfs_compression.tgz.uu	\
 	libarchive/test/CMakeLists.txt					\
 	libarchive/test/README
 
@@ -391,12 +711,9 @@ libarchive_fe_la_SOURCES=			\
 	libarchive_fe/err.h			\
 	libarchive_fe/lafe_platform.h		\
 	libarchive_fe/line_reader.c		\
-	libarchive_fe/line_reader.h		\
-	libarchive_fe/matching.c		\
-	libarchive_fe/matching.h		\
-	libarchive_fe/pathmatch.c		\
-	libarchive_fe/pathmatch.h
+	libarchive_fe/line_reader.h
 
+libarchive_fe_la_CPPFLAGS= -I$(top_srcdir)/libarchive
 #
 #
 # bsdtar source, docs, etc.
@@ -408,11 +725,9 @@ bsdtar_SOURCES=				\
 		tar/bsdtar.h		\
 		tar/bsdtar_platform.h	\
 		tar/cmdline.c		\
-		tar/getdate.c		\
+		tar/creation_set.c	\
 		tar/read.c		\
 		tar/subst.c		\
-		tar/tree.c		\
-		tar/tree.h		\
 		tar/util.c		\
 		tar/write.c
 
@@ -432,7 +747,7 @@ bsdtar_ldstatic=
 bsdtar_ccstatic=
 endif
 
-bsdtar_LDADD= libarchive.la libarchive_fe.la
+bsdtar_LDADD= libarchive.la libarchive_fe.la $(LTLIBICONV)
 bsdtar_CPPFLAGS= -I$(top_srcdir)/libarchive -I$(top_srcdir)/libarchive_fe $(bsdtar_ccstatic) $(PLATFORMCPPFLAGS)
 bsdtar_LDFLAGS= $(bsdtar_ldstatic)
 
@@ -441,8 +756,7 @@ bsdtar_EXTRA_DIST=		\
 	tar/bsdtar_windows.h	\
 	tar/bsdtar_windows.c	\
 	tar/CMakeLists.txt	\
-	tar/config_freebsd.h	\
-	tar/test/list.h
+	tar/config_freebsd.h
 
 
 if BUILD_BSDTAR
@@ -458,35 +772,65 @@ endif
 #
 
 bsdtar_test_SOURCES=						\
-	tar/getdate.c						\
+	$(test_utils_SOURCES)					\
 	tar/test/main.c						\
 	tar/test/test.h						\
 	tar/test/test_0.c					\
 	tar/test/test_basic.c					\
 	tar/test/test_copy.c					\
 	tar/test/test_empty_mtree.c				\
-	tar/test/test_getdate.c					\
+	tar/test/test_extract_tar_Z.c				\
+	tar/test/test_extract_tar_bz2.c				\
+	tar/test/test_extract_tar_grz.c				\
+	tar/test/test_extract_tar_gz.c				\
+	tar/test/test_extract_tar_lrz.c				\
+	tar/test/test_extract_tar_lz.c				\
+	tar/test/test_extract_tar_lzma.c			\
+	tar/test/test_extract_tar_lzo.c				\
+	tar/test/test_extract_tar_xz.c				\
+	tar/test/test_format_newc.c				\
 	tar/test/test_help.c					\
+	tar/test/test_option_C_upper.c				\
+	tar/test/test_option_H_upper.c				\
+	tar/test/test_option_L_upper.c				\
+	tar/test/test_option_O_upper.c				\
 	tar/test/test_option_T_upper.c				\
+	tar/test/test_option_U_upper.c				\
+	tar/test/test_option_X_upper.c				\
+	tar/test/test_option_a.c				\
+	tar/test/test_option_b.c				\
+	tar/test/test_option_b64encode.c			\
+	tar/test/test_option_exclude.c				\
+	tar/test/test_option_gid_gname.c			\
+	tar/test/test_option_grzip.c				\
+	tar/test/test_option_j.c				\
+	tar/test/test_option_k.c				\
+	tar/test/test_option_keep_newer_files.c			\
+	tar/test/test_option_lrzip.c				\
+	tar/test/test_option_lzma.c				\
+	tar/test/test_option_lzop.c				\
+	tar/test/test_option_n.c				\
+	tar/test/test_option_newer_than.c			\
+	tar/test/test_option_nodump.c				\
+	tar/test/test_option_older_than.c			\
 	tar/test/test_option_q.c				\
 	tar/test/test_option_r.c				\
 	tar/test/test_option_s.c				\
+	tar/test/test_option_uid_uname.c			\
+	tar/test/test_option_uuencode.c				\
+	tar/test/test_option_xz.c				\
+	tar/test/test_option_z.c				\
 	tar/test/test_patterns.c				\
+	tar/test/test_print_longpath.c				\
 	tar/test/test_stdio.c					\
 	tar/test/test_strip_components.c			\
 	tar/test/test_symlink_dir.c				\
 	tar/test/test_version.c					\
 	tar/test/test_windows.c
 
-# For now, bsdtar_test uses Windows shims from tar/bsdtar_windows.*
-if INC_WINDOWS_FILES
-bsdtar_test_SOURCES+=			\
-		tar/bsdtar_windows.h	\
-		tar/bsdtar_windows.c
-endif
-
 bsdtar_test_CPPFLAGS=\
 	-I$(top_srcdir)/libarchive -I$(top_srcdir)/libarchive_fe \
+	-I$(top_srcdir)/test_utils \
 	-I$(top_srcdir)/tar -I$(top_builddir)/tar/test \
 	$(PLATFORMCPPFLAGS)
 
@@ -502,9 +846,22 @@ bsdtar_TESTS_ENVIRONMENT=
 endif
 
 bsdtar_test_EXTRA_DIST=			\
+	tar/test/list.h \
+	tar/test/test_extract.tar.Z.uu	 \
+	tar/test/test_extract.tar.bz2.uu \
+	tar/test/test_extract.tar.grz.uu \
+	tar/test/test_extract.tar.gz.uu	 \
+	tar/test/test_extract.tar.lrz.uu \
+	tar/test/test_extract.tar.lz.uu  \
+	tar/test/test_extract.tar.lzma.uu \
+	tar/test/test_extract.tar.lzo.uu \
+	tar/test/test_extract.tar.xz.uu \
+	tar/test/test_option_keep_newer_files.tar.Z.uu \
+	tar/test/test_option_s.tar.Z.uu \
 	tar/test/test_patterns_2.tar.uu	\
 	tar/test/test_patterns_3.tar.uu	\
 	tar/test/test_patterns_4.tar.uu	\
+	tar/test/test_print_longpath.tar.Z.uu \
 	tar/test/CMakeLists.txt
 
 
@@ -537,12 +894,11 @@ bsdcpio_ldstatic=
 bsdcpio_ccstatic=
 endif
 
-bsdcpio_LDADD= libarchive_fe.la libarchive.la
+bsdcpio_LDADD= libarchive_fe.la libarchive.la $(LTLIBICONV)
 bsdcpio_CPPFLAGS= -I$(top_srcdir)/libarchive -I$(top_srcdir)/libarchive_fe $(bsdcpio_ccstatic) $(PLATFORMCPPFLAGS)
 bsdcpio_LDFLAGS= $(bsdcpio_ldstatic)
 
 bsdcpio_EXTRA_DIST=		\
-	cpio/test/list.h	\
 	cpio/bsdcpio.1		\
 	cpio/cpio_windows.h	\
 	cpio/cpio_windows.c	\
@@ -564,39 +920,56 @@ endif
 #
 
 bsdcpio_test_SOURCES=						\
+	$(test_utils_SOURCES)					\
 	cpio/cmdline.c						\
 	cpio/test/main.c					\
 	cpio/test/test.h					\
 	cpio/test/test_0.c					\
 	cpio/test/test_basic.c					\
 	cpio/test/test_cmdline.c				\
+	cpio/test/test_extract_cpio_Z.c				\
+	cpio/test/test_extract_cpio_bz2.c			\
+	cpio/test/test_extract_cpio_grz.c			\
+	cpio/test/test_extract_cpio_gz.c			\
+	cpio/test/test_extract_cpio_lrz.c			\
+	cpio/test/test_extract_cpio_lz.c			\
+	cpio/test/test_extract_cpio_lzma.c			\
+	cpio/test/test_extract_cpio_lzo.c			\
+	cpio/test/test_extract_cpio_xz.c			\
 	cpio/test/test_format_newc.c				\
 	cpio/test/test_gcpio_compat.c				\
+	cpio/test/test_option_0.c				\
 	cpio/test/test_option_B_upper.c				\
 	cpio/test/test_option_C_upper.c				\
 	cpio/test/test_option_J_upper.c				\
 	cpio/test/test_option_L_upper.c				\
 	cpio/test/test_option_Z_upper.c				\
 	cpio/test/test_option_a.c				\
+	cpio/test/test_option_b64encode.c			\
 	cpio/test/test_option_c.c				\
 	cpio/test/test_option_d.c				\
 	cpio/test/test_option_f.c				\
+	cpio/test/test_option_grzip.c				\
 	cpio/test/test_option_help.c				\
 	cpio/test/test_option_l.c				\
+	cpio/test/test_option_lrzip.c				\
 	cpio/test/test_option_lzma.c				\
+	cpio/test/test_option_lzop.c				\
 	cpio/test/test_option_m.c				\
 	cpio/test/test_option_t.c				\
 	cpio/test/test_option_u.c				\
+	cpio/test/test_option_uuencode.c			\
 	cpio/test/test_option_version.c				\
+	cpio/test/test_option_xz.c				\
 	cpio/test/test_option_y.c				\
 	cpio/test/test_option_z.c				\
 	cpio/test/test_owner_parse.c				\
 	cpio/test/test_passthrough_dotdot.c			\
-	cpio/test/test_passthrough_reverse.c			\
-	cpio/test/test_pathmatch.c
+	cpio/test/test_passthrough_reverse.c
 
 bsdcpio_test_CPPFLAGS= \
 	-I$(top_srcdir)/libarchive -I$(top_srcdir)/libarchive_fe \
+	-I$(top_srcdir)/test_utils \
 	-I$(top_srcdir)/cpio -I$(top_builddir)/cpio/test \
 	$(PLATFORMCPPFLAGS)
 bsdcpio_test_LDADD=libarchive_fe.la
@@ -613,6 +986,16 @@ bsdcpio_TESTS_ENVIRONMENT=
 endif
 
 bsdcpio_test_EXTRA_DIST=			\
+	cpio/test/list.h	\
+	cpio/test/test_extract.cpio.Z.uu	\
+	cpio/test/test_extract.cpio.bz2.uu	\
+	cpio/test/test_extract.cpio.grz.uu	\
+	cpio/test/test_extract.cpio.gz.uu	\
+	cpio/test/test_extract.cpio.lrz.uu	\
+	cpio/test/test_extract.cpio.lz.uu	\
+	cpio/test/test_extract.cpio.lzma.uu	\
+	cpio/test/test_extract.cpio.lzo.uu	\
+	cpio/test/test_extract.cpio.xz.uu	\
 	cpio/test/test_gcpio_compat_ref.bin.uu	\
 	cpio/test/test_gcpio_compat_ref.crc.uu	\
 	cpio/test/test_gcpio_compat_ref.newc.uu	\