devel/popt

Describe the naming convention of the patches, and what does this repository.

README

@@ -1,5 +1,5 @@
 This is a work in progress to upgrade MINIX PKGSRC to the latest 
-quarterly available (2016Q3).
+quarterly available (2015QX).
 
 I have rebased, squashed and edited commit message in order to facilitate
 the next update, and have a clear focus from the commit message what we
@@ -24,7 +24,7 @@ blocking requirements for a new release.
 Known Bugs
 ----------
  - When using bmake to compile a package by hand, sometimes the following
-   variables need to be exported explicitly in the environment:
+   variables need to be exported explicitly in the environment:   
      export STRIP=strip
      export CC=clang
      export CXX=clang++
@@ -33,10 +33,6 @@ Known Bugs
    In some cases, this is due to the use of both mthread and GNU Pth.
    mthread might be pulled in as a dependency of libc++, and a few X11 libraries.
 
- - regression in devel/py-setuptools
-
- - gcc45, clang & eventually binutils patches might be dropped in the short term.
-
 ----------
 
 $NetBSD: README,v 1.18 2005/05/07 22:18:28 wiz Exp $

archivers/9e/distinfo

@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 00:56:19 agc Exp $
+$NetBSD: distinfo,v 1.3 2005/02/23 14:45:22 agc Exp $
 
 SHA1 (9e.tar.gz) = fc966f51a167e4ed3dc371e399bbc8909f074b54
 RMD160 (9e.tar.gz) = bbcdde8d9b4989a12edd935c6156d80aaf5f8f5e
-SHA512 (9e.tar.gz) = 742f7fd4e8801a63c000d1fccaa9ae851e74ceaa2cdf2c41cbfc7e647a52f6c0ac2843b87320fb7d821f7bf0112323e1b67ca4d998fcc703711dc1868d8d0516
 Size (9e.tar.gz) = 2019 bytes
 SHA1 (patch-aa) = 5d5982bfc544910f3d36eb40a9de9c5caa8432fd
 SHA1 (patch-ab) = 7c81596f86905d6b9a42cab77fbfad6b15c911c3

archivers/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.148 2016/09/19 08:02:23 wiz Exp $
+# $NetBSD: Makefile,v 1.139 2015/05/23 02:13:28 mef Exp $
 #
 
 COMMENT=	Archivers
@@ -11,14 +11,12 @@ SUBDIR+=	archangel
 SUBDIR+=	arj
 SUBDIR+=	ark
 SUBDIR+=	bicom
-SUBDIR+=	bmap-tools
 SUBDIR+=	bsdtar
 SUBDIR+=	bunzip
 SUBDIR+=	bzip2
 SUBDIR+=	cabextract
 SUBDIR+=	dact
 SUBDIR+=	dar
-SUBDIR+=	engrampa
 SUBDIR+=	fastjar
 SUBDIR+=	fcrackzip
 SUBDIR+=	file-roller
@@ -36,7 +34,6 @@ SUBDIR+=	hpack
 SUBDIR+=	hs-zlib
 SUBDIR+=	innoextract
 SUBDIR+=	jamjar
-SUBDIR+=	karchive
 SUBDIR+=	lbrate
 SUBDIR+=	lcab
 SUBDIR+=	lha
@@ -48,7 +45,6 @@ SUBDIR+=	libunrar
 SUBDIR+=	libzip
 SUBDIR+=	lrzip
 SUBDIR+=	lz4
-SUBDIR+=	lz4json
 SUBDIR+=	lzip
 SUBDIR+=	lziprecover
 SUBDIR+=	lzma
@@ -83,9 +79,6 @@ SUBDIR+=	php-zlib
 SUBDIR+=	pigz
 SUBDIR+=	ppmd
 SUBDIR+=	ppunpack
-SUBDIR+=	py-czipfile
-SUBDIR+=	py-lhafile
-SUBDIR+=	py-libarchive-c
 SUBDIR+=	py-yuicompressor
 SUBDIR+=	rar
 SUBDIR+=	rox-archive
@@ -118,8 +111,6 @@ SUBDIR+=	xpk
 SUBDIR+=	xz
 SUBDIR+=	zip
 SUBDIR+=	zoo
-SUBDIR+=	zopfli
-SUBDIR+=	zstd
 SUBDIR+=	zutils
 SUBDIR+=	zziplib
 

archivers/advancecomp/Makefile

@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.16 2016/05/30 13:27:04 mef Exp $
+# $NetBSD: Makefile,v 1.15 2014/10/09 14:05:50 wiz Exp $
 
-DISTNAME=	advancecomp-1.19
+DISTNAME=	advancecomp-1.15
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=advancemame/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://advancemame.sourceforge.net/
 COMMENT=	Recompression utilities for .zip, .png, .mng and .gz files
-LICENSE=	gnu-gpl-v3
 
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++

archivers/advancecomp/distinfo

@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.7 2016/05/30 13:27:04 mef Exp $
+$NetBSD: distinfo,v 1.5 2007/01/14 16:28:40 rillig Exp $
 
-SHA1 (advancecomp-1.19.tar.gz) = 894c2db01c9fff40257f929496621bdcea77748b
+SHA1 (advancecomp-1.15.tar.gz) = 74fed754841efadcb8dd156d2c5e095bfaff83e6
-RMD160 (advancecomp-1.19.tar.gz) = 1064b5068178f6b65b30821cc19dcc0d241e4934
+RMD160 (advancecomp-1.15.tar.gz) = 13468f350e15e7f23778d8351819a792fbf07c9a
-SHA512 (advancecomp-1.19.tar.gz) = 9bce761f315e94ea9ebe59273cc810297e6227d914b498501f159f05c3a002236570c2d4248b397c5cdd3cf9a60565bb8d7f1470b079d5f50249031d3c78348d
+Size (advancecomp-1.15.tar.gz) = 259340 bytes
-Size (advancecomp-1.19.tar.gz) = 1193228 bytes
+SHA1 (patch-aa) = bb74883968ec79e3f5f62085668cf3341c46570c
-SHA1 (patch-aa) = ddc8b6981e1e0b46ac6291aee65d56cdae9f0998
 SHA1 (patch-ab) = 1e6e10943bd2a414d4f704bd94b1de3d1036dd90
 SHA1 (patch-ac) = d08d44224c4351c66c920b26bacc3f749a54d31a

archivers/advancecomp/patches/patch-aa

@@ -1,6 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2016/05/30 13:27:04 mef Exp $
+$NetBSD: patch-aa,v 1.1 2007/01/14 16:28:40 rillig Exp $
-
-Fixed the build for sunpro on Solaris 10.
 
 --- portable.h.orig	2004-08-09 15:04:02.000000000 +0200
 +++ portable.h	2007-01-14 17:05:21.524063100 +0100

archivers/afio/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2016/02/26 11:40:29 jperkin Exp $
+# $NetBSD: Makefile,v 1.16 2015/02/15 14:45:48 ryoon Exp $
 
 DISTNAME=	afio-2.5.1
 CATEGORIES=	archivers
@@ -11,8 +11,11 @@ COMMENT=	Data corruption handling cpio-format archive creator
 
 BUILD_TARGET=	afio
 
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "Darwin"
 # Don't define HAVE_LCHOWN
-MAKE_FLAGS.Darwin+=	e2=
+MAKE_FLAGS+=	e2=
+.endif
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 

archivers/afio/distinfo

@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.9 2015/11/03 00:56:20 agc Exp $
+$NetBSD: distinfo,v 1.8 2015/02/15 14:45:48 ryoon Exp $
 
 SHA1 (afio-2.5.1.tgz) = bff6b9a147dc5b0e6bd7f1a76f0b84e4dd9a7dc9
 RMD160 (afio-2.5.1.tgz) = 923981a9e6766781705ceedecd3d86afa5b9abae
-SHA512 (afio-2.5.1.tgz) = afa4e01cc9e7da5bff7c96d2da9a41c296e7b89c50484f58a8b011173a99a144a9e77d3ee8136622e490287b99a7ae76c6eba901a2186b5a3a6bab164a37c864
 Size (afio-2.5.1.tgz) = 191765 bytes
 SHA1 (patch-aa) = e35b47c2f10a6f80d8446e4c22a7a023dae55933
 SHA1 (patch-ab) = a93cf92b80f2b40e30987822b144c24f3a3e5c1e

archivers/arc/distinfo

@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.12 2015/11/03 00:56:20 agc Exp $
+$NetBSD: distinfo,v 1.11 2015/01/04 10:43:44 wiz Exp $
 
 SHA1 (arc-5.21p.tar.gz) = e68e358b86a67c68e8a1cb95a840f380bfda3684
 RMD160 (arc-5.21p.tar.gz) = c6a97105ab26cf1d2b6ad45d528894628cff0586
-SHA512 (arc-5.21p.tar.gz) = c70c01ec407cc27f6507e2715d8b553277609cb49369a1e65a83d007362a24b69bb09ef2bf168ee36ca6797bd4524644a89e9114d866351ae53fece193c2967c
 Size (arc-5.21p.tar.gz) = 84791 bytes
 SHA1 (patch-aa) = efbb7e0a3a715d871dc98ad4fad58d0ae49f5b02
 SHA1 (patch-ab) = e85c2698747106a7319db07185bfe0b6e2480974

archivers/archangel/distinfo

@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.11 2015/11/03 00:56:20 agc Exp $
+$NetBSD: distinfo,v 1.10 2012/01/28 04:37:36 sbd Exp $
 
 SHA1 (archangel-20050730.tar.gz) = 966948ebac01a71732e93afd72fe5c4a21ba1ed8
 RMD160 (archangel-20050730.tar.gz) = 16b5f1d7dae8d45b22d0e371a90e0673c5e58caa
-SHA512 (archangel-20050730.tar.gz) = b5763f5e7d172da42a39eba15b892a28b30126b39ce49852bed3fb29ac64014057ea494bd428283d9868331e80f7ee7ba30c700fd1bf9a0a6fa92fdbe8d71968
 Size (archangel-20050730.tar.gz) = 673307 bytes
 SHA1 (patch-aa) = cc5369ee02b35a0f4c21bed18802a3919f89bc63
 SHA1 (patch-ab) = 580fac24f5c2ee698ea58dce3b75bc4301db75bf

archivers/arj/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2015/12/29 04:54:34 dholland Exp $
+# $NetBSD: Makefile,v 1.32 2015/09/24 02:47:15 tnn Exp $
 
 DISTNAME=	arj-3.10.22
 PKGREVISION=	2
@@ -8,7 +8,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=arj/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://arj.sourceforge.net/
 COMMENT=	Open-source ARJ archiver
-LICENSE=	gnu-gpl-v2
+LICENSE=       gnu-gpl-v2
 
 MAKE_JOBS_SAFE=		no
 

archivers/arj/distinfo

@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.23 2015/11/03 00:56:20 agc Exp $
+$NetBSD: distinfo,v 1.22 2015/05/10 18:50:47 bsiegert Exp $
 
 SHA1 (arj-3.10.22.tar.gz) = e8470f480e9eee14906e5485a8898e5c24738c8b
 RMD160 (arj-3.10.22.tar.gz) = 80f8a1a8cd203f73def8e957d96563a4dba80153
-SHA512 (arj-3.10.22.tar.gz) = 4730dfdbab4f8095396c337578ed69bdaae52955ad468db50b52af8ad2846ecd6cfc05eb3ac0d03838c1c32ea60126f14a22b93e8181c06b9546456f3937ff76
 Size (arj-3.10.22.tar.gz) = 431467 bytes
 SHA1 (patch-arj__user.c) = 011e5deaa24c696b212beadad7d386ccb3c7112d
 SHA1 (patch-arjdata.c) = 4e4c142b97feee0673b14ea6f454f3d9de45f584

archivers/ark/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2016/07/01 17:55:22 jperkin Exp $
+# $NetBSD: Makefile,v 1.33 2015/04/25 14:20:17 tnn Exp $
 
 DISTNAME=	ark-${_KDE_VERSION}
-PKGREVISION=	6
+PKGREVISION=	3
 CATEGORIES=	archivers
 COMMENT=	Manages various archive formats within the KDE environment
 
@@ -12,7 +12,7 @@ CMAKE_ARGS+=	-DWITH_QJSON:BOOL=OFF
 .include "../../meta-pkgs/kde4/kde4.mk"
 
 .include "../../archivers/bzip2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libarchive+=	libarchive>=2.6.0
+BUILDLINK_API_DEPENDS.libarchive+=  libarchive>=2.6.0
 .include "../../archivers/libarchive/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"

archivers/ark/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2016/01/10 19:55:55 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
@@ -12,7 +12,7 @@ lib/kde4/kerfuffle_libxz.so
 lib/kde4/libextracthere.so
 lib/libkerfuffle.so
 lib/libkerfuffle.so.4
-lib/libkerfuffle.so.${KDELIBSVER}
+lib/libkerfuffle.so.${PKGVERSION}
 man/man1/ark.1
 share/appdata/ark.appdata.xml
 share/applications/kde4/ark.desktop

archivers/ark/distinfo

@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.9 2015/11/03 00:56:20 agc Exp $
+$NetBSD: distinfo,v 1.8 2014/11/13 20:13:00 markd Exp $
 
 SHA1 (ark-4.14.3.tar.xz) = 5b28719e0134b763ddcc0a67ba7c31f4a416f0e6
 RMD160 (ark-4.14.3.tar.xz) = 12660c88dbc47c5a3ec2a2f4bb7493fb7d94c186
-SHA512 (ark-4.14.3.tar.xz) = 86cc44d26ac145797b3727f9b6195b6059f7163cf8abcd39313f9ee06fd86770a2e09c15bee9605968ebad07346dc116dd82b22b713db361a90c53c51dd325f7
 Size (ark-4.14.3.tar.xz) = 236116 bytes

archivers/bmap-tools/DESCR

@@ -1,5 +0,0 @@
-Bmaptool is a generic tool for creating the block map (bmap) for
-a file and copying files using the block map. The idea is that
-large files, like raw system image files, can be copied or flashed
-a lot faster and more reliably with bmaptool than with traditional
-tools, like "dd" or "cp".

archivers/bmap-tools/Makefile

@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2016/06/03 14:38:03 wiz Exp $
-
-DISTNAME=	bmap-tools-3.2
-CATEGORIES=	archivers sysutils
-MASTER_SITES=	ftp://ftp.infradead.org/pub/bmap-tools/
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://source.tizen.org/documentation/reference/bmaptool
-COMMENT=	Block map tools
-LICENSE=	gnu-gpl-v2
-
-USE_LANGUAGES=	# none
-
-PYTHON_VERSIONS_ACCEPTED=	27 # not ready as of 3.2
-
-.include "../../lang/python/egg.mk"
-.include "../../mk/bsd.pkg.mk"

archivers/bmap-tools/PLIST

@@ -1,24 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2016/06/03 14:38:03 wiz Exp $
-bin/bmaptool
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
-${PYSITELIB}/bmaptools/BmapCopy.py
-${PYSITELIB}/bmaptools/BmapCopy.pyc
-${PYSITELIB}/bmaptools/BmapCopy.pyo
-${PYSITELIB}/bmaptools/BmapCreate.py
-${PYSITELIB}/bmaptools/BmapCreate.pyc
-${PYSITELIB}/bmaptools/BmapCreate.pyo
-${PYSITELIB}/bmaptools/BmapHelpers.py
-${PYSITELIB}/bmaptools/BmapHelpers.pyc
-${PYSITELIB}/bmaptools/BmapHelpers.pyo
-${PYSITELIB}/bmaptools/Filemap.py
-${PYSITELIB}/bmaptools/Filemap.pyc
-${PYSITELIB}/bmaptools/Filemap.pyo
-${PYSITELIB}/bmaptools/TransRead.py
-${PYSITELIB}/bmaptools/TransRead.pyc
-${PYSITELIB}/bmaptools/TransRead.pyo
-${PYSITELIB}/bmaptools/__init__.py
-${PYSITELIB}/bmaptools/__init__.pyc
-${PYSITELIB}/bmaptools/__init__.pyo

archivers/bmap-tools/distinfo

@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.1 2016/05/08 18:39:35 jakllsch Exp $
-
-SHA1 (bmap-tools-3.2.tgz) = b2eb397e90f5641701e94e725350a8166740f1ac
-RMD160 (bmap-tools-3.2.tgz) = 3d05b5459f4a763a66a572dc45951d894ef315ad
-SHA512 (bmap-tools-3.2.tgz) = 005adb981daf58ba5c3c26c0e4d27881875661b258667b28aabc209a87d78b7c595c596d9abe47f1c79ef4ba4c891d6b8b01e45256aef8105899f84fd03c1196
-Size (bmap-tools-3.2.tgz) = 87236 bytes

archivers/bsdtar/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2016/01/27 12:26:11 jperkin Exp $
+# $NetBSD: Makefile,v 1.22 2015/01/17 12:44:51 adam Exp $
 
 .include "../../archivers/libarchive/Makefile.common"
 
@@ -13,7 +13,6 @@ CONFIGURE_ARGS+=	--disable-bsdcpio
 CONFIGURE_ARGS+=	--disable-shared
 
 .include "../../archivers/bzip2/builtin.mk"
-.include "../../archivers/xz/builtin.mk"
 .include "../../devel/zlib/builtin.mk"
 CHECK_BUILTIN.openssl:=	yes
 .include "../../security/openssl/builtin.mk"
@@ -30,9 +29,6 @@ LDFLAGS+=	-L${WRKDIR}/zlib
 .if empty(USE_BUILTIN.openssl:M[yY][eE][sS])
 CONFIGURE_ARGS+=	--without-openssl
 .endif
-.if empty(USE_BUILTIN.xz:M[yY][eE][sS])
-CONFIGURE_ARGS+=	--without-lzma
-.endif
 
 FILESDIR.bzip2?=	${.CURDIR}/../../archivers/bzip2/files
 FILESDIR.libarchive?=	${.CURDIR}/../../archivers/libarchive/files

archivers/cabextract/distinfo

@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.16 2015/11/03 00:56:20 agc Exp $
+$NetBSD: distinfo,v 1.15 2015/03/27 16:49:55 bsiegert Exp $
 
 SHA1 (cabextract-1.6.tar.gz) = 64f6d5056d3e417a943648c23cb22218b7079ced
 RMD160 (cabextract-1.6.tar.gz) = 6b693c30aa4d6821b5e83b63a8dc9d58968268b7
-SHA512 (cabextract-1.6.tar.gz) = d1c71c0292e3d73d8edbff5f5230b3127c63028f5aba1d0cad968bc945202fb9c0773327affce3d28466068377f029c80735adbabe0929d29b2204dea73738f8
 Size (cabextract-1.6.tar.gz) = 241731 bytes

archivers/dact/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2016/08/12 13:38:51 mef Exp $
+# $NetBSD: Makefile,v 1.22 2014/10/09 14:05:51 wiz Exp $
 
 DISTNAME=	dact-0.8.41
 CATEGORIES=	archivers
-MASTER_SITES=	http://www.rkeene.org/devel/dact/
+MASTER_SITES=	http://www.rkeene.org/devel/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.rkeene.org/devel/dact/

archivers/dact/distinfo

@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.12 2015/11/03 00:56:20 agc Exp $
+$NetBSD: distinfo,v 1.11 2009/02/10 00:25:54 joerg Exp $
 
 SHA1 (dact-0.8.41.tar.gz) = a87db20ae7bf4ffd1b5d37c7e3be70c84661e379
 RMD160 (dact-0.8.41.tar.gz) = 015544501df128da869f837b64579de53028a163
-SHA512 (dact-0.8.41.tar.gz) = 6c2ae5754c071b250c59a7646cefe42d90f5e918d76301ed8bc4e5ebb29a149682b8fd741eaa8de7848bd6740299d22c12c17e0f252577f3647882b5589ae875
 Size (dact-0.8.41.tar.gz) = 151032 bytes
 SHA1 (patch-aa) = 087545641533933b85446341161d4df41d05ab65
 SHA1 (patch-ab) = 4bb63e9e9ae2cf1a4faf06bfad20c0f47a4c46a2

archivers/dar/Makefile

@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.52 2016/07/09 06:37:46 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2014/10/09 14:05:51 wiz Exp $
 
 DISTNAME=	dar-2.4.13
-PKGREVISION=	1
 CATEGORIES=	archivers sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dar/}
 

archivers/dar/distinfo

@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.31 2015/11/03 00:56:20 agc Exp $
+$NetBSD: distinfo,v 1.30 2014/05/14 04:35:20 rodent Exp $
 
 SHA1 (dar-2.4.13.tar.gz) = b20471ada21cd0cbe4687e7bdd3c2e6f70f5c0d1
 RMD160 (dar-2.4.13.tar.gz) = 20cf6492aedd82b3bc227603588c8e6f44560dde
-SHA512 (dar-2.4.13.tar.gz) = 28308101f5d73b7bb7ea181fc1df129ea2be888404d301b156938f8cfc47ed1ed2819be058ce910795c937c8bc267305e7e080c2b80f81a18df95ab9cfb7ad07
 Size (dar-2.4.13.tar.gz) = 1799774 bytes
 SHA1 (patch-aa) = 86370bb2515795b2c5645beaafeb8af08d9f209b
 SHA1 (patch-ab) = 9b8fd96e3944aedeaa4f2df0d5bfe17a73d3f7eb

archivers/engrampa/DESCR

@@ -1,9 +0,0 @@
-Engrampa is a fork of File-Roller.
-
-Engrampa is an archive manager for the MATE environment.  This means
-that you can create and modify archives; view the content of an archive;
-view and modify a file contained in the archive; extract files from the
-archive.
-
-Engrampa is only a front-end (a graphical interface) to archiving programs
-like tar and zip.

archivers/engrampa/Makefile

@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2016/08/03 10:22:25 adam Exp $
-
-PKGREVISION= 1
-.include "../../meta-pkgs/mate/Makefile.common"
-
-DISTNAME=	engrampa-1.14.1
-CATEGORIES=	archivers
-
-COMMENT=	Archive manager utility for the MATE Environment
-
-TOOL_DEPENDS+=	itstool-[0-9]*:../../textproc/itstool
-
-USE_TOOLS+=		gtar:run gzip:run bzip2:run unzip:run zip:run xz:run
-
-.include "../../devel/glib2/schemas.mk"
-
-.include "../../sysutils/caja/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../textproc/json-glib/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-BUILDLINK_DEPMETHOD.libSM=	build
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../mk/bsd.pkg.mk"

archivers/engrampa/PLIST

@@ -1,271 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2016/06/13 22:41:16 youri Exp $
-bin/engrampa
-lib/caja/extensions-2.0/libcaja-engrampa.la
-libexec/engrampa-server
-libexec/engrampa/isoinfo.sh
-libexec/engrampa/rpm2cpio
-man/man1/engrampa.1
-share/appdata/engrampa.appdata.xml
-share/applications/engrampa.desktop
-share/caja/extensions/libcaja-engrampa.caja-extension
-share/dbus-1/services/org.mate.Engrampa.service
-share/engrampa/icons/hicolor/16x16/actions/add-files-to-archive.png
-share/engrampa/icons/hicolor/16x16/actions/add-folder-to-archive.png
-share/engrampa/icons/hicolor/16x16/actions/extract-archive.png
-share/engrampa/icons/hicolor/24x24/actions/add-files-to-archive.png
-share/engrampa/icons/hicolor/24x24/actions/add-folder-to-archive.png
-share/engrampa/icons/hicolor/24x24/actions/extract-archive.png
-share/engrampa/packages.match
-share/engrampa/ui/add-options.ui
-share/engrampa/ui/batch-add-files.ui
-share/engrampa/ui/batch-password.ui
-share/engrampa/ui/delete.ui
-share/engrampa/ui/new.ui
-share/engrampa/ui/open-with.ui
-share/engrampa/ui/password.ui
-share/engrampa/ui/properties.ui
-share/engrampa/ui/update.ui
-share/glib-2.0/schemas/org.mate.engrampa.gschema.xml
-share/help/C/engrampa/figures/engrampa_home.png
-share/help/C/engrampa/figures/engrampa_leftarrow.png
-share/help/C/engrampa/figures/engrampa_main_window.png
-share/help/C/engrampa/figures/engrampa_rightarrow.png
-share/help/C/engrampa/figures/engrampa_uparrow.png
-share/help/C/engrampa/index.docbook
-share/help/C/engrampa/legal.xml
-share/help/bg/engrampa/figures/engrampa_home.png
-share/help/bg/engrampa/figures/engrampa_leftarrow.png
-share/help/bg/engrampa/figures/engrampa_main_window.png
-share/help/bg/engrampa/figures/engrampa_rightarrow.png
-share/help/bg/engrampa/figures/engrampa_uparrow.png
-share/help/bg/engrampa/index.docbook
-share/help/bg/engrampa/legal.xml
-share/help/ca/engrampa/figures/engrampa_home.png
-share/help/ca/engrampa/figures/engrampa_leftarrow.png
-share/help/ca/engrampa/figures/engrampa_main_window.png
-share/help/ca/engrampa/figures/engrampa_rightarrow.png
-share/help/ca/engrampa/figures/engrampa_uparrow.png
-share/help/ca/engrampa/index.docbook
-share/help/ca/engrampa/legal.xml
-share/help/cs/engrampa/figures/engrampa_home.png
-share/help/cs/engrampa/figures/engrampa_leftarrow.png
-share/help/cs/engrampa/figures/engrampa_main_window.png
-share/help/cs/engrampa/figures/engrampa_rightarrow.png
-share/help/cs/engrampa/figures/engrampa_uparrow.png
-share/help/cs/engrampa/index.docbook
-share/help/cs/engrampa/legal.xml
-share/help/de/engrampa/figures/engrampa_home.png
-share/help/de/engrampa/figures/engrampa_leftarrow.png
-share/help/de/engrampa/figures/engrampa_main_window.png
-share/help/de/engrampa/figures/engrampa_rightarrow.png
-share/help/de/engrampa/figures/engrampa_uparrow.png
-share/help/de/engrampa/index.docbook
-share/help/de/engrampa/legal.xml
-share/help/el/engrampa/figures/engrampa_home.png
-share/help/el/engrampa/figures/engrampa_leftarrow.png
-share/help/el/engrampa/figures/engrampa_main_window.png
-share/help/el/engrampa/figures/engrampa_rightarrow.png
-share/help/el/engrampa/figures/engrampa_uparrow.png
-share/help/el/engrampa/index.docbook
-share/help/el/engrampa/legal.xml
-share/help/en_GB/engrampa/figures/engrampa_home.png
-share/help/en_GB/engrampa/figures/engrampa_leftarrow.png
-share/help/en_GB/engrampa/figures/engrampa_main_window.png
-share/help/en_GB/engrampa/figures/engrampa_rightarrow.png
-share/help/en_GB/engrampa/figures/engrampa_uparrow.png
-share/help/en_GB/engrampa/index.docbook
-share/help/en_GB/engrampa/legal.xml
-share/help/es/engrampa/figures/engrampa_home.png
-share/help/es/engrampa/figures/engrampa_leftarrow.png
-share/help/es/engrampa/figures/engrampa_main_window.png
-share/help/es/engrampa/figures/engrampa_rightarrow.png
-share/help/es/engrampa/figures/engrampa_uparrow.png
-share/help/es/engrampa/index.docbook
-share/help/es/engrampa/legal.xml
-share/help/fi/engrampa/figures/engrampa_home.png
-share/help/fi/engrampa/figures/engrampa_leftarrow.png
-share/help/fi/engrampa/figures/engrampa_main_window.png
-share/help/fi/engrampa/figures/engrampa_rightarrow.png
-share/help/fi/engrampa/figures/engrampa_uparrow.png
-share/help/fi/engrampa/index.docbook
-share/help/fi/engrampa/legal.xml
-share/help/fr/engrampa/figures/engrampa_home.png
-share/help/fr/engrampa/figures/engrampa_leftarrow.png
-share/help/fr/engrampa/figures/engrampa_main_window.png
-share/help/fr/engrampa/figures/engrampa_rightarrow.png
-share/help/fr/engrampa/figures/engrampa_uparrow.png
-share/help/fr/engrampa/index.docbook
-share/help/fr/engrampa/legal.xml
-share/help/it/engrampa/figures/engrampa_home.png
-share/help/it/engrampa/figures/engrampa_leftarrow.png
-share/help/it/engrampa/figures/engrampa_main_window.png
-share/help/it/engrampa/figures/engrampa_rightarrow.png
-share/help/it/engrampa/figures/engrampa_uparrow.png
-share/help/it/engrampa/index.docbook
-share/help/it/engrampa/legal.xml
-share/help/ja/engrampa/figures/engrampa_home.png
-share/help/ja/engrampa/figures/engrampa_leftarrow.png
-share/help/ja/engrampa/figures/engrampa_main_window.png
-share/help/ja/engrampa/figures/engrampa_rightarrow.png
-share/help/ja/engrampa/figures/engrampa_uparrow.png
-share/help/ja/engrampa/index.docbook
-share/help/ja/engrampa/legal.xml
-share/help/nl/engrampa/figures/engrampa_home.png
-share/help/nl/engrampa/figures/engrampa_leftarrow.png
-share/help/nl/engrampa/figures/engrampa_main_window.png
-share/help/nl/engrampa/figures/engrampa_rightarrow.png
-share/help/nl/engrampa/figures/engrampa_uparrow.png
-share/help/nl/engrampa/index.docbook
-share/help/nl/engrampa/legal.xml
-share/help/oc/engrampa/figures/engrampa_home.png
-share/help/oc/engrampa/figures/engrampa_leftarrow.png
-share/help/oc/engrampa/figures/engrampa_main_window.png
-share/help/oc/engrampa/figures/engrampa_rightarrow.png
-share/help/oc/engrampa/figures/engrampa_uparrow.png
-share/help/oc/engrampa/index.docbook
-share/help/oc/engrampa/legal.xml
-share/help/ru/engrampa/figures/engrampa_home.png
-share/help/ru/engrampa/figures/engrampa_leftarrow.png
-share/help/ru/engrampa/figures/engrampa_main_window.png
-share/help/ru/engrampa/figures/engrampa_rightarrow.png
-share/help/ru/engrampa/figures/engrampa_uparrow.png
-share/help/ru/engrampa/index.docbook
-share/help/ru/engrampa/legal.xml
-share/help/sv/engrampa/figures/engrampa_home.png
-share/help/sv/engrampa/figures/engrampa_leftarrow.png
-share/help/sv/engrampa/figures/engrampa_main_window.png
-share/help/sv/engrampa/figures/engrampa_rightarrow.png
-share/help/sv/engrampa/figures/engrampa_uparrow.png
-share/help/sv/engrampa/index.docbook
-share/help/sv/engrampa/legal.xml
-share/help/uk/engrampa/figures/engrampa_home.png
-share/help/uk/engrampa/figures/engrampa_leftarrow.png
-share/help/uk/engrampa/figures/engrampa_main_window.png
-share/help/uk/engrampa/figures/engrampa_rightarrow.png
-share/help/uk/engrampa/figures/engrampa_uparrow.png
-share/help/uk/engrampa/index.docbook
-share/help/uk/engrampa/legal.xml
-share/help/vi/engrampa/figures/engrampa_home.png
-share/help/vi/engrampa/figures/engrampa_leftarrow.png
-share/help/vi/engrampa/figures/engrampa_main_window.png
-share/help/vi/engrampa/figures/engrampa_rightarrow.png
-share/help/vi/engrampa/figures/engrampa_uparrow.png
-share/help/vi/engrampa/index.docbook
-share/help/vi/engrampa/legal.xml
-share/help/zh_CN/engrampa/figures/engrampa_home.png
-share/help/zh_CN/engrampa/figures/engrampa_leftarrow.png
-share/help/zh_CN/engrampa/figures/engrampa_main_window.png
-share/help/zh_CN/engrampa/figures/engrampa_rightarrow.png
-share/help/zh_CN/engrampa/figures/engrampa_uparrow.png
-share/help/zh_CN/engrampa/index.docbook
-share/help/zh_CN/engrampa/legal.xml
-share/icons/hicolor/16x16/apps/engrampa.png
-share/icons/hicolor/22x22/apps/engrampa.png
-share/icons/hicolor/24x24/apps/engrampa.png
-share/icons/hicolor/32x32/apps/engrampa.png
-share/icons/hicolor/scalable/apps/engrampa.svg
-share/locale/af/LC_MESSAGES/engrampa.mo
-share/locale/am/LC_MESSAGES/engrampa.mo
-share/locale/ar/LC_MESSAGES/engrampa.mo
-share/locale/as/LC_MESSAGES/engrampa.mo
-share/locale/ast/LC_MESSAGES/engrampa.mo
-share/locale/az/LC_MESSAGES/engrampa.mo
-share/locale/be/LC_MESSAGES/engrampa.mo
-share/locale/be@latin/LC_MESSAGES/engrampa.mo
-share/locale/bg/LC_MESSAGES/engrampa.mo
-share/locale/bn/LC_MESSAGES/engrampa.mo
-share/locale/bn_IN/LC_MESSAGES/engrampa.mo
-share/locale/br/LC_MESSAGES/engrampa.mo
-share/locale/bs/LC_MESSAGES/engrampa.mo
-share/locale/ca/LC_MESSAGES/engrampa.mo
-share/locale/ca@valencia/LC_MESSAGES/engrampa.mo
-share/locale/cmn/LC_MESSAGES/engrampa.mo
-share/locale/cs/LC_MESSAGES/engrampa.mo
-share/locale/cy/LC_MESSAGES/engrampa.mo
-share/locale/da/LC_MESSAGES/engrampa.mo
-share/locale/de/LC_MESSAGES/engrampa.mo
-share/locale/dz/LC_MESSAGES/engrampa.mo
-share/locale/el/LC_MESSAGES/engrampa.mo
-share/locale/en@shaw/LC_MESSAGES/engrampa.mo
-share/locale/en_AU/LC_MESSAGES/engrampa.mo
-share/locale/en_CA/LC_MESSAGES/engrampa.mo
-share/locale/en_GB/LC_MESSAGES/engrampa.mo
-share/locale/eo/LC_MESSAGES/engrampa.mo
-share/locale/es/LC_MESSAGES/engrampa.mo
-share/locale/es_CO/LC_MESSAGES/engrampa.mo
-share/locale/es_MX/LC_MESSAGES/engrampa.mo
-share/locale/et/LC_MESSAGES/engrampa.mo
-share/locale/eu/LC_MESSAGES/engrampa.mo
-share/locale/fa/LC_MESSAGES/engrampa.mo
-share/locale/fi/LC_MESSAGES/engrampa.mo
-share/locale/fr/LC_MESSAGES/engrampa.mo
-share/locale/fr_CA/LC_MESSAGES/engrampa.mo
-share/locale/frp/LC_MESSAGES/engrampa.mo
-share/locale/fur/LC_MESSAGES/engrampa.mo
-share/locale/fy/LC_MESSAGES/engrampa.mo
-share/locale/ga/LC_MESSAGES/engrampa.mo
-share/locale/gl/LC_MESSAGES/engrampa.mo
-share/locale/gu/LC_MESSAGES/engrampa.mo
-share/locale/he/LC_MESSAGES/engrampa.mo
-share/locale/hi/LC_MESSAGES/engrampa.mo
-share/locale/hr/LC_MESSAGES/engrampa.mo
-share/locale/hu/LC_MESSAGES/engrampa.mo
-share/locale/hy/LC_MESSAGES/engrampa.mo
-share/locale/id/LC_MESSAGES/engrampa.mo
-share/locale/is/LC_MESSAGES/engrampa.mo
-share/locale/it/LC_MESSAGES/engrampa.mo
-share/locale/ja/LC_MESSAGES/engrampa.mo
-share/locale/jv/LC_MESSAGES/engrampa.mo
-share/locale/ka/LC_MESSAGES/engrampa.mo
-share/locale/kk/LC_MESSAGES/engrampa.mo
-share/locale/kn/LC_MESSAGES/engrampa.mo
-share/locale/ko/LC_MESSAGES/engrampa.mo
-share/locale/ku/LC_MESSAGES/engrampa.mo
-share/locale/ky/LC_MESSAGES/engrampa.mo
-share/locale/lt/LC_MESSAGES/engrampa.mo
-share/locale/lv/LC_MESSAGES/engrampa.mo
-share/locale/mai/LC_MESSAGES/engrampa.mo
-share/locale/mg/LC_MESSAGES/engrampa.mo
-share/locale/mk/LC_MESSAGES/engrampa.mo
-share/locale/ml/LC_MESSAGES/engrampa.mo
-share/locale/mn/LC_MESSAGES/engrampa.mo
-share/locale/mr/LC_MESSAGES/engrampa.mo
-share/locale/ms/LC_MESSAGES/engrampa.mo
-share/locale/nb/LC_MESSAGES/engrampa.mo
-share/locale/nds/LC_MESSAGES/engrampa.mo
-share/locale/ne/LC_MESSAGES/engrampa.mo
-share/locale/nl/LC_MESSAGES/engrampa.mo
-share/locale/nn/LC_MESSAGES/engrampa.mo
-share/locale/oc/LC_MESSAGES/engrampa.mo
-share/locale/or/LC_MESSAGES/engrampa.mo
-share/locale/pa/LC_MESSAGES/engrampa.mo
-share/locale/pl/LC_MESSAGES/engrampa.mo
-share/locale/ps/LC_MESSAGES/engrampa.mo
-share/locale/pt/LC_MESSAGES/engrampa.mo
-share/locale/pt_BR/LC_MESSAGES/engrampa.mo
-share/locale/ro/LC_MESSAGES/engrampa.mo
-share/locale/ru/LC_MESSAGES/engrampa.mo
-share/locale/rw/LC_MESSAGES/engrampa.mo
-share/locale/si/LC_MESSAGES/engrampa.mo
-share/locale/sk/LC_MESSAGES/engrampa.mo
-share/locale/sl/LC_MESSAGES/engrampa.mo
-share/locale/sq/LC_MESSAGES/engrampa.mo
-share/locale/sr/LC_MESSAGES/engrampa.mo
-share/locale/sr@ije/LC_MESSAGES/engrampa.mo
-share/locale/sr@latin/LC_MESSAGES/engrampa.mo
-share/locale/sv/LC_MESSAGES/engrampa.mo
-share/locale/ta/LC_MESSAGES/engrampa.mo
-share/locale/te/LC_MESSAGES/engrampa.mo
-share/locale/th/LC_MESSAGES/engrampa.mo
-share/locale/tk/LC_MESSAGES/engrampa.mo
-share/locale/tr/LC_MESSAGES/engrampa.mo
-share/locale/ug/LC_MESSAGES/engrampa.mo
-share/locale/uk/LC_MESSAGES/engrampa.mo
-share/locale/ur/LC_MESSAGES/engrampa.mo
-share/locale/ur_PK/LC_MESSAGES/engrampa.mo
-share/locale/uz/LC_MESSAGES/engrampa.mo
-share/locale/vi/LC_MESSAGES/engrampa.mo
-share/locale/xh/LC_MESSAGES/engrampa.mo
-share/locale/zh_CN/LC_MESSAGES/engrampa.mo
-share/locale/zh_HK/LC_MESSAGES/engrampa.mo
-share/locale/zh_TW/LC_MESSAGES/engrampa.mo

archivers/engrampa/distinfo

@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.2 2016/06/13 22:41:16 youri Exp $
-
-SHA1 (engrampa-1.14.1.tar.xz) = 1245f5203b37b842cfaf818781b17cd22f1234b1
-RMD160 (engrampa-1.14.1.tar.xz) = a13a6e781e9601890f581c89511c187b26a49d9f
-SHA512 (engrampa-1.14.1.tar.xz) = fea510d95fe483f676f66490706aa919b6a62bc20af9e22893304235ce0a38ff006c66494d548a3207dc4cd241cb785abe77652693d1b600e4ca6c8a0a60d763
-Size (engrampa-1.14.1.tar.xz) = 1417444 bytes
-SHA1 (patch-src_fr-command-lrzip.c) = 0409d41ab993ca67c71c6896083f848919fc8be8

archivers/engrampa/patches/patch-src_fr-command-lrzip.c

@@ -1,15 +0,0 @@
-$NetBSD: patch-src_fr-command-lrzip.c,v 1.1 2016/05/21 19:19:53 youri Exp $
-
-* use portable member name
-
---- src/fr-command-lrzip.c.orig	2013-06-29 20:16:25.000000000 +0000
-+++ src/fr-command-lrzip.c
-@@ -53,7 +53,7 @@ list__process_line (char     *line,
- 	struct stat st;
- 	
- 	if (stat (comm->filename, &st) == 0)
--		fdata->modified = st.st_mtim.tv_sec;
-+		fdata->modified = st.st_mtime;
- 	else
- 		time(&(fdata->modified));
- 

archivers/fastjar/Makefile

@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.21 2016/09/18 11:17:41 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2014/10/09 14:05:51 wiz Exp $
+#
 
-DISTNAME=	fastjar-0.98
+DISTNAME=	fastjar-0.93
-PKGREVISION=	1
+PKGREVISION=	3
 CATEGORIES=	archivers
-MASTER_SITES=	http://download.savannah.gnu.org/releases/fastjar/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fastjar/}
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://savannah.nongnu.org/projects/fastjar
+HOMEPAGE=	http://fastjar.sourceforge.net/
 COMMENT=	C language version of the 'jar' archiver normally used by Java
-LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=	YES
 
-INFO_FILES=	YES
 INSTALLATION_DIRS=	${PKGMANDIR}/man1
 
 post-install:

archivers/fastjar/PLIST

@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2016/09/18 11:17:41 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/12/14 04:34:39 jschauma Exp $
 bin/fastjar
 bin/grepjar
-info/fastjar.info
 man/man1/fastjar.1
 man/man1/grepjar.1

archivers/fastjar/distinfo

@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.14 2016/03/05 15:08:30 bsiegert Exp $
+$NetBSD: distinfo,v 1.12 2006/05/17 06:12:27 rillig Exp $
 
-SHA1 (fastjar-0.98.tar.gz) = c240a9e2115aad486329360d9166514261149af2
+SHA1 (fastjar-0.93.tgz) = 74acc8e8a920ea6da18a180cd0a691c5d7c4699f
-RMD160 (fastjar-0.98.tar.gz) = 593ed2dfcc02599a3540028a0f0b5c77d6be7071
+RMD160 (fastjar-0.93.tgz) = 1627f2316cc7bca6a477011d1b812b140900d987
-Size (fastjar-0.98.tar.gz) = 717984 bytes
+Size (fastjar-0.93.tgz) = 62419 bytes
-SHA1 (patch-aa) = cdb20f779b32f423a49bcf3a7c64901aef5228c8
+SHA1 (patch-aa) = 12cc5397a89c18d239164caa3955121ca6d01de0
-SHA1 (patch-ab) = da635a3a6ce6c3f3406371e02a376e1d728f8b7e
+SHA1 (patch-ab) = c13f46e1a3e60a3bbe656af609a5c9fb047a4ca3
-SHA1 (patch-ad) = bdb8f3c1affbcf3cc373f7b5d731b8122eaf4018
+SHA1 (patch-ac) = ce8eefb978a93d0043f8b98fbf4049f022ce663c
+SHA1 (patch-ad) = 7fe6657b18090e0d12c8a3b528370314e6ddca97

archivers/fastjar/patches/patch-aa

@@ -1,6 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2016/03/05 15:08:30 bsiegert Exp $
+$NetBSD: patch-aa,v 1.2 2002/12/14 04:34:39 jschauma Exp $
-
-Add man page
 
 --- /dev/null	Fri Dec 13 23:11:57 2002
 +++ fastjar.1	Fri Dec 13 23:22:03 2002

archivers/fastjar/patches/patch-ab

@@ -1,6 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2016/03/05 15:08:30 bsiegert Exp $
+$NetBSD: patch-ab,v 1.1 2002/12/14 04:34:40 jschauma Exp $
-
-Add man page
 
 --- /dev/null	Fri Dec 13 23:11:57 2002
 +++ grepjar.1	Fri Dec 13 23:21:48 2002

archivers/fastjar/patches/patch-ac

@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2005/05/17 14:54:57 minskim Exp $
+
+--- jargrep.c.orig	2001-01-11 02:38:15.000000000 -0600
++++ jargrep.c
+@@ -572,7 +572,7 @@ static void jargrep(regex_t *exp, regex_
+ 					floop = FALSE;
+ 					break;
+ 				case 2:
+-					/* fall through continue */
++					; /* fall through continue */
+ 				}
+ 			}
+ 		} while(floop);

archivers/fastjar/patches/patch-ad

@@ -1,16 +1,13 @@
-$NetBSD: patch-ad,v 1.7 2016/03/05 15:08:30 bsiegert Exp $
+$NetBSD: patch-ad,v 1.6 2006/05/17 06:12:27 rillig Exp $
 
-date: 2006-03-14 23:02:01 +0900;  author: joerg;  state: Exp;  lines: +51 -3;
+--- jartool.c.orig	2001-01-11 09:38:15.000000000 +0100
-Normalise path names as relative under cwd as if they would have been
++++ jartool.c
-extracted under chroot. Don't attempt to deal with existing symlinks
+@@ -171,4 +171,2 @@
-to directories. This prevents directory traversal and therefore the
+ 
-creation of arbitrary files. Bump revision.
+-extern int errno;
-     
+-
---- jartool.c.orig	2009-09-07 07:10:47.000000000 +0900
+ void usage(char*);
-+++ jartool.c	2014-12-15 18:35:25.000000000 +0900
+@@ -1143,2 +1141,27 @@ int create_central_header(int fd){
-@@ -1512,6 +1512,31 @@ int create_central_header(int fd){
-   return 0;
- }
  
 +static void canonical_filename(char *filename)
 +{
@@ -37,20 +34,24 @@ creation of arbitrary files. Bump revision.
 +    }
 +}
 +
- int extract_jar(int fd, const char **files, int file_num){
+ int extract_jar(int fd, char **files, int file_num){
-   size_t rdamt;
+@@ -1251,2 +1274,9 @@ int extract_jar(int fd, char **files, in
-   int out_a, in_a;
-@@ -1628,6 +1653,13 @@ int extract_jar(int fd, const char **fil
-     pb_read(&pbf, filename, fnlen);
-     filename[fnlen] = '\0';
  
-+    canonical_filename(filename);
++     canonical_filename(filename);
 +
-+    if (*filename == '\0') {
++     if (*filename == '\0') {
-+	 fprintf(stderr, "Error extracting JAR archive, empty file name!\n");
++        fprintf(stderr, "Error extracting JAR archive, empty file name!\n");
-+	 exit(1);
++        exit(1);
-+     }
++      }
 +
  #ifdef DEBUG    
-     printf("filename is %s\n", filename);
+@@ -1563,2 +1593,9 @@ int list_jar(int fd, char **files, int f
- #endif
+       filename[fnlen] = '\0';
++
++      canonical_filename(filename);
++      if (*filename == '\0') {
++          fprintf(stderr, "Error extracting JAR archive, empty file name!\n");
++          exit(1);
++      }
++
+     

archivers/fcrackzip/distinfo

@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 00:56:20 agc Exp $
+$NetBSD: distinfo,v 1.3 2009/08/08 16:00:59 wiz Exp $
 
 SHA1 (fcrackzip-1.0.tar.gz) = 92e4f8caa880c55b20e13feb7a25c8b8fd3accf8
 RMD160 (fcrackzip-1.0.tar.gz) = 8c784108816c990fcd09cfafc69a5d4a0ef1d33a
-SHA512 (fcrackzip-1.0.tar.gz) = c18d45b5a4ec46411d455a0c10cb9faa7a1060a48936a820fff9b1f8af7f7158ac09da44d39673e4bdfaf0f370ee425e8df0a0dbe98a2a930049ecc2a1419048
 Size (fcrackzip-1.0.tar.gz) = 114786 bytes
 SHA1 (patch-aa) = 619f03bc240dd6501b6e5fed4cf5735bb2ac58c3

archivers/file-roller/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.137 2016/08/03 10:22:26 adam Exp $
+# $NetBSD: Makefile,v 1.134 2015/06/12 10:48:21 wiz Exp $
 #
 
 DISTNAME=	file-roller-2.32.2
-PKGREVISION=	26
+PKGREVISION=	23
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/file-roller/2.32/}
 EXTRACT_SUFX=	.tar.bz2
@@ -23,8 +23,6 @@ GCONF_SCHEMAS=		file-roller.schemas
 BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.12.0
 BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.10.0
 
-.include "options.mk"
-
 # Force unzip from pkgsrc on NetBSD
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "NetBSD"
@@ -42,6 +40,7 @@ SUBST_SED.unzip=	-e 's|@@UNZIP_COMMAND@@|${TOOLS_PATH.unzip}|'
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+#.include "../../sysutils/nautilus/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
 .include "../../x11/gtk2/buildlink3.mk"

archivers/file-roller/PLIST

@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.37 2016/04/09 05:40:46 richard Exp $
+@comment $NetBSD: PLIST,v 1.36 2010/11/28 13:06:16 drochner Exp $
 bin/file-roller
 libexec/file-roller/isoinfo.sh
 libexec/file-roller/rpm2cpio
-${PLIST.nautilus}lib/nautilus/extensions-2.0/libnautilus-fileroller.la
 share/applications/file-roller.desktop
 share/file-roller/icons/hicolor/16x16/actions/add-files-to-archive.png
 share/file-roller/icons/hicolor/16x16/actions/add-folder-to-archive.png

archivers/file-roller/distinfo

@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.56 2015/11/03 00:56:20 agc Exp $
+$NetBSD: distinfo,v 1.55 2011/05/18 10:54:03 drochner Exp $
 
 SHA1 (file-roller-2.32.2.tar.bz2) = 38ce495a27b482f1e9983304f95959393674676e
 RMD160 (file-roller-2.32.2.tar.bz2) = cbeb4f8dc83db87338735e57c4f87333c4b018f4
-SHA512 (file-roller-2.32.2.tar.bz2) = c62153871ed0210972d45ed0fa71eb177602cbc48894907c50ff45e8798d07979377ce4cbe1fbc1c37e5762cd005c5846dd9ac9f5ee93fe860de2babdc0933f0
 Size (file-roller-2.32.2.tar.bz2) = 1901661 bytes
 SHA1 (patch-aa) = 0e536d0b9c8e88b97ea7af600e3bb6d6ba496acf
 SHA1 (patch-ab) = 967cbffa26e708e2d486a192335edc8eaa4d28df

archivers/file-roller/options.mk

@@ -1,17 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2016/04/09 05:40:46 richard Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.file-roller
-PKG_SUPPORTED_OPTIONS=	nautilus
-PKG_SUGGESTED_OPTIONS=	nautilus
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+=		nautilus
-
-.if !empty(PKG_OPTIONS:Mnautilus)
-PLIST.nautilus=		yes
-CONFIGURE_ARGS+=	--enable-nautilus-actions
-.include "../../sysutils/nautilus/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-nautilus-actions
-.endif

archivers/freeze/distinfo

@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.11 2015/11/03 00:56:21 agc Exp $
+$NetBSD: distinfo,v 1.10 2009/02/09 23:53:00 joerg Exp $
 
 SHA1 (freeze-2.5.tar.gz) = 07b94508fcd95d35236a4090257aa402fd623812
 RMD160 (freeze-2.5.tar.gz) = bc8bdf2ed06738066fd73f7bedb8b9f2dbaa21a2
-SHA512 (freeze-2.5.tar.gz) = 9fcebe4bdd4cb8b2bada7ecfb5bda1ede08a950cf60777df7ab2c9656fdfec5b0b3dc3c9c8379b0c6732ee4634136ddcdc1d625503f19e67865059194b621c4b
 Size (freeze-2.5.tar.gz) = 36402 bytes
 SHA1 (patch-aa) = 06f7ad902096118539be384574407d274a4bd718
 SHA1 (patch-ab) = ee451389539442c392830c7da252ac836d4a5adf

archivers/gcpio/Makefile

@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.51 2016/09/18 11:20:14 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2014/10/09 14:05:51 wiz Exp $
+#
 
-DISTNAME=	cpio-2.12
+DISTNAME=	cpio-2.11
 PKGNAME=	g${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_GNU:=cpio/}
 

archivers/gcpio/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2016/09/18 11:20:14 wiz Exp $
+@comment $NetBSD: PLIST,v 1.14 2013/07/21 10:31:26 shattered Exp $
 bin/gcpio
 gnu/bin/cpio
 gnu/man/man1/cpio.1
@@ -6,7 +6,7 @@ gnu/man/man1/mt.1
 info/cpio.info
 libexec/grmt
 man/man1/gcpio.1
-man/man8/grmt.8
+man/man1/gmt.1
 share/locale/da/LC_MESSAGES/cpio.mo
 share/locale/de/LC_MESSAGES/cpio.mo
 share/locale/es/LC_MESSAGES/cpio.mo
@@ -14,18 +14,14 @@ share/locale/fi/LC_MESSAGES/cpio.mo
 share/locale/fr/LC_MESSAGES/cpio.mo
 share/locale/ga/LC_MESSAGES/cpio.mo
 share/locale/gl/LC_MESSAGES/cpio.mo
-share/locale/hr/LC_MESSAGES/cpio.mo
 share/locale/hu/LC_MESSAGES/cpio.mo
 share/locale/id/LC_MESSAGES/cpio.mo
-share/locale/it/LC_MESSAGES/cpio.mo
-share/locale/ja/LC_MESSAGES/cpio.mo
 share/locale/ko/LC_MESSAGES/cpio.mo
 share/locale/nl/LC_MESSAGES/cpio.mo
 share/locale/pl/LC_MESSAGES/cpio.mo
 share/locale/pt_BR/LC_MESSAGES/cpio.mo
 share/locale/ro/LC_MESSAGES/cpio.mo
 share/locale/ru/LC_MESSAGES/cpio.mo
-share/locale/sr/LC_MESSAGES/cpio.mo
 share/locale/sv/LC_MESSAGES/cpio.mo
 share/locale/tr/LC_MESSAGES/cpio.mo
 share/locale/uk/LC_MESSAGES/cpio.mo

archivers/gcpio/distinfo

@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.16 2016/05/31 14:05:46 mef Exp $
+$NetBSD: distinfo,v 1.14 2013/06/09 14:35:12 ryoon Exp $
 
-SHA1 (cpio-2.12.tar.gz) = b366685662ab26661c6204b4631af6232e48be3f
+SHA1 (cpio-2.11.tar.gz) = 2c44a44195edf157060cb0b335a01ee0ece3169a
-RMD160 (cpio-2.12.tar.gz) = 0ba8b298e67ab8fa32fbc2512842c69026e7a3dc
+RMD160 (cpio-2.11.tar.gz) = 1442c8dcf07d8ef9fcda0b7727aab52fe84161ba
-SHA512 (cpio-2.12.tar.gz) = 640a6980273b699dba147e7b656440d3bd09c1c3ac71650f218ca1e4b4309c04b391ff2a8569e12d7a95827dd2781ab369542de20cc3c26dab3431f2efbdc905
+Size (cpio-2.11.tar.gz) = 1428330 bytes
-Size (cpio-2.12.tar.gz) = 1752066 bytes

archivers/gsharutils/Makefile

@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2015/11/07 19:28:49 dholland Exp $
+# $NetBSD: Makefile,v 1.53 2015/04/07 22:08:36 hiramatsu Exp $
 
 DISTNAME=	sharutils-4.15
 PKGNAME=	g${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_GNU:=sharutils/}
 

archivers/gsharutils/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2015/11/07 19:28:49 dholland Exp $
+@comment $NetBSD: PLIST,v 1.12 2015/04/07 22:08:36 hiramatsu Exp $
 bin/gshar
 bin/gunshar
 bin/guudecode
@@ -8,6 +8,7 @@ gnu/bin/unshar
 gnu/man/man1/shar.1
 gnu/man/man1/unshar.1
 info/sharutils.info
+lib/charset.alias
 man/man1/gshar.1
 man/man1/gunshar.1
 man/man1/guudecode.1

archivers/gsharutils/distinfo

@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.23 2015/11/03 00:56:21 agc Exp $
+$NetBSD: distinfo,v 1.22 2015/06/08 23:13:52 joerg Exp $
 
 SHA1 (sharutils-4.15.tar.gz) = a073d1912e537a53cabab210ca869adfd907f6f6
 RMD160 (sharutils-4.15.tar.gz) = fd8b1ebe41b1df398eef53513e2e5b5b53e8bbac
-SHA512 (sharutils-4.15.tar.gz) = 943a66b3d6a3de7a59073312449ffe945985e02f8dc8e24eb66fec99d05338dc70a1b4aa4018d6d60e84219cdd7e4c729daf8825f47a0b1de7c5be9bd267662a
 Size (sharutils-4.15.tar.gz) = 2196398 bytes
 SHA1 (patch-lib_fseeko.c) = 9308258bebbabc60a0203fd3baa054758ce60b02
 SHA1 (patch-libopts_libopts.c) = da5b86c5ba4dfdae5108476e46c1ed5e47a4254e

archivers/gtar-base/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2016/05/31 15:04:51 mef Exp $
+# $NetBSD: Makefile,v 1.90 2015/05/03 14:32:11 sevan Exp $
 #
 # Please run 'make files/gtar.1' when updating version of this package
 # to regenerate the man page. converters/help2man is needed.
@@ -6,6 +6,7 @@
 .include "../../archivers/gtar/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/tar/gtar-base/}
+PKGREVISION=	1
 COMMENT=	The GNU tape archiver with remote magnetic tape support
 LICENSE=	gnu-gpl-v3
 
@@ -49,10 +50,14 @@ PLIST.rmt=		yes
 CONFIGURE_ENV+=		gt_cv_func_gnugettext3_libintl=yes
 .endif
 
-CPPFLAGS.MirBSD+=	-Dstrtoimax=strtoll -Dstrtoumax=strtoull
+.if ${OPSYS} == "MirBSD"
+CPPFLAGS+=		-Dstrtoimax=strtoll -Dstrtoumax=strtoull
+.endif
 
+.if ${OPSYS} == "AIX"
 #bug 20453 in bug-gzip list, passed onto gnulib
-CONFIGURE_ENV.AIX+=	ac_cv_header_wctype_h=no
+CONFIGURE_ENV+= ac_cv_header_wctype_h=no
+.endif
 
 SYMLINKS=		bin/gtar ${PKGGNUDIR}bin/tar \
 			${PKGMANDIR}/man1/gtar.1 ${PKGGNUDIR}${PKGMANDIR}/man1/tar.1

archivers/gtar-base/distinfo

@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.40 2016/05/31 15:04:51 mef Exp $
+$NetBSD: distinfo,v 1.38 2015/01/26 12:41:53 jperkin Exp $
 
-SHA1 (tar-1.29.tar.bz2) = 057977c86293fddcbb04075ca70f41079e044949
+SHA1 (tar-1.28.tar.bz2) = 668ea52014ef7e70afc4ff7324410ee32f2970ef
-RMD160 (tar-1.29.tar.bz2) = 27a18fd2a557fb6dc37218c96b3c3223527604a4
+RMD160 (tar-1.28.tar.bz2) = a2edf2a854fa9a7bc7383638038a7465ae8bba51
-SHA512 (tar-1.29.tar.bz2) = d2cea9892892dfa0c8efd390303b75dccc085c4895e07ced684074592d69729916d6ea12475aa6aff873d076a729bb7dc2499c233edcfb9c7e8e8995481eef3b
+Size (tar-1.28.tar.bz2) = 2693989 bytes
-Size (tar-1.29.tar.bz2) = 2715993 bytes
 SHA1 (patch-Makefile.in) = 78cc142b9370317c52215c106ea1e7217e71f9b5
-SHA1 (patch-gnu_readlinkat.c) = ce9869bfcd75005bb4ddac4e3223df01a26a2b29
+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/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-gnu_readlinkat.c

@@ -1,14 +1,14 @@
-$NetBSD: patch-gnu_readlinkat.c,v 1.2 2016/05/31 15:04:51 mef Exp $
+$NetBSD: patch-gnu_readlinkat.c,v 1.1 2014/03/18 09:03:26 obache Exp $
 
 * workaround for NetBSD-5.x, readlink is defined as a macro.
 
---- gnu/readlinkat.c.orig	2015-08-24 19:08:25.000000000 +0900
+--- gnu/readlinkat.c.orig	2013-06-29 05:54:25.000000000 +0000
-+++ gnu/readlinkat.c	2016-05-31 23:53:11.000000000 +0900
++++ gnu/readlinkat.c
-@@ -69,6 +69,7 @@ rpl_readlinkat (int fd, char const *file
+@@ -41,6 +41,7 @@
- # define AT_FUNC_POST_FILE_PARAM_DECLS , char *buf, size_t len
+ #define AT_FUNC_POST_FILE_PARAM_DECLS , char *buf, size_t len
- # define AT_FUNC_POST_FILE_ARGS        , buf, len
+ #define AT_FUNC_POST_FILE_ARGS        , buf, len
- # define AT_FUNC_RESULT ssize_t
+ #define AT_FUNC_RESULT ssize_t
-+# undef readlink
++#undef readlink
- # include "at-func.c"
+ #include "at-func.c"
- # undef AT_FUNC_NAME
+ #undef AT_FUNC_NAME
- # undef AT_FUNC_F1
+ #undef AT_FUNC_F1

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/Makefile.common

@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.2 2016/05/31 15:04:51 mef Exp $
+# $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.29
+DISTNAME=	tar-1.28
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_GNU:=tar/}
 EXTRACT_SUFX=	.tar.bz2

archivers/gzip/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2016/02/25 09:28:36 jperkin Exp $
+# $NetBSD: Makefile,v 1.34 2015/05/09 23:00:39 sevan Exp $
 
 DISTNAME=	gzip-1.6
 CATEGORIES=	archivers
@@ -19,7 +19,11 @@ MAKE_FLAGS+=	manlinks=so
 INFO_FILES=	yes
 CHECK_PERMS=	no	# can't depend on checkperms; it's distfile is gzipped
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "AIX"
 #bug 20453 in bug-gzip list, passed onto gnulib
-CONFIGURE_ENV.AIX+=	ac_cv_header_wctype_h=no
+CONFIGURE_ENV+=	ac_cv_header_wctype_h=no
+.endif
 
 .include "../../mk/bsd.pkg.mk"

archivers/gzip/distinfo

@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.9 2015/11/03 00:56:21 agc Exp $
+$NetBSD: distinfo,v 1.8 2013/10/29 13:32:07 obache Exp $
 
 SHA1 (gzip-1.6.tar) = 7d546c77fd49f1dc093c0fb23512bf926ce94a40
 RMD160 (gzip-1.6.tar) = 62a506b3305c0d112410574fbe8ace537b32ae10
-SHA512 (gzip-1.6.tar) = f1a076fae64213a71faf85ec3e26135a5742777a32e613e2df9efedd46033b95dc98fb5622cff242a9e79daaf175ec6bb084ef1e169c113c0210ad9a7bde1f59
 Size (gzip-1.6.tar) = 5048320 bytes
 SHA1 (patch-aa) = a08b277aa95df808d055f4daf95fd1462c300290
 SHA1 (patch-ab) = 738d6e5f9300c2718694cc4134b36637b323ea8a

archivers/gzrecover/distinfo

@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 00:56:21 agc Exp $
+$NetBSD: distinfo,v 1.4 2014/11/20 07:41:06 mef Exp $
 
 SHA1 (gzrt-0.8.tar.gz) = a354901b7aa2192bafdc34f43fbfde3cd7de2822
 RMD160 (gzrt-0.8.tar.gz) = 3d35163f9351f1f496f69a143b0353448de50b22
-SHA512 (gzrt-0.8.tar.gz) = a1ca41320ec39a8d439e5c32fa950fa52c09caf7e9719ca63ff3aec23bbaafa88f78f9b7fc325bb2ba19a1555f12b89fbef91f7708fdbb3ec852d78bf531fc85
 Size (gzrt-0.8.tar.gz) = 7311 bytes

archivers/ha/distinfo

@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 00:56:21 agc Exp $
+$NetBSD: distinfo,v 1.7 2013/09/18 20:58:35 asau Exp $
 
 SHA1 (ha0999.tgz) = 8dd106748619772f988ee0bce59937a4de1677ed
 RMD160 (ha0999.tgz) = 41b52392267551f834b58e0a4b69b89e813c8bd6
-SHA512 (ha0999.tgz) = 73e07707a4d0c0576f25abb6e388b7d507b92688a205870b13a88c11469319671057c40ce0e87d9b616df430524169c1c5422019298aaf6b3a54e2cfe2e64fe8
 Size (ha0999.tgz) = 44271 bytes
 SHA1 (patch-aa) = 3cb453dd45de59331542a83328759d00b156a933
 SHA1 (patch-ab) = 671ad83192103551401a2aebadf3900c9669c2d8

archivers/hpack/Makefile

@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.39 2016/01/23 05:56:39 zafer Exp $
+# $NetBSD: Makefile,v 1.38 2014/10/09 14:05:52 wiz Exp $
 
 DISTNAME=	hpack79src
 PKGNAME=	hpack-0.79
 PKGREVISION=	2
 CATEGORIES=	archivers
-MASTER_SITES=	ftp://ftp.csc.fi/index/crypt/archive/idea.sec.dsi.unimi.it/code/
+MASTER_SITES=	ftp://ftp.franken.de/pub/crypt/misc/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Multi-System Archiver with open keys PGP-based security

archivers/hpack/distinfo

@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.12 2015/11/03 00:56:22 agc Exp $
+$NetBSD: distinfo,v 1.11 2011/09/12 04:46:54 dholland Exp $
 
 SHA1 (hpack-0.79/hpack79src.tar.gz) = cbfd755f1c4fcc4ecf8cd8be476db98e31dede1a
 RMD160 (hpack-0.79/hpack79src.tar.gz) = fcd1265ff858dcca3090bdede86e90da293cf3a2
-SHA512 (hpack-0.79/hpack79src.tar.gz) = a38e400b9498fd7fcccf2d08a18867f22541278532e89731a8e6a9efd2e321dd4f73b9b6e7df13a1a4fab91a039f1a30c4d8bbb8c07cad1f869dfbc985130a39
 Size (hpack-0.79/hpack79src.tar.gz) = 545648 bytes
 SHA1 (patch-aa) = 97cfb7de5acd8f6171a461b818d3ad4f1e8b181e
 SHA1 (patch-ab) = 48fa56d17725d2b3de87955f09d82624d14e2f56

archivers/hs-zlib/distinfo

@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 00:56:22 agc Exp $
+$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
-SHA512 (zlib-0.5.4.1.tar.gz) = aa3522a5704978badcf634e1d99282144f01ddee4600bd146631a3ee8b98080914eb2887869a5fa404dc9d1e438a5df87cf7d44548c2f3e1ec13ba19004ef985
 Size (zlib-0.5.4.1.tar.gz) = 127760 bytes

archivers/innoextract/Makefile

@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2016/04/15 10:23:10 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2015/04/17 15:52:58 adam Exp $
 
-DISTNAME=	innoextract-1.6
+DISTNAME=	innoextract-1.4
+PKGREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	http://constexpr.org/innoextract/files/
 

archivers/innoextract/distinfo

@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2016/04/15 10:23:10 wiz Exp $
+$NetBSD: distinfo,v 1.1 2015/04/03 09:40:54 wiz Exp $
 
-SHA1 (innoextract-1.6.tar.gz) = 0cbbe80bb362db93c9b230c47ee100828cd93bec
+SHA1 (innoextract-1.4.tar.gz) = 3fd3ac98c802c72a1f4ae5f6e6a5dca35747ff98
-RMD160 (innoextract-1.6.tar.gz) = 6c659ba6a4740e33ee2439df095c2e9c7336c011
+RMD160 (innoextract-1.4.tar.gz) = 5f9cd26d508ee8f28cedaa619df4108f5f761a9c
-SHA512 (innoextract-1.6.tar.gz) = 4c1b50a050d45e1a56d7236150a801cb85d15de8c80f5f1fd94750f3dd2392bdfb3f0e98c214e9504fe6132c7dce3a0dfbe0815ede438aa0f76a88380ceeef62
+Size (innoextract-1.4.tar.gz) = 151230 bytes
-Size (innoextract-1.6.tar.gz) = 183380 bytes
+SHA1 (patch-CMakeLists.txt) = ebc9db4211bf01ebab6881ea23e3e5c32321a7aa
+SHA1 (patch-cmake_VersionString.cmake) = db368ea50042a73b78770c0b43d3480398fdff1c

archivers/innoextract/patches/patch-CMakeLists.txt

@@ -0,0 +1,17 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2015/04/03 09:40:54 wiz Exp $
+
+Fix use of CMAKE_MODULE_PATH
+
+--- CMakeLists.txt.orig	2013-05-22 21:50:31.000000000 +0200
++++ CMakeLists.txt	2013-05-22 21:52:02.000000000 +0200
+@@ -45,7 +45,9 @@
+ 
+ include(CheckSymbolExists)
+ 
+-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") # For custom cmake modules
++# For custom cmake modules
++set(CMAKE_CUSTOM_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
++set(CMAKE_MODULE_PATH "${CMAKE_CUSTOM_MODULE_PATH}")
+ include(BuildType)
+ include(CompileCheck)
+ include(CXX11Check)

archivers/innoextract/patches/patch-cmake_VersionString.cmake

@@ -0,0 +1,24 @@
+$NetBSD: patch-cmake_VersionString.cmake,v 1.1 2015/04/03 09:40:54 wiz Exp $
+
+Fix use of CMAKE_MODULE_PATH
+
+--- cmake/VersionString.cmake.orig	2013-05-22 21:52:30.000000000 +0200
++++ cmake/VersionString.cmake	2013-05-22 21:53:26.000000000 +0200
+@@ -47,7 +47,7 @@
+ 	set(mode "variable")
+ 	
+ 	set(args)
+-	set(dependencies "${CMAKE_MODULE_PATH}/VersionScript.cmake")
++	set(dependencies "${CMAKE_CUSTOM_MODULE_PATH}/VersionScript.cmake")
+ 	
+ 	foreach(arg IN LISTS VERSION_SOURCES)
+ 		
+@@ -90,7 +90,7 @@
+ 			"-DVERSION_SOURCES=${args}"
+ 			"-DGIT_DIR=${abs_git_dir}"
+ 			${defines}
+-			-P "${CMAKE_MODULE_PATH}/VersionScript.cmake"
++			-P "${CMAKE_CUSTOM_MODULE_PATH}/VersionScript.cmake"
+ 		MAIN_DEPENDENCY
+ 			"${abs_src}"
+ 		DEPENDS

archivers/jamjar/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2015/11/25 12:47:32 jperkin Exp $
+# $NetBSD: Makefile,v 1.20 2014/10/09 14:05:52 wiz Exp $
 #
 
 DISTNAME=	jamjar-0.7.1
@@ -13,10 +13,11 @@ BUILD_DEPENDS+=	acunia-jam>=1.0:../../devel/acunia-jam
 
 WRKSRC=		${WRKDIR}/jamjar
 
+EVAL_PREFIX+=	ACUNIA_JAM_PREFIX=acunia-jam
 JAM_COMMAND=	\
 	cd ${WRKSRC} &&							\
 		${SETENV} ${MAKE_ENV}					\
-		${LOCALBASE}/bin/jam					\
+		${ACUNIA_JAM_PREFIX}/bin/jam				\
 			-sPREFIX="${DESTDIR}${PREFIX}"			\
 			-sCFLAGS="${CFLAGS}"
 

archivers/jamjar/distinfo

@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 00:56:22 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/02/23 14:45:23 agc Exp $
 
 SHA1 (jamjar-0.7.1.tar.gz) = df89da05c59340e347c9308809d2c0fb30389a5b
 RMD160 (jamjar-0.7.1.tar.gz) = 010bdedb903d1eba20c10ad801914bbe1d67adad
-SHA512 (jamjar-0.7.1.tar.gz) = 01aed5a4bdafbeaadb569e2c188911cee3b9f3da76f4ce222189630eab3996d9059999969e2581fb224b0f57579fcca97e87607dc4f699f82e8326cce8f0c730
 Size (jamjar-0.7.1.tar.gz) = 187035 bytes
 SHA1 (patch-aa) = 9db8bef4191f3b1d82862ab7a1ed42977499a28e

archivers/karchive/DESCR

@@ -1,5 +0,0 @@
-KArchive provides classes for easy reading, creation and manipulation of
-"archive" formats like ZIP and TAR.
-
-It also provides transparent compression and decompression of data, like the
-GZip format, via a subclass of QIODevice.

archivers/karchive/Makefile

@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2016/05/25 23:20:33 markd Exp $
-
-DISTNAME=	karchive-${KF5VER}
-CATEGORIES=	archivers
-
-HOMEPAGE=	https://community.kde.org/Frameworks
-COMMENT=	Qt 5 addon providing access to numerous types of archives
-LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2.1
-
-.include "../../meta-pkgs/kf5/Makefile.common"
-
-.include "../../archivers/bzip2/buildlink3.mk"
-.include "../../archivers/xz/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"

archivers/karchive/PLIST

@@ -1,35 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2016/05/25 23:20:33 markd Exp $
-include/KF5/KArchive/K7Zip
-include/KF5/KArchive/KAr
-include/KF5/KArchive/KArchive
-include/KF5/KArchive/KArchiveDirectory
-include/KF5/KArchive/KArchiveEntry
-include/KF5/KArchive/KArchiveFile
-include/KF5/KArchive/KCompressionDevice
-include/KF5/KArchive/KFilterBase
-include/KF5/KArchive/KFilterDev
-include/KF5/KArchive/KTar
-include/KF5/KArchive/KZip
-include/KF5/KArchive/KZipFileEntry
-include/KF5/KArchive/k7zip.h
-include/KF5/KArchive/kar.h
-include/KF5/KArchive/karchive.h
-include/KF5/KArchive/karchive_export.h
-include/KF5/KArchive/karchivedirectory.h
-include/KF5/KArchive/karchiveentry.h
-include/KF5/KArchive/karchivefile.h
-include/KF5/KArchive/kcompressiondevice.h
-include/KF5/KArchive/kfilterbase.h
-include/KF5/KArchive/kfilterdev.h
-include/KF5/KArchive/ktar.h
-include/KF5/KArchive/kzip.h
-include/KF5/KArchive/kzipfileentry.h
-include/KF5/karchive_version.h
-lib/cmake/KF5Archive/KF5ArchiveConfig.cmake
-lib/cmake/KF5Archive/KF5ArchiveConfigVersion.cmake
-lib/cmake/KF5Archive/KF5ArchiveTargets-noconfig.cmake
-lib/cmake/KF5Archive/KF5ArchiveTargets.cmake
-lib/libKF5Archive.so
-lib/libKF5Archive.so.5
-lib/libKF5Archive.so.${PKGVERSION}
-qt5/mkspecs/modules/qt_KArchive.pri

archivers/karchive/buildlink3.mk

@@ -1,14 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1 2016/05/25 23:20:33 markd Exp $
-
-BUILDLINK_TREE+=	karchive
-
-.if !defined(KARCHIVE_BUILDLINK3_MK)
-KARCHIVE_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.karchive+=	karchive>=5.18.0
-BUILDLINK_PKGSRCDIR.karchive?=	../../archivers/karchive
-
-.include "../../x11/qt5-qtbase/buildlink3.mk"
-.endif	# KARCHIVE_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-karchive

archivers/karchive/distinfo

@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2016/08/21 21:13:42 markd Exp $
-
-SHA1 (karchive-5.25.0.tar.xz) = 298351569bbd505568243a2475e2cfabcf71a836
-RMD160 (karchive-5.25.0.tar.xz) = 8b89f137e5d8af008af069b851e5b1d2ddcd4a38
-SHA512 (karchive-5.25.0.tar.xz) = 5109af21e1fb2257f1885813483d9ebcfaec99eb3dcce11b22619879753508c51d7cbaba1afb232d021febc46eabc14ba1ad3fc39fabe6a04f5833696034d1ff
-Size (karchive-5.25.0.tar.xz) = 110828 bytes

archivers/lbrate/distinfo

@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.7 2015/11/03 00:56:22 agc Exp $
+$NetBSD: distinfo,v 1.6 2012/01/29 08:26:32 sbd Exp $
 
 SHA1 (lbrate-1.1.tar.gz) = 8731283e79fa6c7a73ebd6c821b42854cb864ea9
 RMD160 (lbrate-1.1.tar.gz) = ccf0d889eb597d3beecceb40349ddbf00f0273c8
-SHA512 (lbrate-1.1.tar.gz) = a14ab609fafa2aa8f751140774ad817edf60c7ccc8d5e55d4446bde8a8cc62a33d6f4b8cd308c22e41642ff3f79550d0087f1294f1016d5ca1bb99757d9a76de
 Size (lbrate-1.1.tar.gz) = 29907 bytes
 SHA1 (patch-aa) = 2a20b1d56a266316ba4968a40f3bc6bed6deaead
 SHA1 (patch-ab) = 94127154f052908a99fb7a6a218984637850b93d

archivers/lcab/distinfo

@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 00:56:22 agc Exp $
+$NetBSD: distinfo,v 1.3 2008/07/28 19:42:33 plunky Exp $
 
 SHA1 (lcab-1.0b12.tar.gz) = 3e5a1f23f0ea1c991e80322592e3ede9f38ecd94
 RMD160 (lcab-1.0b12.tar.gz) = 2b6978175248ac048613e4414acc121df103de7a
-SHA512 (lcab-1.0b12.tar.gz) = 7aeb1b2aa0b9171963b771cfbec13d1a6d4b2519f0f6f2705b505d0ec7a7425764996de00ed1d2919d08c525617d029035a586e8c7e2fad2f44945fddd2afbcf
 Size (lcab-1.0b12.tar.gz) = 74907 bytes

archivers/lha/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2016/02/25 09:28:36 jperkin Exp $
+# $NetBSD: Makefile,v 1.39 2014/10/09 14:05:52 wiz Exp $
 
 DISTNAME=	lha-114i
 PKGNAME=	lha-114.9
@@ -17,11 +17,14 @@ NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_FTP=	${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
+.include "../../mk/bsd.prefs.mk"
+
 MAKE_FLAGS+=	MAKE=${MAKE_PROGRAM:Q}
 
-OPSYSVARS+=	LHA_CPPFLAGS
 LHA_CPPFLAGS=	-DSYSTIME_HAS_NO_TM -DMKTIME -DUSESTRCASECMP -DSYSV_SYSTEM_DIR
-LHA_CPPFLAGS.Darwin+=	-DHAVE_NO_LCHOWN
+.if ${OPSYS} == "Darwin"
+LHA_CPPFLAGS+=	-DHAVE_NO_LCHOWN
+.endif
 MAKE_FLAGS+=	MACHINE=${LHA_CPPFLAGS:Q}
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/ja_JP.EUC/man1

archivers/lha/distinfo

@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.11 2015/11/03 00:56:22 agc Exp $
+$NetBSD: distinfo,v 1.10 2010/01/09 19:10:46 dholland Exp $
 
 SHA1 (lha-114i.tar.gz) = 79e35271f2cf783f946db3f22e304fef72dbac99
 RMD160 (lha-114i.tar.gz) = c561e0758b467a61f45d287582effc53df29f01d
-SHA512 (lha-114i.tar.gz) = fe91184a32800306277c74ce7bf7d3edacb3a93da319bd59fc25023fb5bab9e3169bca63d8b49a05fac68900cc0eb63d0f1b4f0234522a5ef64f90f407488f07
 Size (lha-114i.tar.gz) = 64608 bytes
 SHA1 (patch-aa) = 945856fde42c3e98bb2b00f8633babc2daf0437c
 SHA1 (patch-ab) = 4b5cce4fd83a5a65cb152183d23f430da1e5aa21

archivers/lhasa/Makefile

@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2016/06/22 10:30:18 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2015/08/26 21:25:31 shattered Exp $
 
-DISTNAME=	lhasa-0.3.1
+DISTNAME=	lhasa-0.3.0
 CATEGORIES=	archivers
 MASTER_SITES=	https://soulsphere.org/projects/lhasa/
 
@@ -14,13 +14,6 @@ GNU_CONFIGURE=		yes
 PKGCONFIG_OVERRIDE=	liblhasa.pc.in
 TEST_TARGET=		check
 
-USE_TOOLS+=		bash # tests-only
+CONFLICTS=		lha-[0-9]*
-REPLACE_BASH+=		test/test-dry-run
-REPLACE_BASH+=		test/test-crc-output
-REPLACE_BASH+=		test/test-print
-REPLACE_BASH+=		test/test-decompress
-REPLACE_BASH+=		test/test-file-headers
-REPLACE_BASH+=		test/test-extract
-REPLACE_BASH+=		test/test-list-output
 
 .include "../../mk/bsd.pkg.mk"

archivers/lhasa/distinfo

@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.8 2016/06/22 10:30:18 wiz Exp $
+$NetBSD: distinfo,v 1.6 2015/08/26 21:25:31 shattered Exp $
 
-SHA1 (lhasa-0.3.1.tar.gz) = 1a5d827100d1e6445b377029b69b901af3ffa240
+SHA1 (lhasa-0.3.0.tar.gz) = 044e9bf2bcef5664c1e13ecf440c4a4829059f0d
-RMD160 (lhasa-0.3.1.tar.gz) = 4e4cef0525d99c0b4cbe58529da8edaf6b01608b
+RMD160 (lhasa-0.3.0.tar.gz) = 55d3dc69186fdc138279106f94cfb424559fad84
-SHA512 (lhasa-0.3.1.tar.gz) = 6e4797aaa054f2ecd25069b32b809ab0111d0179adfd9c676e0609d69efbcc968ec6dce67fbd8ce6bccc102d09ee69996805a5542882b432731e3c273f132c05
+Size (lhasa-0.3.0.tar.gz) = 2921183 bytes
-Size (lhasa-0.3.1.tar.gz) = 2933084 bytes

archivers/libarchive/Makefile

@@ -1,23 +1,22 @@
-# $NetBSD: Makefile,v 1.46 2016/09/14 12:57:55 gdt Exp $
+# $NetBSD: Makefile,v 1.41 2015/01/17 12:44:47 adam Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=	2
 COMMENT=	Library to read/create different archive formats
 
 USE_LIBTOOL=		yes
-CONFIGURE_ARGS+=	--disable-bsdcat
 CONFIGURE_ARGS+=	--disable-bsdcpio
 CONFIGURE_ARGS+=	--disable-bsdtar
 
 do-extract:
 	${CP} -r ${FILESDIR} ${WRKSRC}
-	# Contents of ${FILESDIR} may not have the u=w bit set, and
-	# the build system assumes files in ${WRKSRC} are writable.
-	${CHMOD} -R u+w ${WRKSRC}
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == SunOS
 # workaround for pkg/45491
-CONFIGURE_ENV.SunOS+=	ac_cv_header_ext2fs_ext2_fs_h=no
+CONFIGURE_ENV+=		ac_cv_header_ext2fs_ext2_fs_h=no
+.endif
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"

archivers/libarchive/Makefile.common

@@ -1,8 +1,9 @@
-# $NetBSD: Makefile.common,v 1.6 2016/06/21 12:23:01 joerg Exp $
+# $NetBSD: Makefile.common,v 1.3 2015/05/14 14:54:55 sevan Exp $
 # used by archivers/bsdtar/Makefile
 # used by archivers/libarchive/Makefile
 
-DISTNAME=	libarchive-3.2.1
+DISTNAME=	libarchive-3.1.2
+PKGREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.libarchive.org/downloads/
 DISTFILES=	# empty
@@ -17,4 +18,3 @@ CONFIGURE_ARGS+=	--without-expat
 CONFIGURE_ARGS+=	--without-lzo2
 CONFIGURE_ARGS+=	--without-nettle
 CONFIGURE_ARGS+=	--without-xml2
-CONFIGURE_ARGS+=	--disable-maintainer-mode

archivers/libarchive/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2016/06/20 17:28:33 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
@@ -11,7 +11,6 @@ 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_add_passphrase.3
 man/man3/archive_read_data.3
 man/man3/archive_read_disk.3
 man/man3/archive_read_extract.3
@@ -35,7 +34,6 @@ 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/archive_write_set_passphrase.3
 man/man3/libarchive.3
 man/man3/libarchive_changes.3
 man/man3/libarchive_internals.3

archivers/libarchive/buildlink3.mk

@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2016/07/01 17:55:22 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2015/01/17 12:44:47 adam Exp $
 
 BUILDLINK_TREE+=	libarchive
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libarchive
 LIBARCHIVE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libarchive+=	libarchive>=3.1
-BUILDLINK_ABI_DEPENDS.libarchive+=	libarchive>=3.2.1nb2
+BUILDLINK_ABI_DEPENDS.libarchive+=	libarchive>=3.1.2
 BUILDLINK_PKGSRCDIR.libarchive?=	../../archivers/libarchive
 
 CHECK_BUILTIN.libarchive:=	yes

archivers/libarchive/files/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.6 FATAL_ERROR)
 #
 PROJECT(libarchive C)
 #
@@ -15,7 +15,7 @@ endif()
 #   RelWithDebInfo : Release build with Debug Info
 #   MinSizeRel     : Release Min Size build
 IF(NOT CMAKE_BUILD_TYPE)
-  SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Build Type" FORCE)
+  SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build Type" FORCE)
 ENDIF(NOT CMAKE_BUILD_TYPE)
 # Set a value type to properly display CMAKE_BUILD_TYPE on GUI if the
 # value type is "UNINITIALIZED".
@@ -35,9 +35,6 @@ ENDIF(NOT "${CMAKE_BUILD_TYPE}"
 # On MacOS, prefer MacPorts libraries to system libraries.
 # I haven't come up with a compelling argument for this to be conditional.
 list(APPEND CMAKE_PREFIX_PATH /opt/local)
-# Enable @rpath in the install name.
-# detail in "cmake  --help-policy CMP0042"
-SET(CMAKE_MACOSX_RPATH ON)
 
 #
 # Version - read from 'version' file.
@@ -58,12 +55,11 @@ STRING(REGEX REPLACE "[0]*([^0]*[0-9])$" "\\1" _trimmed_revision ${_revision})
 SET(VERSION                    "${_major}.${_trimmed_minor}.${_trimmed_revision}${_quality}")
 SET(BSDCPIO_VERSION_STRING     "${VERSION}")
 SET(BSDTAR_VERSION_STRING      "${VERSION}")
-SET(BSDCAT_VERSION_STRING      "${VERSION}")
 SET(LIBARCHIVE_VERSION_NUMBER  "${_version_number}")
 SET(LIBARCHIVE_VERSION_STRING  "${VERSION}")
 
 # INTERFACE_VERSION increments with every release
-# libarchive 2.7 == interface version 9 = 2 + 7
+# libarchive 2.7 == interface version 9 = 2 + 7 
 # libarchive 2.8 == interface version 10 = 2 + 8
 # libarchive 2.9 == interface version 11 = 2 + 9
 # libarchive 3.0 == interface version 12
@@ -88,7 +84,7 @@ SET(CMAKE_REQUIRED_FLAGS)
 # Especially for early development, we want to be a little
 # aggressive about diagnosing build problems; this can get
 # relaxed somewhat in final shipping versions.
-IF (CMAKE_C_COMPILER_ID MATCHES "^GNU$")
+IF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$")
   SET(CMAKE_REQUIRED_FLAGS "-Wall -Wformat -Wformat-security")
   #################################################################
   # Set compile flags for all build types.
@@ -96,43 +92,11 @@ IF (CMAKE_C_COMPILER_ID MATCHES "^GNU$")
   #################################################################
   # Set compile flags for debug build.
   # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"
-  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror")
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror -Wextra -Wunused")
-  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wextra")
-  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wunused")
   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wshadow")
   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wmissing-prototypes")
   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wcast-qual")
-ENDIF (CMAKE_C_COMPILER_ID MATCHES "^GNU$")
+ENDIF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$")
-IF (CMAKE_C_COMPILER_ID MATCHES "^Clang$")
-  SET(CMAKE_REQUIRED_FLAGS "-Wall -Wformat -Wformat-security")
-  #################################################################
-  # Set compile flags for all build types.
-  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wformat -Wformat-security")
-  #################################################################
-  # Set compile flags for debug build.
-  # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"
-  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g")
-  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror")
-  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wextra")
-  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wunused")
-  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wshadow")
-  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wmissing-prototypes")
-  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wcast-qual")
-ENDIF (CMAKE_C_COMPILER_ID MATCHES "^Clang$")
-IF (CMAKE_C_COMPILER_ID MATCHES "^XL$")
-  SET(CMAKE_C_COMPILER "xlc_r")
-  SET(CMAKE_REQUIRED_FLAGS "-qflag=e:e -qformat=sec")
-  #################################################################
-  # Set compile flags for all build types.
-  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -qflag=e:e -qformat=sec")
-  #################################################################
-  # Set compile flags for debug build.
-  # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"
-  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g")
-  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -qhalt=w")
-  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -qflag=w:w")
-  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -qinfo=pro:use")
-ENDIF(CMAKE_C_COMPILER_ID MATCHES "^XL$")
 IF (MSVC)
   #################################################################
   # Set compile flags for debug build.
@@ -179,36 +143,17 @@ include(CTest)
 
 OPTION(ENABLE_NETTLE "Enable use of Nettle" ON)
 OPTION(ENABLE_OPENSSL "Enable use of OpenSSL" ON)
-OPTION(ENABLE_LZMA "Enable the use of the system found LZMA library if found" ON)
-OPTION(ENABLE_ZLIB "Enable the use of the system found ZLIB library if found" ON)
-OPTION(ENABLE_BZip2 "Enable the use of the system found BZip2 library if found" ON)
-OPTION(ENABLE_LIBXML2 "Enable the use of the system found libxml2 library if found" ON)
-OPTION(ENABLE_EXPAT "Enable the use of the system found EXPAT library if found" ON)
-OPTION(ENABLE_PCREPOSIX "Enable the use of the system found PCREPOSIX library if found" ON)
-OPTION(ENABLE_LibGCC "Enable the use of the system found LibGCC library if found" ON)
-# CNG is used for encrypt/decrypt Zip archives on Windows.
-OPTION(ENABLE_CNG "Enable the use of CNG(Crypto Next Generation)" ON)
-
 OPTION(ENABLE_TAR "Enable tar building" ON)
 OPTION(ENABLE_TAR_SHARED "Enable dynamic build of tar" FALSE)
 OPTION(ENABLE_CPIO "Enable cpio building" ON)
 OPTION(ENABLE_CPIO_SHARED "Enable dynamic build of cpio" FALSE)
-OPTION(ENABLE_CAT "Enable cat building" ON)
-OPTION(ENABLE_CAT_SHARED "Enable dynamic build of cat" FALSE)
 OPTION(ENABLE_XATTR "Enable extended attribute support" ON)
 OPTION(ENABLE_ACL "Enable ACL support" ON)
 OPTION(ENABLE_ICONV "Enable iconv support" ON)
 OPTION(ENABLE_TEST "Enable unit and regression tests" ON)
-OPTION(ENABLE_COVERAGE "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)" FALSE)
-OPTION(ENABLE_INSTALL "Enable installing of libraries" ON)
-
 SET(POSIX_REGEX_LIB "AUTO" CACHE STRING "Choose what library should provide POSIX regular expression support")
 SET(ENABLE_SAFESEH "AUTO" CACHE STRING "Enable use of /SAFESEH linker flag (MSVC only)")
-SET(WINDOWS_VERSION "WIN7" CACHE STRING "Set Windows version to use (Windows only)")
+SET(WINDOWS_VERSION "" CACHE STRING "Set Windows version to use (Windows only)")
-
-IF(ENABLE_COVERAGE)
-	include(LibarchiveCodeCoverage)
-ENDIF(ENABLE_COVERAGE)
 
 IF(ENABLE_TEST)
 	ENABLE_TESTING()
@@ -216,35 +161,22 @@ ENDIF(ENABLE_TEST)
 
 IF(WIN32)
   IF(WINDOWS_VERSION STREQUAL "WIN8")
-    SET(NTDDI_VERSION 0x06020000)
-    SET(_WIN32_WINNT 0x0602)
     SET(WINVER 0x0602)
   ELSEIF(WINDOWS_VERSION STREQUAL "WIN7")
-    SET(NTDDI_VERSION 0x06010000)
-    SET(_WIN32_WINNT 0x0601)
     SET(WINVER 0x0601)
   ELSEIF(WINDOWS_VERSION STREQUAL "WS08")
-    SET(NTDDI_VERSION 0x06000100)
-    SET(_WIN32_WINNT 0x0600)
     SET(WINVER 0x0600)
   ELSEIF(WINDOWS_VERSION STREQUAL "VISTA")
-    SET(NTDDI_VERSION 0x06000000)
-    SET(_WIN32_WINNT 0x0600)
     SET(WINVER 0x0600)
   ELSEIF(WINDOWS_VERSION STREQUAL "WS03")
-    SET(NTDDI_VERSION 0x05020000)
-    SET(_WIN32_WINNT 0x0502)
     SET(WINVER 0x0502)
   ELSEIF(WINDOWS_VERSION STREQUAL "WINXP")
-    SET(NTDDI_VERSION 0x05010000)
-    SET(_WIN32_WINNT 0x0501)
     SET(WINVER 0x0501)
   ELSE(WINDOWS_VERSION STREQUAL "WIN8")
-    # Default to Windows Server 2003 API if we don't recognize the specifier
+    # The default is to use Windows 2000 API.
-    SET(NTDDI_VERSION 0x05020000)
+    SET(WINVER 0x0500)
-    SET(_WIN32_WINNT 0x0502)
-    SET(WINVER 0x0502)
   ENDIF(WINDOWS_VERSION STREQUAL "WIN8")
+  SET(_WIN32_WINNT ${WINVER})
 ENDIF(WIN32)
 
 IF(MSVC)
@@ -252,12 +184,12 @@ IF(MSVC)
     SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH")
     SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH")
     SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /SAFESEH")
-    SET(ENV{LDFLAGS} "$ENV{LDFLAGS} /SAFESEH")
+	SET(CMAKE_REQUIRED_LINKER_FLAGS "/SAFESEH")
   ELSEIF(ENABLE_SAFESEH STREQUAL "NO")
     SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO")
     SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO")
     SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /SAFESEH:NO")
-    SET(ENV{LDFLAGS} "$ENV{LDFLAGS} /SAFESEH:NO")
+	SET(CMAKE_REQUIRED_LINKER_FLAGS "/SAFESEH:NO")
   ENDIF(ENABLE_SAFESEH STREQUAL "YES")
 ENDIF(MSVC)
 
@@ -266,8 +198,8 @@ IF("${CMAKE_C_PLATFORM_ID}" MATCHES "^(HP-UX)$")
 ENDIF()
 
 #
-INCLUDE(CheckCSourceCompiles)
+INCLUDE(LibarchiveCheckCSourceCompiles)
-INCLUDE(CheckCSourceRuns)
+INCLUDE(LibarchiveCheckCSourceRuns)
 INCLUDE(CheckFileOffsetBits)
 INCLUDE(CheckFuncs)
 INCLUDE(CheckHeaderDirent)
@@ -331,9 +263,9 @@ MACRO (TRY_MACRO_FOR_LIBRARY INCLUDES LIBRARIES
       ENDIF(NOT "${PREV_VAR_WITH_LIB}" STREQUAL "${LIBRARIES}")
       # Check if the library can be used with the macro.
       IF("${TRY_TYPE}" MATCHES "COMPILES")
-        CHECK_C_SOURCE_COMPILES("${SAMPLE_SOURCE}" ${VAR})
+        LIBARCHIVE_CHECK_C_SOURCE_COMPILES("${SAMPLE_SOURCE}" ${VAR})
       ELSEIF("${TRY_TYPE}" MATCHES "RUNS")
-        CHECK_C_SOURCE_RUNS("${SAMPLE_SOURCE}" ${VAR})
+        LIBARCHIVE_CHECK_C_SOURCE_RUNS("${SAMPLE_SOURCE}" ${VAR})
       ELSE("${TRY_TYPE}" MATCHES "COMPILES")
         MESSAGE(FATAL_ERROR "UNKNOWN KEYWORD \"${TRY_TYPE}\" FOR TRY_TYPE")
       ENDIF("${TRY_TYPE}" MATCHES "COMPILES")
@@ -365,11 +297,11 @@ IF(DEFINED __GNUWIN32PATH AND EXISTS "${__GNUWIN32PATH}")
   #   e.g.
   #     cmake -DCMAKE_PREFIX_PATH=<your-GnuWin32-path> <path-to-source>
   #
-  # If compiling error occurred in zconf.h, You may need patch to zconf.h.
+  # If compiling error occured in zconf.h, You may need patch to zconf.h.
   #--- zconf.h.orig	2005-07-21 00:40:26.000000000
   #+++ zconf.h	2009-01-19 11:39:10.093750000
   #@@ -286,7 +286,7 @@
-  #
+  # 
   # #if 1           /* HAVE_UNISTD_H -- this line is updated by ./configure */
   # #  include <sys/types.h> /* for off_t */
   #-#  include <unistd.h>    /* for SEEK_* and off_t */
@@ -383,11 +315,7 @@ SET(ADDITIONAL_LIBS "")
 #
 # Find ZLIB
 #
-IF(ENABLE_ZLIB)
+FIND_PACKAGE(ZLIB)
-  FIND_PACKAGE(ZLIB)
-ELSE()
-  SET(ZLIB_FOUND FALSE) # Override cached value
-ENDIF()
 IF(ZLIB_FOUND)
   SET(HAVE_LIBZ 1)
   SET(HAVE_ZLIB_H 1)
@@ -422,11 +350,7 @@ MARK_AS_ADVANCED(CLEAR ZLIB_LIBRARY)
 #
 # Find BZip2
 #
-IF(ENABLE_BZip2)
+FIND_PACKAGE(BZip2)
-  FIND_PACKAGE(BZip2)
-ELSE()
-  SET(BZIP2_FOUND FALSE) # Override cached value
-ENDIF()
 IF(BZIP2_FOUND)
   SET(HAVE_LIBBZ2 1)
   SET(HAVE_BZLIB_H 1)
@@ -446,18 +370,10 @@ IF(BZIP2_FOUND)
 ENDIF(BZIP2_FOUND)
 MARK_AS_ADVANCED(CLEAR BZIP2_INCLUDE_DIR)
 MARK_AS_ADVANCED(CLEAR BZIP2_LIBRARIES)
-
-
 #
 # Find LZMA
 #
-IF(ENABLE_LZMA)
+FIND_PACKAGE(LZMA)
-  FIND_PACKAGE(LZMA)
-ELSE()
-  SET(LZMA_FOUND FALSE) # Override cached value
-  SET(LZMADEC_FOUND FALSE) # Override cached value
-ENDIF()
-
 IF(LZMA_FOUND)
   SET(HAVE_LIBLZMA 1)
   SET(HAVE_LZMA_H 1)
@@ -477,8 +393,6 @@ ELSEIF(LZMADEC_FOUND)
   SET(HAVE_LZMADEC_H 1)
   INCLUDE_DIRECTORIES(${LZMADEC_INCLUDE_DIR})
   LIST(APPEND ADDITIONAL_LIBS ${LZMADEC_LIBRARIES})
-ELSE(LZMA_FOUND)
-# LZMA not found and will not be used.
 ENDIF(LZMA_FOUND)
 #
 # Find LZO2
@@ -504,33 +418,6 @@ IF(LZO2_FOUND)
 ENDIF(LZO2_FOUND)
 MARK_AS_ADVANCED(CLEAR LZO2_INCLUDE_DIR)
 MARK_AS_ADVANCED(CLEAR LZO2_LIBRARY)
-#
-# Find LZ4
-#
-IF (LZ4_INCLUDE_DIR)
-  # Already in cache, be silent
-  SET(LZ4_FIND_QUIETLY TRUE)
-ENDIF (LZ4_INCLUDE_DIR)
-
-FIND_PATH(LZ4_INCLUDE_DIR lz4.h)
-FIND_LIBRARY(LZ4_LIBRARY NAMES lz4 liblz4)
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZ4 DEFAULT_MSG LZ4_LIBRARY LZ4_INCLUDE_DIR)
-IF(LZ4_FOUND)
-  SET(HAVE_LIBLZ4 1)
-  SET(HAVE_LZ4_H 1)
-  CMAKE_PUSH_CHECK_STATE()	# Save the state of the variables
-  SET(CMAKE_REQUIRED_INCLUDES ${LZ4_INCLUDE_DIR})
-  CHECK_INCLUDE_FILES("lz4hc.h" HAVE_LZ4HC_H)
-  CMAKE_POP_CHECK_STATE()	# Restore the state of the variables
-  INCLUDE_DIRECTORIES(${LZ4_INCLUDE_DIR})
-  LIST(APPEND ADDITIONAL_LIBS ${LZ4_LIBRARY})
-  #
-  # TODO: test for static library.
-  #
-ENDIF(LZ4_FOUND)
-MARK_AS_ADVANCED(CLEAR LZ4_INCLUDE_DIR)
-MARK_AS_ADVANCED(CLEAR LZ4_LIBRARY)
 
 #
 # Check headers
@@ -557,7 +444,7 @@ LA_CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H)
 LA_CHECK_INCLUDE_FILE("errno.h" HAVE_ERRNO_H)
 LA_CHECK_INCLUDE_FILE("ext2fs/ext2_fs.h" HAVE_EXT2FS_EXT2_FS_H)
 
-CHECK_C_SOURCE_COMPILES("#include <sys/ioctl.h>
+LIBARCHIVE_CHECK_C_SOURCE_COMPILES("#include <sys/ioctl.h>
 #include <ext2fs/ext2_fs.h>
 int main(void) { return EXT2_IOC_GETFLAGS; }" HAVE_WORKING_EXT2_IOC_GETFLAGS)
 
@@ -576,9 +463,7 @@ LA_CHECK_INCLUDE_FILE("memory.h" HAVE_MEMORY_H)
 LA_CHECK_INCLUDE_FILE("paths.h" HAVE_PATHS_H)
 LA_CHECK_INCLUDE_FILE("poll.h" HAVE_POLL_H)
 LA_CHECK_INCLUDE_FILE("process.h" HAVE_PROCESS_H)
-LA_CHECK_INCLUDE_FILE("pthread.h" HAVE_PTHREAD_H)
 LA_CHECK_INCLUDE_FILE("pwd.h" HAVE_PWD_H)
-LA_CHECK_INCLUDE_FILE("readpassphrase.h" HAVE_READPASSPHRASE_H)
 LA_CHECK_INCLUDE_FILE("regex.h" HAVE_REGEX_H)
 LA_CHECK_INCLUDE_FILE("signal.h" HAVE_SIGNAL_H)
 LA_CHECK_INCLUDE_FILE("spawn.h" HAVE_SPAWN_H)
@@ -609,11 +494,6 @@ LA_CHECK_INCLUDE_FILE("utime.h" HAVE_UTIME_H)
 LA_CHECK_INCLUDE_FILE("wchar.h" HAVE_WCHAR_H)
 LA_CHECK_INCLUDE_FILE("wctype.h" HAVE_WCTYPE_H)
 LA_CHECK_INCLUDE_FILE("windows.h" HAVE_WINDOWS_H)
-IF(ENABLE_CNG)
-  LA_CHECK_INCLUDE_FILE("Bcrypt.h" HAVE_BCRYPT_H)
-ELSE(ENABLE_CNG)
-  UNSET(HAVE_BCRYPT_H CACHE)
-ENDIF(ENABLE_CNG)
 # Following files need windwos.h, so we should test it after windows.h test.
 LA_CHECK_INCLUDE_FILE("wincrypt.h" HAVE_WINCRYPT_H)
 LA_CHECK_INCLUDE_FILE("winioctl.h" HAVE_WINIOCTL_H)
@@ -627,7 +507,7 @@ FOREACH (it ${_HEADER})
    SET(_INCLUDE_FILES "${_INCLUDE_FILES}#include <${it}>\n")
 ENDFOREACH (it)
 
-CHECK_C_SOURCE_COMPILES(
+LIBARCHIVE_CHECK_C_SOURCE_COMPILES(
   "#define __EXTENSIONS__ 1
    ${_INCLUDE_FILES}
    int main() { return 0;}"
@@ -640,17 +520,11 @@ IF(ENABLE_NETTLE)
   FIND_PACKAGE(Nettle)
   IF(NETTLE_FOUND)
     SET(HAVE_LIBNETTLE 1)
-    LIST(APPEND ADDITIONAL_LIBS ${NETTLE_LIBRARIES})
+    SET(HAVE_NETTLE_MD5_H 1)
+    SET(HAVE_NETTLE_RIPEMD160_H 1)
+    SET(HAVE_NETTLE_SHA_H 1)
     INCLUDE_DIRECTORIES(${NETTLE_INCLUDE_DIR})
-
+    LIST(APPEND ADDITIONAL_LIBS ${NETTLE_LIBRARIES})
-    LIST(APPEND CMAKE_REQUIRED_INCLUDES ${NETTLE_INCLUDE_DIR})
-    LA_CHECK_INCLUDE_FILE("nettle/aes.h" HAVE_NETTLE_AES_H)
-    LA_CHECK_INCLUDE_FILE("nettle/hmac.h" HAVE_NETTLE_HMAC_H)
-    LA_CHECK_INCLUDE_FILE("nettle/md5.h" HAVE_NETTLE_MD5_H)
-    LA_CHECK_INCLUDE_FILE("nettle/pbkdf2.h" HAVE_NETTLE_PBKDF2_H)
-    LA_CHECK_INCLUDE_FILE("nettle/ripemd160.h" HAVE_NETTLE_RIPEMD160_H)
-    LA_CHECK_INCLUDE_FILE("nettle/sha.h" HAVE_NETTLE_SHA_H)
-
   ENDIF(NETTLE_FOUND)
   MARK_AS_ADVANCED(CLEAR NETTLE_INCLUDE_DIR)
   MARK_AS_ADVANCED(CLEAR NETTLE_LIBRARIES)
@@ -662,11 +536,6 @@ ENDIF(ENABLE_NETTLE)
 #
 IF(ENABLE_OPENSSL AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
   FIND_PACKAGE(OpenSSL)
-  IF(OPENSSL_FOUND)
-    SET(HAVE_LIBCRYPTO 1)
-    INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
-    LIST(APPEND ADDITIONAL_LIBS ${OPENSSL_CRYPTO_LIBRARY})
-  ENDIF(OPENSSL_FOUND)
 ELSE()
   SET(OPENSSL_FOUND FALSE) # Override cached value
 ENDIF()
@@ -685,7 +554,7 @@ ENDIF(NOT OPENSSL_FOUND)
 
 #
 # How to prove that CRYPTO functions, which have several names on various
-# platforms, just see if archive_digest.c can compile and link against
+# platforms, just see if archive_crypto.c can compile and link against
 # required libraries.
 #
 MACRO(CHECK_CRYPTO ALGORITHMS IMPLEMENTATION)
@@ -724,7 +593,7 @@ MACRO(CHECK_CRYPTO ALGORITHMS IMPLEMENTATION)
       ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/confdefs.h)
 	FILE(READ "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/confdefs.h"
 	     CONFDEFS_H)
-	FILE(READ "${CMAKE_CURRENT_SOURCE_DIR}/libarchive/archive_digest.c"
+	FILE(READ "${CMAKE_CURRENT_SOURCE_DIR}/libarchive/archive_crypto.c"
 	     ARCHIVE_CRYPTO_C)
 
 	SET(SOURCE "${CONFDEFS_H}
@@ -750,10 +619,16 @@ main(int argc, char **argv)
 	FILE(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/check_crypto_md.c" "${SOURCE}")
 	MESSAGE(STATUS "Checking support for ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION}")
 
+    IF(CMAKE_REQUIRED_LINKER_FLAGS)
+      SET(CHECK_CRYPTO_ADD_LINKER_FLAGS
+        "-DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_REQUIRED_LINKER_FLAGS} -DCMAKE_SHARED_LINKER_FLAGS:STRING=${CMAKE_REQUIRED_LINKER_FLAGS} -DCMAKE_MODULE_LINKER_FLAGS:STRING=${CMAKE_REQUIRED_LINKER_FLAGS}")
+    ELSE(CMAKE_REQUIRED_LINKER_FLAGS)
+      SET(CHECK_CRYPTO_ADD_LINKER_FLAGS)
+    ENDIF(CMAKE_REQUIRED_LINKER_FLAGS)
 	TRY_COMPILE(ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION}
 	  ${CMAKE_BINARY_DIR}
 	  ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/check_crypto_md.c
-	  CMAKE_FLAGS
+	  CMAKE_FLAGS ${CHECK_CRYPTO_ADD_LINKER_FLAGS}
 	   "${TRY_CRYPTO_REQUIRED_LIBS}"
 	   "${TRY_CRYPTO_REQUIRED_INCLUDES}"
 	  OUTPUT_VARIABLE OUTPUT)
@@ -838,10 +713,16 @@ main(int argc, char **argv)
 	FILE(WRITE "${SOURCE_FILE}" "${SOURCE}")
 	MESSAGE(STATUS "Checking support for ARCHIVE_CRYPTO_${CRYPTO}_WIN")
 
+    IF(CMAKE_REQUIRED_LINKER_FLAGS)
+      SET(CHECK_CRYPTO_WIN_ADD_LINKER_FLAGS
+        "-DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_REQUIRED_LINKER_FLAGS} -DCMAKE_SHARED_LINKER_FLAGS:STRING=${CMAKE_REQUIRED_LINKER_FLAGS} -DCMAKE_MODULE_LINKER_FLAGS:STRING=${CMAKE_REQUIRED_LINKER_FLAGS}")
+    ELSE(CMAKE_REQUIRED_LINKER_FLAGS)
+      SET(CHECK_CRYPTO_WIN_ADD_LINKER_FLAGS)
+    ENDIF(CMAKE_REQUIRED_LINKER_FLAGS)
 	TRY_COMPILE(ARCHIVE_CRYPTO_${CRYPTO}_WIN
 	  ${CMAKE_BINARY_DIR}
 	  ${SOURCE_FILE}
-	  CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}/libarchive"
+	  CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}/libarchive" ${CHECK_CRYPTO_WIN_ADD_LINKER_FLAGS}
 	  OUTPUT_VARIABLE OUTPUT)
 
 	IF (ARCHIVE_CRYPTO_${CRYPTO}_WIN)
@@ -874,25 +755,20 @@ ENDMACRO(CHECK_CRYPTO_WIN CRYPTO_LIST)
 MACRO(CHECK_ICONV LIB TRY_ICONV_CONST)
   IF(NOT HAVE_ICONV)
     CMAKE_PUSH_CHECK_STATE()	# Save the state of the variables
-    IF (CMAKE_C_COMPILER_ID MATCHES "^GNU$" OR
+    IF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$")
-        CMAKE_C_COMPILER_ID MATCHES "^Clang$")
       #
       # During checking iconv proto type, we should use -Werror to avoid the
       # success of iconv detection with a warnig which success is a miss
       # detection. So this needs for all build mode(even it's a release mode).
       #
       SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Werror")
-    ENDIF (CMAKE_C_COMPILER_ID MATCHES "^GNU$" OR
+    ENDIF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$")
-           CMAKE_C_COMPILER_ID MATCHES "^Clang$")
-    IF (CMAKE_C_COMPILER_ID MATCHES "^XL$")
-      SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -qhalt=w -qflag=w:w")
-    ENDIF (CMAKE_C_COMPILER_ID MATCHES "^XL$")
     IF (MSVC)
       # NOTE: /WX option is the same as gcc's -Werror option.
       SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} /WX")
     ENDIF (MSVC)
     #
-    CHECK_C_SOURCE_COMPILES(
+    LIBARCHIVE_CHECK_C_SOURCE_COMPILES(
       "#include <stdlib.h>
        #include <iconv.h>
        int main() {
@@ -1008,11 +884,7 @@ ENDIF(ENABLE_ICONV)
 #
 # Find Libxml2
 #
-IF(ENABLE_LIBXML2)
+FIND_PACKAGE(LibXml2)
-  FIND_PACKAGE(LibXml2)
-ELSE()
-  SET(LIBXML2_FOUND FALSE)
-ENDIF()
 IF(LIBXML2_FOUND)
   CMAKE_PUSH_CHECK_STATE()	# Save the state of the variables
   INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
@@ -1037,11 +909,7 @@ ELSE(LIBXML2_FOUND)
   #
   # Find Expat
   #
-  IF(ENABLE_EXPAT)
+  FIND_PACKAGE(EXPAT)
-    FIND_PACKAGE(EXPAT)
-  ELSE()
-    SET(EXPAT_FOUND FALSE)
-  ENDIF()
   IF(EXPAT_FOUND)
     CMAKE_PUSH_CHECK_STATE()	# Save the state of the variables
     INCLUDE_DIRECTORIES(${EXPAT_INCLUDE_DIR})
@@ -1111,16 +979,8 @@ IF(NOT FOUND_POSIX_REGEX_LIB AND POSIX_REGEX_LIB MATCHES "^(AUTO|LIBPCREPOSIX)$"
   #
   # If requested, try finding library for PCREPOSIX
   #
-  IF(ENABLE_LibGCC)
+  FIND_PACKAGE(LibGCC)
-    FIND_PACKAGE(LibGCC)
+  FIND_PACKAGE(PCREPOSIX)
-  ELSE()
-    SET(LIBGCC_FOUND FALSE) # Override cached value
-  ENDIF()
-  IF(ENABLE_PCREPOSIX)
-    FIND_PACKAGE(PCREPOSIX)
-  ELSE()
-    SET(PCREPOSIX_FOUND FALSE) # Override cached value
-  ENDIF()
   IF(PCREPOSIX_FOUND)
     INCLUDE_DIRECTORIES(${PCRE_INCLUDE_DIR})
     LIST(APPEND ADDITIONAL_LIBS ${PCREPOSIX_LIBRARIES})
@@ -1172,18 +1032,15 @@ ENDIF(NOT FOUND_POSIX_REGEX_LIB AND POSIX_REGEX_LIB MATCHES "^(AUTO|LIBPCREPOSIX
 # Check functions
 #
 CMAKE_PUSH_CHECK_STATE()	# Save the state of the variables
-IF (CMAKE_C_COMPILER_ID MATCHES "^GNU$" OR
+IF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$")
-    CMAKE_C_COMPILER_ID MATCHES "^Clang$")
   #
   # During checking functions, we should use -fno-builtin to avoid the
   # failure of function detection which failure is an error "conflicting
   # types for built-in function" caused by using -Werror option.
   #
   SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -fno-builtin")
-ENDIF (CMAKE_C_COMPILER_ID MATCHES "^GNU$" OR
+ENDIF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$")
-       CMAKE_C_COMPILER_ID MATCHES "^Clang$")
 CHECK_SYMBOL_EXISTS(_CrtSetReportMode "crtdbg.h" HAVE__CrtSetReportMode)
-CHECK_FUNCTION_EXISTS_GLIBC(arc4random_buf HAVE_ARC4RANDOM_BUF)
 CHECK_FUNCTION_EXISTS_GLIBC(chflags HAVE_CHFLAGS)
 CHECK_FUNCTION_EXISTS_GLIBC(chown HAVE_CHOWN)
 CHECK_FUNCTION_EXISTS_GLIBC(chroot HAVE_CHROOT)
@@ -1231,7 +1088,6 @@ CHECK_FUNCTION_EXISTS_GLIBC(pipe HAVE_PIPE)
 CHECK_FUNCTION_EXISTS_GLIBC(poll HAVE_POLL)
 CHECK_FUNCTION_EXISTS_GLIBC(posix_spawnp HAVE_POSIX_SPAWNP)
 CHECK_FUNCTION_EXISTS_GLIBC(readlink HAVE_READLINK)
-CHECK_FUNCTION_EXISTS_GLIBC(readpassphrase HAVE_READPASSPHRASE)
 CHECK_FUNCTION_EXISTS_GLIBC(select HAVE_SELECT)
 CHECK_FUNCTION_EXISTS_GLIBC(setenv HAVE_SETENV)
 CHECK_FUNCTION_EXISTS_GLIBC(setlocale HAVE_SETLOCALE)
@@ -1270,20 +1126,19 @@ CHECK_FUNCTION_EXISTS(strftime HAVE_STRFTIME)
 CHECK_FUNCTION_EXISTS(vprintf HAVE_VPRINTF)
 CHECK_FUNCTION_EXISTS(wmemcmp HAVE_WMEMCMP)
 CHECK_FUNCTION_EXISTS(wmemcpy HAVE_WMEMCPY)
-CHECK_FUNCTION_EXISTS(wmemmove HAVE_WMEMMOVE)
 
 CMAKE_POP_CHECK_STATE()	# Restore the state of the variables
 
 # Make sure we have the POSIX version of readdir_r, not the
 # older 2-argument version.
-CHECK_C_SOURCE_COMPILES(
+LIBARCHIVE_CHECK_C_SOURCE_COMPILES(
   "#include <dirent.h>\nint main() {DIR *d = opendir(\".\"); struct dirent e,*r; return readdir_r(d,&e,&r);}"
   HAVE_READDIR_R)
 
 
 # Only detect readlinkat() if we also have AT_FDCWD in unistd.h.
 # NOTE: linux requires fcntl.h for AT_FDCWD.
-CHECK_C_SOURCE_COMPILES(
+LIBARCHIVE_CHECK_C_SOURCE_COMPILES(
   "#include <fcntl.h>\n#include <unistd.h>\nint main() {char buf[10]; return readlinkat(AT_FDCWD, \"\", buf, 0);}"
   HAVE_READLINKAT)
 
@@ -1292,10 +1147,10 @@ CHECK_C_SOURCE_COMPILES(
 # of interest and verify that the result can be linked.
 # CHECK_FUNCTION_EXISTS doesn't accept a header argument,
 # CHECK_SYMBOL_EXISTS doesn't test linkage.
-CHECK_C_SOURCE_COMPILES(
+LIBARCHIVE_CHECK_C_SOURCE_COMPILES(
   "#include <sys/mkdev.h>\nint main() { return major(256); }"
   MAJOR_IN_MKDEV)
-CHECK_C_SOURCE_COMPILES(
+LIBARCHIVE_CHECK_C_SOURCE_COMPILES(
   "#include <sys/sysmacros.h>\nint main() { return major(256); }"
   MAJOR_IN_SYSMACROS)
 
@@ -1316,15 +1171,10 @@ ENDIF(HAVE_INTTYPES_H)
 CHECK_SYMBOL_EXISTS(EFTYPE           "errno.h"    HAVE_EFTYPE)
 CHECK_SYMBOL_EXISTS(EILSEQ           "errno.h"    HAVE_EILSEQ)
 CHECK_SYMBOL_EXISTS(D_MD_ORDER       "langinfo.h" HAVE_D_MD_ORDER)
-CHECK_SYMBOL_EXISTS(INT32_MAX        "${headers}" HAVE_DECL_INT32_MAX)
-CHECK_SYMBOL_EXISTS(INT32_MIN        "${headers}" HAVE_DECL_INT32_MIN)
 CHECK_SYMBOL_EXISTS(INT64_MAX        "${headers}" HAVE_DECL_INT64_MAX)
 CHECK_SYMBOL_EXISTS(INT64_MIN        "${headers}" HAVE_DECL_INT64_MIN)
-CHECK_SYMBOL_EXISTS(INTMAX_MAX       "${headers}" HAVE_DECL_INTMAX_MAX)
-CHECK_SYMBOL_EXISTS(INTMAX_MIN       "${headers}" HAVE_DECL_INTMAX_MIN)
 CHECK_SYMBOL_EXISTS(UINT32_MAX       "${headers}" HAVE_DECL_UINT32_MAX)
 CHECK_SYMBOL_EXISTS(UINT64_MAX       "${headers}" HAVE_DECL_UINT64_MAX)
-CHECK_SYMBOL_EXISTS(UINTMAX_MAX      "${headers}" HAVE_DECL_UINTMAX_MAX)
 CHECK_SYMBOL_EXISTS(SIZE_MAX         "${headers}" HAVE_DECL_SIZE_MAX)
 CHECK_SYMBOL_EXISTS(SSIZE_MAX        "limits.h"   HAVE_DECL_SSIZE_MAX)
 
@@ -1392,13 +1242,13 @@ CHECK_TYPE_SIZE("unsigned long long" SIZE_OF_UNSIGNED_LONG_LONG)
 CHECK_TYPE_SIZE("__int64" __INT64)
 CHECK_TYPE_SIZE("unsigned __int64" UNSIGNED___INT64)
 
-CHECK_TYPE_SIZE(int16_t INT16_T)
+CHECK_TYPE_SIZE(int16_t INT16_T) 
 CHECK_TYPE_SIZE(int32_t INT32_T)
 CHECK_TYPE_SIZE(int64_t INT64_T)
 CHECK_TYPE_SIZE(intmax_t INTMAX_T)
-CHECK_TYPE_SIZE(uint8_t UINT8_T)
+CHECK_TYPE_SIZE(uint8_t UINT8_T) 
-CHECK_TYPE_SIZE(uint16_t UINT16_T)
+CHECK_TYPE_SIZE(uint16_t UINT16_T) 
-CHECK_TYPE_SIZE(uint32_t UINT32_T)
+CHECK_TYPE_SIZE(uint32_t UINT32_T) 
 CHECK_TYPE_SIZE(uint64_t UINT64_T)
 CHECK_TYPE_SIZE(uintmax_t UINTMAX_T)
 
@@ -1641,9 +1491,6 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/build/cmake/config.h.in
 INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
 ADD_DEFINITIONS(-DHAVE_CONFIG_H)
 
-# Handle generation of the libarchive.pc file for pkg-config
-INCLUDE(CreatePkgConfigFile)
-
 #
 # Register installation of PDF documents.
 #
@@ -1674,6 +1521,5 @@ IF(ENABLE_TEST)
 ENDIF(ENABLE_TEST)
 
 add_subdirectory(libarchive)
-add_subdirectory(cat)
 add_subdirectory(tar)
 add_subdirectory(cpio)

archivers/libarchive/files/COPYING

@@ -17,11 +17,12 @@ the actual statements in the files are controlling.
   files for details:
    libarchive/archive_entry.c
    libarchive/archive_read_support_filter_compress.c
-   libarchive/archive_write_add_filter_compress.c
+   libarchive/archive_write_set_filter_compress.c
    libarchive/mtree.5
+   tar/matching.c
 
 * The following source files are in the public domain:
-   libarchive/archive_getdate.c
+   tar/getdate.c
 
 * The build files---including Makefiles, configure scripts,
   and auxiliary scripts used as part of the compile process---have

archivers/libarchive/files/INSTALL

@@ -1,5 +1,5 @@
 More complete build documentation is available on the libarchive
-Wiki:  https://github.com/libarchive/libarchive/wiki
+Wiki:  http://libarchive.googlecode.com/
 
 On most Unix-like systems, you should be able to install libarchive,
 bsdtar, and bsdcpio using the following common steps:

archivers/libarchive/files/NEWS

@@ -1,40 +1,3 @@
-Jun 20, 2016: libarchive 3.2.1 released
-    This fixes a handful of security and other critical issues with 3.2.0
-
-May 01, 2016: libarchive 3.2.0 released
-
-Apr 09, 2016: libarchive 3.1.901a released
-    Another test release in preparation for 3.2.0
-
-Feb 13, 2016: libarchive 3.1.900a released
-    This is a test release in preparation for 3.2.0
-
-Oct 21, 2015: Preliminary port to OSF
-
-Apr 11, 2015: libarchive's issue tracker is now hosted at GitHub.
-    https://github.com/libarchive/libarchive/issues
-
-Early 2015:  Many fixes to crash and overflow bugs thanks to Hanno Boeck
-
-Oct 13, 2014: Zip encryption and decryption support
-
-Aug 13, 2014: Add support for lz4 compression.
-
-Jun 10, 2014: Add warc format support
-
-May  3, 2014: Add experimental Zip streaming extension
-
-Apr  6, 2014: Add bsdcat command-line tool
-
-Jan 12, 2014: Add Zip64 support
-
-Dec  1, 2013: Rewrite Zip write logic
-
-Jul  1, 2013: Add ability to detect encrypted entries for many formats
-     (This does not add the ability to *decrypt* those entries, however)
-
-Feb 23, 2013: "raw" write support added
-
 Feb 09, 2013: libarchive 3.1.2 released
 
 Jan 28, 2013: libarchive's new website moved to http://www.libarchive.org.

archivers/libarchive/files/README

@@ -5,7 +5,7 @@ Questions?  Issues?
      libarchive development, including documentation, and
      links to the libarchive mailing lists.
    * To report an issue, use the issue tracker at
-     https://github.com/libarchive/libarchive/issues
+     http://code.google.com/p/libarchive/issues/list
    * To submit an enhancement to libarchive, please submit
      a pull request via GitHub.
      https://github.com/libarchive/libarchive/pulls
@@ -13,11 +13,9 @@ Questions?  Issues?
 This distribution bundle includes the following components:
    * libarchive: a library for reading and writing streaming archives
    * tar: the 'bsdtar' program is a full-featured 'tar'
-          implementation built on libarchive
+          replacement built on libarchive
    * cpio: the 'bsdcpio' program is a different interface to
           essentially the same functionality
-   * cat: the 'bsdcat' program is a simple replacement tool for
-          zcat, bzcat, xzcat, and such
    * examples: Some small example programs that you may find useful.
    * examples/minitar: a compact sample demonstrating use of libarchive.
    * contrib:  Various items sent to me by third parties;
@@ -41,7 +39,6 @@ The following files in the top-level directory are used by the
 Guide to Documentation installed by this system:
  * bsdtar.1 explains the use of the bsdtar program
  * bsdcpio.1 explains the use of the bsdcpio program
- * bsdcat.1 explains the use of the bsdcat program
  * libarchive.3 gives an overview of the library as a whole
  * archive_read.3, archive_write.3, archive_write_disk.3, and
    archive_read_disk.3 provide detailed calling sequences for the read
@@ -87,8 +84,6 @@ The library also detects and handles any of the following before evaluating the
   * bzip2 compression
   * compress/LZW compression
   * lzma, lzip, and xz compression
-  * lz4 compression
-  * lzop compression
 
 The library can create archives in any of the following formats:
   * POSIX ustar
@@ -96,7 +91,6 @@ The library can create archives in any of the following formats:
   * "restricted" pax format, which will create ustar archives except for
     entries that require pax extensions (for long filenames, ACLs, etc).
   * Old GNU tar format
-  * Old V7 tar format
   * POSIX octet-oriented cpio
   * SVR4 "newc" cpio
   * shar archives
@@ -113,8 +107,6 @@ When creating archives, the result can be filtered with any of the following:
   * bzip2 compression
   * compress/LZW compression
   * lzma, lzip, and xz compression
-  * lz4 compression
-  * lzop compression
 
 Notes about the library architecture:
 
@@ -131,12 +123,12 @@ Notes about the library architecture:
 
  * I've attempted to minimize static link pollution.  If you don't
    explicitly invoke a particular feature (such as support for a
-   particular compression or format), it won't get pulled in to
+   particular compression or format), it won't get pulled in.
-   statically-linked programs.  In particular, if you don't explicitly
+   In particular, if you don't explicitly enable a particular
-   enable a particular compression or decompression support, you won't
+   compression or decompression support, you won't need to link
-   need to link against the corresponding compression or decompression
+   against the corresponding compression or decompression libraries.
-   libraries.  This also reduces the size of statically-linked
+   This also reduces the size of statically-linked binaries in
-   binaries in environments where that matters.
+   environments where that matters.
 
  * On read, the library accepts whatever blocks you hand it.
    Your read callback is free to pass the library a byte at a time

archivers/libarchive/files/build/autoconf/ax_append_compile_flags.m4

@@ -1,67 +0,0 @@
-# ===========================================================================
-#  http://www.gnu.org/software/autoconf-archive/ax_append_compile_flags.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_APPEND_COMPILE_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS], [INPUT])
-#
-# DESCRIPTION
-#
-#   For every FLAG1, FLAG2 it is checked whether the compiler works with the
-#   flag.  If it does, the flag is added FLAGS-VARIABLE
-#
-#   If FLAGS-VARIABLE is not specified, the current language's flags (e.g.
-#   CFLAGS) is used.  During the check the flag is always added to the
-#   current language's flags.
-#
-#   If EXTRA-FLAGS is defined, it is added to the current language's default
-#   flags (e.g. CFLAGS) when the check is done.  The check is thus made with
-#   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
-#   force the compiler to issue an error when a bad flag is given.
-#
-#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
-#
-#   NOTE: This macro depends on the AX_APPEND_FLAG and
-#   AX_CHECK_COMPILE_FLAG. Please keep this macro in sync with
-#   AX_APPEND_LINK_FLAGS.
-#
-# LICENSE
-#
-#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 5
-
-AC_DEFUN([AX_APPEND_COMPILE_FLAGS],
-[AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG])
-AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
-for flag in $1; do
-  AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [$2])], [], [$3], [$4])
-done
-])dnl AX_APPEND_COMPILE_FLAGS

archivers/libarchive/files/build/autoconf/ax_append_flag.m4

@@ -1,71 +0,0 @@
-# ===========================================================================
-#      http://www.gnu.org/software/autoconf-archive/ax_append_flag.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_APPEND_FLAG(FLAG, [FLAGS-VARIABLE])
-#
-# DESCRIPTION
-#
-#   FLAG is appended to the FLAGS-VARIABLE shell variable, with a space
-#   added in between.
-#
-#   If FLAGS-VARIABLE is not specified, the current language's flags (e.g.
-#   CFLAGS) is used.  FLAGS-VARIABLE is not changed if it already contains
-#   FLAG.  If FLAGS-VARIABLE is unset in the shell, it is set to exactly
-#   FLAG.
-#
-#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
-#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 6
-
-AC_DEFUN([AX_APPEND_FLAG],
-[dnl
-AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_SET_IF
-AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])])
-AS_VAR_SET_IF(FLAGS,[
-  AS_CASE([" AS_VAR_GET(FLAGS) "],
-    [*" $1 "*], [AC_RUN_LOG([: FLAGS already contains $1])],
-    [
-     AS_VAR_APPEND(FLAGS,[" $1"])
-     AC_RUN_LOG([: FLAGS="$FLAGS"])
-    ])
-  ],
-  [
-  AS_VAR_SET(FLAGS,[$1])
-  AC_RUN_LOG([: FLAGS="$FLAGS"])
-  ])
-AS_VAR_POPDEF([FLAGS])dnl
-])dnl AX_APPEND_FLAG

archivers/libarchive/files/build/autoconf/ax_check_compile_flag.m4

@@ -1,74 +0,0 @@
-# ===========================================================================
-#   http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
-#
-# DESCRIPTION
-#
-#   Check whether the given FLAG works with the current language's compiler
-#   or gives an error.  (Warnings, however, are ignored)
-#
-#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
-#   success/failure.
-#
-#   If EXTRA-FLAGS is defined, it is added to the current language's default
-#   flags (e.g. CFLAGS) when the check is done.  The check is thus made with
-#   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
-#   force the compiler to issue an error when a bad flag is given.
-#
-#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
-#
-#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
-#   macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
-#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 4
-
-AC_DEFUN([AX_CHECK_COMPILE_FLAG],
-[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
-AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
-AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
-  ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
-  _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
-  AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
-    [AS_VAR_SET(CACHEVAR,[yes])],
-    [AS_VAR_SET(CACHEVAR,[no])])
-  _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
-AS_VAR_IF(CACHEVAR,yes,
-  [m4_default([$2], :)],
-  [m4_default([$3], :)])
-AS_VAR_POPDEF([CACHEVAR])dnl
-])dnl AX_CHECK_COMPILE_FLAGS

archivers/libarchive/files/build/autoconf/ax_require_defined.m4

@@ -1,37 +0,0 @@
-# ===========================================================================
-#    http://www.gnu.org/software/autoconf-archive/ax_require_defined.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_REQUIRE_DEFINED(MACRO)
-#
-# DESCRIPTION
-#
-#   AX_REQUIRE_DEFINED is a simple helper for making sure other macros have
-#   been defined and thus are available for use.  This avoids random issues
-#   where a macro isn't expanded.  Instead the configure script emits a
-#   non-fatal:
-#
-#     ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found
-#
-#   It's like AC_REQUIRE except it doesn't expand the required macro.
-#
-#   Here's an example:
-#
-#     AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
-#
-# LICENSE
-#
-#   Copyright (c) 2014 Mike Frysinger <vapier@gentoo.org>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 1
-
-AC_DEFUN([AX_REQUIRE_DEFINED], [dnl
-  m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])])
-])dnl AX_REQUIRE_DEFINED

archivers/libarchive/files/build/autoconf/compile

@@ -1,9 +1,10 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2012-03-05.13; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
+# Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -112,11 +113,6 @@ func_cl_dashl ()
       lib=$dir/$lib.lib
       break
     fi
-    if test -f "$dir/lib$lib.a"; then
-      found=yes
-      lib=$dir/lib$lib.a
-      break
-    fi
   done
   IFS=$save_IFS
 

archivers/libarchive/files/build/autoconf/config.guess

@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2016 Free Software Foundation, Inc.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2016-05-15'
+timestamp='2013-02-04'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -24,12 +24,12 @@ timestamp='2016-05-15'
 # program.  This Exception is an additional permission under section 7
 # of the GNU General Public License, version 3 ("GPLv3").
 #
-# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
+# Originally written by Per Bothner.
 #
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 #
-# Please send patches to <config-patches@gnu.org>.
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
 
 
 me=`echo "$0" | sed -e 's,.*/,,'`
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2016 Free Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -132,27 +132,6 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-case "${UNAME_SYSTEM}" in
-Linux|GNU|GNU/*)
-	# If the system lacks a compiler, then just pick glibc.
-	# We could probably try harder.
-	LIBC=gnu
-
-	eval $set_cc_for_build
-	cat <<-EOF > $dummy.c
-	#include <features.h>
-	#if defined(__UCLIBC__)
-	LIBC=uclibc
-	#elif defined(__dietlibc__)
-	LIBC=dietlibc
-	#else
-	LIBC=gnu
-	#endif
-	EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
-	;;
-esac
-
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -168,29 +147,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# Note: NetBSD doesn't particularly care about the vendor
 	# portion of the name.  We always set it to "unknown".
 	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	    /usr/sbin/$sysctl 2>/dev/null || \
-	    echo unknown)`
 	case "${UNAME_MACHINE_ARCH}" in
 	    armeb) machine=armeb-unknown ;;
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
 	    sh5el) machine=sh5le-unknown ;;
-	    earmv*)
-		arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
-		endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
-		machine=${arch}${endian}-unknown
-		;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
-	# to ELF recently (or will in the future) and ABI.
+	# to ELF recently, or will in the future.
 	case "${UNAME_MACHINE_ARCH}" in
-	    earm*)
-		os=netbsdelf
-		;;
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -207,13 +176,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		os=netbsd
 		;;
 	esac
-	# Determine ABI tags.
-	case "${UNAME_MACHINE_ARCH}" in
-	    earm*)
-		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
-		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
-		;;
-	esac
 	# The OS release
 	# Debian GNU/NetBSD machines have a different userland, and
 	# thus, need a distinct triplet. However, they do not need
@@ -224,13 +186,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		release='-gnu'
 		;;
 	    *)
-		release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 		;;
 	esac
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}${abi}"
+	echo "${machine}-${os}${release}"
 	exit ;;
     *:Bitrig:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
@@ -240,10 +202,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
 	exit ;;
-    *:LibertyBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
-	exit ;;
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
@@ -256,9 +214,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
-    *:Sortix:*:*)
-	echo ${UNAME_MACHINE}-unknown-sortix
-	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -275,42 +230,42 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
 	case "$ALPHA_CPU_TYPE" in
 	    "EV4 (21064)")
-		UNAME_MACHINE=alpha ;;
+		UNAME_MACHINE="alpha" ;;
 	    "EV4.5 (21064)")
-		UNAME_MACHINE=alpha ;;
+		UNAME_MACHINE="alpha" ;;
 	    "LCA4 (21066/21068)")
-		UNAME_MACHINE=alpha ;;
+		UNAME_MACHINE="alpha" ;;
 	    "EV5 (21164)")
-		UNAME_MACHINE=alphaev5 ;;
+		UNAME_MACHINE="alphaev5" ;;
 	    "EV5.6 (21164A)")
-		UNAME_MACHINE=alphaev56 ;;
+		UNAME_MACHINE="alphaev56" ;;
 	    "EV5.6 (21164PC)")
-		UNAME_MACHINE=alphapca56 ;;
+		UNAME_MACHINE="alphapca56" ;;
 	    "EV5.7 (21164PC)")
-		UNAME_MACHINE=alphapca57 ;;
+		UNAME_MACHINE="alphapca57" ;;
 	    "EV6 (21264)")
-		UNAME_MACHINE=alphaev6 ;;
+		UNAME_MACHINE="alphaev6" ;;
 	    "EV6.7 (21264A)")
-		UNAME_MACHINE=alphaev67 ;;
+		UNAME_MACHINE="alphaev67" ;;
 	    "EV6.8CB (21264C)")
-		UNAME_MACHINE=alphaev68 ;;
+		UNAME_MACHINE="alphaev68" ;;
 	    "EV6.8AL (21264B)")
-		UNAME_MACHINE=alphaev68 ;;
+		UNAME_MACHINE="alphaev68" ;;
 	    "EV6.8CX (21264D)")
-		UNAME_MACHINE=alphaev68 ;;
+		UNAME_MACHINE="alphaev68" ;;
 	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE=alphaev69 ;;
+		UNAME_MACHINE="alphaev69" ;;
 	    "EV7 (21364)")
-		UNAME_MACHINE=alphaev7 ;;
+		UNAME_MACHINE="alphaev7" ;;
 	    "EV7.9 (21364A)")
-		UNAME_MACHINE=alphaev79 ;;
+		UNAME_MACHINE="alphaev79" ;;
 	esac
 	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
 	exitcode=$?
 	trap '' 0
@@ -383,16 +338,16 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
-	SUN_ARCH=i386
+	SUN_ARCH="i386"
 	# If there is a compiler, see if it is configured for 64-bit objects.
 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
 	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
 	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
 		grep IS_64BIT_ARCH >/dev/null
 	    then
-		SUN_ARCH=x86_64
+		SUN_ARCH="x86_64"
 	    fi
 	fi
 	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
@@ -417,7 +372,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	exit ;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
 	case "`/bin/arch`" in
 	    sun3)
 		echo m68k-sun-sunos${UNAME_RELEASE}
@@ -603,9 +558,8 @@ EOF
 	else
 		IBM_ARCH=powerpc
 	fi
-	if [ -x /usr/bin/lslpp ] ; then
+	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+		IBM_REV=`/usr/bin/oslevel`
-			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
 	else
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
@@ -642,13 +596,13 @@ EOF
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
 		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
 		    case "${sc_cpu_version}" in
-		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
 		      532)                      # CPU_PA_RISC2_0
 			case "${sc_kernel_bits}" in
-			  32) HP_ARCH=hppa2.0n ;;
+			  32) HP_ARCH="hppa2.0n" ;;
-			  64) HP_ARCH=hppa2.0w ;;
+			  64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
 			esac ;;
 		    esac
 		fi
@@ -687,11 +641,11 @@ EOF
 		    exit (0);
 		}
 EOF
-		    (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
 		fi ;;
 	esac
-	if [ ${HP_ARCH} = hppa2.0w ]
+	if [ ${HP_ARCH} = "hppa2.0w" ]
 	then
 	    eval $set_cc_for_build
 
@@ -704,12 +658,12 @@ EOF
 	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
 	    # => hppa64-hp-hpux11.23
 
-	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
 		grep -q __LP64__
 	    then
-		HP_ARCH=hppa2.0w
+		HP_ARCH="hppa2.0w"
 	    else
-		HP_ARCH=hppa64
+		HP_ARCH="hppa64"
 	    fi
 	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -814,14 +768,14 @@ EOF
 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
 	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
 	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
 	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
@@ -851,7 +805,7 @@ EOF
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
-    *:MSYS*:*)
+    i*:MSYS*:*)
 	echo ${UNAME_MACHINE}-pc-msys
 	exit ;;
     i*:windows32*:*)
@@ -899,21 +853,21 @@ EOF
 	exit ;;
     *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     aarch64_be:Linux:*:*)
 	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -926,60 +880,59 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
-    arc:Linux:*:* | arceb:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
-	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 	else
 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 		| grep -q __ARM_PCS_VFP
 	    then
-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
 	    else
-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
 	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+	echo ${UNAME_MACHINE}-axis-linux-gnu
-	exit ;;
-    e2k:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
-	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    k1om:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -998,63 +951,54 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
-    openrisc*:Linux:*:*)
+    or32:Linux:*:*)
-	echo or1k-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    or32:Linux:*:* | or1k*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     padre:Linux:*:*)
-	echo sparc-unknown-linux-${LIBC}
+	echo sparc-unknown-linux-gnu
 	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-${LIBC}
+	echo hppa64-unknown-linux-gnu
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-${LIBC} ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
     ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-${LIBC}
+	echo powerpc64-unknown-linux-gnu
 	exit ;;
     ppc:Linux:*:*)
-	echo powerpc-unknown-linux-${LIBC}
+	echo powerpc-unknown-linux-gnu
-	exit ;;
-    ppc64le:Linux:*:*)
-	echo powerpc64le-unknown-linux-${LIBC}
-	exit ;;
-    ppcle:Linux:*:*)
-	echo powerpcle-unknown-linux-${LIBC}
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
     x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1130,7 +1074,7 @@ EOF
 	# uname -m prints for DJGPP always 'pc', but it prints nothing about
 	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configure will decide that
+	# prints for the "djgpp" host, or else GDB configury will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
 	exit ;;
@@ -1279,9 +1223,6 @@ EOF
     SX-8R:SUPER-UX:*:*)
 	echo sx8r-nec-superux${UNAME_RELEASE}
 	exit ;;
-    SX-ACE:SUPER-UX:*:*)
-	echo sxace-nec-superux${UNAME_RELEASE}
-	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@@ -1290,36 +1231,24 @@ EOF
 	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	eval $set_cc_for_build
+	case $UNAME_PROCESSOR in
-	if test "$UNAME_PROCESSOR" = unknown ; then
+	    i386)
-	    UNAME_PROCESSOR=powerpc
+		eval $set_cc_for_build
-	fi
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		      grep IS_64BIT_ARCH >/dev/null
-		    (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		  then
-		    grep IS_64BIT_ARCH >/dev/null
+		      UNAME_PROCESSOR="x86_64"
-		then
+		  fi
-		    case $UNAME_PROCESSOR in
+		fi ;;
-			i386) UNAME_PROCESSOR=x86_64 ;;
+	    unknown) UNAME_PROCESSOR=powerpc ;;
-			powerpc) UNAME_PROCESSOR=powerpc64 ;;
+	esac
-		    esac
-		fi
-	    fi
-	elif test "$UNAME_PROCESSOR" = i386 ; then
-	    # Avoid executing cc on OS X 10.9, as it ships with a stub
-	    # that puts up a graphical alert prompting to install
-	    # developer tools.  Any system running Mac OS X 10.7 or
-	    # later (Darwin 11 and later) is required to have a 64-bit
-	    # processor. This is not true of the ARM version of Darwin
-	    # that Apple uses in portable devices.
-	    UNAME_PROCESSOR=x86_64
-	fi
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = x86; then
+	if test "$UNAME_PROCESSOR" = "x86"; then
 		UNAME_PROCESSOR=i386
 		UNAME_MACHINE=pc
 	fi
@@ -1350,7 +1279,7 @@ EOF
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
 	# operating systems.
-	if test "$cputype" = 386; then
+	if test "$cputype" = "386"; then
 	    UNAME_MACHINE=i386
 	else
 	    UNAME_MACHINE="$cputype"
@@ -1392,7 +1321,7 @@ EOF
 	echo i386-pc-xenix
 	exit ;;
     i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
 	exit ;;
     i*86:rdos:*:*)
 	echo ${UNAME_MACHINE}-pc-rdos
@@ -1403,25 +1332,171 @@ EOF
     x86_64:VMkernel:*:*)
 	echo ${UNAME_MACHINE}-unknown-esx
 	exit ;;
-    amd64:Isilon\ OneFS:*:*)
-	echo x86_64-unknown-onefs
-	exit ;;
 esac
 
+eval $set_cc_for_build
+cat >$dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+	"4"
+#else
+	""
+#endif
+	); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+  printf ("arm-acorn-riscix\n"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+  printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+    struct utsname un;
+
+    uname(&un);
+
+    if (strncmp(un.version, "V2", 2) == 0) {
+	printf ("i386-sequent-ptx2\n"); exit (0);
+    }
+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+	printf ("i386-sequent-ptx1\n"); exit (0);
+    }
+    printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+# if !defined (ultrix)
+#  include <sys/param.h>
+#  if defined (BSD)
+#   if BSD == 43
+      printf ("vax-dec-bsd4.3\n"); exit (0);
+#   else
+#    if BSD == 199006
+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#    else
+      printf ("vax-dec-bsd\n"); exit (0);
+#    endif
+#   endif
+#  else
+    printf ("vax-dec-bsd\n"); exit (0);
+#  endif
+# else
+    printf ("vax-dec-ultrix\n"); exit (0);
+# endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+	{ echo "$SYSTEM_NAME"; exit; }
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+    case `getsysinfo -f cpu_type` in
+    c1*)
+	echo c1-convex-bsd
+	exit ;;
+    c2*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    c34*)
+	echo c34-convex-bsd
+	exit ;;
+    c38*)
+	echo c38-convex-bsd
+	exit ;;
+    c4*)
+	echo c4-convex-bsd
+	exit ;;
+    esac
+fi
+
 cat >&2 <<EOF
 $0: unable to guess system type
 
-This script (version $timestamp), has failed to recognize the
+This script, last modified $timestamp, has failed to recognize
-operating system you are using. If your script is old, overwrite
+the operating system you are using. It is advised that you
-config.guess and config.sub with the latest versions from:
+download the most up to date version of the config scripts from
 
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 
-If $0 has already been updated, send the following data and any
+If the version you run ($0) is already up to date, please
-information you think might be pertinent to config-patches@gnu.org to
+send the following data and any information you think might be
-provide the necessary information to handle your system.
+pertinent to <config-patches@gnu.org> in order to provide the needed
+information to handle your system.
 
 config.guess timestamp = $timestamp
 

archivers/libarchive/files/build/autoconf/config.sub

@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2016 Free Software Foundation, Inc.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2016-06-20'
+timestamp='2013-02-04'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@ timestamp='2016-06-20'
 # of the GNU General Public License, version 3 ("GPLv3").
 
 
-# Please send patches to <config-patches@gnu.org>.
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -33,7 +33,7 @@ timestamp='2016-06-20'
 # Otherwise, we print the canonical config type on stdout and succeed.
 
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@@ -53,7 +53,8 @@ timestamp='2016-06-20'
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
 
 Canonicalize a configuration name.
 
@@ -67,7 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2016 Free Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -116,7 +117,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
   linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
@@ -251,21 +252,19 @@ case $basic_machine in
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arceb \
+	| arc \
 	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
 	| avr | avr32 \
-	| ba \
 	| be32 | be64 \
 	| bfin \
-	| c4x | c8051 | clipper \
+	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| e2k | epiphany \
+	| epiphany \
-	| fido | fr30 | frv | ft32 \
+	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| k1om \
 	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
@@ -283,10 +282,8 @@ case $basic_machine in
 	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa32r6 | mipsisa32r6el \
 	| mipsisa64 | mipsisa64el \
 	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64r6 | mipsisa64r6el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipsr5900 | mipsr5900el \
@@ -298,14 +295,14 @@ case $basic_machine in
 	| nds32 | nds32le | nds32be \
 	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
-	| open8 | or1k | or1knd | or32 \
+	| open8 \
+	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
-	| riscv32 | riscv64 \
 	| rl78 | rx \
 	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -313,7 +310,6 @@ case $basic_machine in
 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-	| visium \
 	| we32k \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
@@ -328,10 +324,7 @@ case $basic_machine in
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	leon|leon[3-9])
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
-		basic_machine=sparc-$basic_machine
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -373,23 +366,21 @@ case $basic_machine in
 	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
-	| ba-* \
 	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| c8051-* | clipper-* | craynv-* | cydra-* \
+	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
-	| e2k-* | elxsi-* \
+	| elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
-	| k1om-* \
 	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
@@ -409,10 +400,8 @@ case $basic_machine in
 	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa32r6-* | mipsisa32r6el-* \
 	| mipsisa64-* | mipsisa64el-* \
 	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64r6-* | mipsisa64r6el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipsr5900-* | mipsr5900el-* \
@@ -424,18 +413,16 @@ case $basic_machine in
 	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| open8-* \
-	| or1k*-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
-	| riscv32-* | riscv64-* \
 	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
 	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tile*-* \
@@ -443,7 +430,6 @@ case $basic_machine in
 	| ubicom32-* \
 	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
 	| vax-* \
-	| visium-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
@@ -520,9 +506,6 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-aros
 		;;
-	asmjs)
-		basic_machine=asmjs-unknown
-		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -643,14 +626,6 @@ case $basic_machine in
 		basic_machine=m68k-bull
 		os=-sysv3
 		;;
-	e500v[12])
-		basic_machine=powerpc-unknown
-		os=$os"spe"
-		;;
-	e500v[12]-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=$os"spe"
-		;;
 	ebmon29k)
 		basic_machine=a29k-amd
 		os=-ebmon
@@ -792,9 +767,6 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
-	leon-*|leon[3-9]-*)
-		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
-		;;
 	m68knommu)
 		basic_machine=m68k-unknown
 		os=-linux
@@ -822,7 +794,7 @@ case $basic_machine in
 		os=-mingw64
 		;;
 	mingw32)
-		basic_machine=i686-pc
+		basic_machine=i386-pc
 		os=-mingw32
 		;;
 	mingw32ce)
@@ -850,10 +822,6 @@ case $basic_machine in
 		basic_machine=powerpc-unknown
 		os=-morphos
 		;;
-	moxiebox)
-		basic_machine=moxie-unknown
-		os=-moxiebox
-		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
@@ -862,7 +830,7 @@ case $basic_machine in
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
 	msys)
-		basic_machine=i686-pc
+		basic_machine=i386-pc
 		os=-msys
 		;;
 	mvs)
@@ -1386,28 +1354,27 @@ case $os in
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
 	      | -sym* | -kopensolaris* | -plan9* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* | -cloudabi* | -sortix* \
+	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
-	      | -onefs* | -tirtos* | -phoenix*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1539,8 +1506,6 @@ case $os in
 		;;
 	-nacl*)
 		;;
-	-ios)
-		;;
 	-none)
 		;;
 	*)
@@ -1581,9 +1546,6 @@ case $basic_machine in
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
-	c8051-*)
-		os=-elf
-		;;
 	hexagon-*)
 		os=-elf
 		;;

archivers/libarchive/files/build/autoconf/depcomp

@@ -1,9 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2013-05-30.07; # UTC
+scriptversion=2012-03-27.16; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
+# 2011, 2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -27,9 +28,9 @@ scriptversion=2013-05-30.07; # UTC
 
 case $1 in
   '')
-    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
-    exit 1;
+     exit 1;
-    ;;
+     ;;
   -h | --h*)
     cat <<\EOF
 Usage: depcomp [--help] [--version] PROGRAM [ARGS]
@@ -56,65 +57,11 @@ EOF
     ;;
 esac
 
-# Get the directory component of the given path, and save it in the
-# global variables '$dir'.  Note that this directory component will
-# be either empty or ending with a '/' character.  This is deliberate.
-set_dir_from ()
-{
-  case $1 in
-    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
-      *) dir=;;
-  esac
-}
-
-# Get the suffix-stripped basename of the given path, and save it the
-# global variable '$base'.
-set_base_from ()
-{
-  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
-}
-
-# If no dependency file was actually created by the compiler invocation,
-# we still have to create a dummy depfile, to avoid errors with the
-# Makefile "include basename.Plo" scheme.
-make_dummy_depfile ()
-{
-  echo "#dummy" > "$depfile"
-}
-
-# Factor out some common post-processing of the generated depfile.
-# Requires the auxiliary global variable '$tmpdepfile' to be set.
-aix_post_process_depfile ()
-{
-  # If the compiler actually managed to produce a dependency file,
-  # post-process it.
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form 'foo.o: dependency.h'.
-    # Do two passes, one to just change these to
-    #   $object: dependency.h
-    # and one to simply output
-    #   dependency.h:
-    # which is needed to avoid the deleted-header problem.
-    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
-      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
-    } > "$depfile"
-    rm -f "$tmpdepfile"
-  else
-    make_dummy_depfile
-  fi
-}
-
 # A tabulation character.
 tab='	'
 # A newline character.
 nl='
 '
-# Character ranges might be problematic outside the C locale.
-# These definitions help.
-upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
-lower=abcdefghijklmnopqrstuvwxyz
-digits=0123456789
-alpha=${upper}${lower}
 
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
@@ -128,9 +75,6 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
 
 rm -f "$tmpdepfile"
 
-# Avoid interferences from the environment.
-gccflag= dashmflag=
-
 # Some modes work just like other modes, but use different flags.  We
 # parameterize here, but still list the modes in the big case below,
 # to make depend.m4 easier to write.  Note that we *cannot* use a case
@@ -142,32 +86,32 @@ if test "$depmode" = hp; then
 fi
 
 if test "$depmode" = dashXmstdout; then
-  # This is just like dashmstdout with a different argument.
+   # This is just like dashmstdout with a different argument.
-  dashmflag=-xM
+   dashmflag=-xM
-  depmode=dashmstdout
+   depmode=dashmstdout
 fi
 
 cygpath_u="cygpath -u -f -"
 if test "$depmode" = msvcmsys; then
-  # This is just like msvisualcpp but w/o cygpath translation.
+   # This is just like msvisualcpp but w/o cygpath translation.
-  # Just convert the backslash-escaped backslashes to single forward
+   # Just convert the backslash-escaped backslashes to single forward
-  # slashes to satisfy depend.m4
+   # slashes to satisfy depend.m4
-  cygpath_u='sed s,\\\\,/,g'
+   cygpath_u='sed s,\\\\,/,g'
-  depmode=msvisualcpp
+   depmode=msvisualcpp
 fi
 
 if test "$depmode" = msvc7msys; then
-  # This is just like msvc7 but w/o cygpath translation.
+   # This is just like msvc7 but w/o cygpath translation.
-  # Just convert the backslash-escaped backslashes to single forward
+   # Just convert the backslash-escaped backslashes to single forward
-  # slashes to satisfy depend.m4
+   # slashes to satisfy depend.m4
-  cygpath_u='sed s,\\\\,/,g'
+   cygpath_u='sed s,\\\\,/,g'
-  depmode=msvc7
+   depmode=msvc7
 fi
 
 if test "$depmode" = xlc; then
-  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+   # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
-  gccflag=-qmakedep=gcc,-MF
+   gccflag=-qmakedep=gcc,-MF
-  depmode=gcc
+   depmode=gcc
 fi
 
 case "$depmode" in
@@ -190,7 +134,8 @@ gcc3)
   done
   "$@"
   stat=$?
-  if test $stat -ne 0; then
+  if test $stat -eq 0; then :
+  else
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -198,17 +143,13 @@ gcc3)
   ;;
 
 gcc)
-## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
-## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
-## (see the conditional assignment to $gccflag above).
 ## There are various ways to get dependency output from gcc.  Here's
 ## why we pick this rather obscure method:
 ## - Don't want to use -MD because we'd like the dependencies to end
 ##   up in a subdir.  Having to rename by hand is ugly.
 ##   (We might end up doing this anyway to support other compilers.)
 ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).  Also, it might not be
+##   -MM, not -M (despite what the docs say).
-##   supported by the other compilers which use the 'gcc' depmode.
 ## - Using -M directly means running the compiler twice (even worse
 ##   than renaming).
   if test -z "$gccflag"; then
@@ -216,14 +157,15 @@ gcc)
   fi
   "$@" -Wp,"$gccflag$tmpdepfile"
   stat=$?
-  if test $stat -ne 0; then
+  if test $stat -eq 0; then :
+  else
     rm -f "$tmpdepfile"
     exit $stat
   fi
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  # The second -e expression handles DOS-style file names with drive
+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-  # letters.
+## The second -e expression handles DOS-style file names with drive letters.
   sed -e 's/^[^:]*: / /' \
       -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
 ## This next piece of magic avoids the "deleted header file" problem.
@@ -232,15 +174,15 @@ gcc)
 ## typically no way to rebuild the header).  We avoid this by adding
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
+  tr ' ' "$nl" < "$tmpdepfile" |
 ## Some versions of gcc put a space before the ':'.  On the theory
 ## that the space means something, we add a space to the output as
 ## well.  hp depmode also adds that space, but also prefixes the VPATH
 ## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-  tr ' ' "$nl" < "$tmpdepfile" \
+    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
-    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+      | sed -e 's/$/ :/' >> "$depfile"
-    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -258,7 +200,8 @@ sgi)
     "$@" -MDupdate "$tmpdepfile"
   fi
   stat=$?
-  if test $stat -ne 0; then
+  if test $stat -eq 0; then :
+  else
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -266,6 +209,7 @@ sgi)
 
   if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
     echo "$object : \\" > "$depfile"
+
     # Clip off the initial element (the dependent).  Don't try to be
     # clever and replace this with sed code, as IRIX sed won't handle
     # lines with more than a fixed number of characters (4096 in
@@ -273,15 +217,19 @@ sgi)
     # the IRIX cc adds comments like '#:fec' to the end of the
     # dependency line.
     tr ' ' "$nl" < "$tmpdepfile" \
-      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-      | tr "$nl" ' ' >> "$depfile"
+    tr "$nl" ' ' >> "$depfile"
     echo >> "$depfile"
+
     # The second pass generates a dummy entry for each header file.
     tr ' ' "$nl" < "$tmpdepfile" \
-      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-      >> "$depfile"
+   >> "$depfile"
   else
-    make_dummy_depfile
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
   fi
   rm -f "$tmpdepfile"
   ;;
@@ -299,8 +247,9 @@ aix)
   # current directory.  Also, the AIX compiler puts '$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
-  set_dir_from "$object"
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  set_base_from "$object"
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
   if test "$libtool" = yes; then
     tmpdepfile1=$dir$base.u
     tmpdepfile2=$base.u
@@ -313,7 +262,9 @@ aix)
     "$@" -M
   fi
   stat=$?
-  if test $stat -ne 0; then
+
+  if test $stat -eq 0; then :
+  else
     rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
     exit $stat
   fi
@@ -322,113 +273,65 @@ aix)
   do
     test -f "$tmpdepfile" && break
   done
-  aix_post_process_depfile
+  if test -f "$tmpdepfile"; then
-  ;;
+    # Each line is of the form 'foo.o: dependent.h'.
-
+    # Do two passes, one to just change these to
-tcc)
+    # '$object: dependent.h' and one to simply 'dependent.h:'.
-  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-  # FIXME: That version still under development at the moment of writing.
+    sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-  #        Make that this statement remains true also for stable, released
+  else
-  #        versions.
+    # The sourcefile does not contain any dependencies, so just
-  # It will wrap lines (doesn't matter whether long or short) with a
+    # store a dummy comment line, to avoid errors with the Makefile
-  # trailing '\', as in:
+    # "include basename.Plo" scheme.
-  #
+    echo "#dummy" > "$depfile"
-  #   foo.o : \
-  #    foo.c \
-  #    foo.h \
-  #
-  # It will put a trailing '\' even on the last line, and will use leading
-  # spaces rather than leading tabs (at least since its commit 0394caf7
-  # "Emit spaces for -MD").
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile"
-    exit $stat
   fi
-  rm -f "$depfile"
-  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
-  # We have to change lines of the first kind to '$object: \'.
-  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
-  # And for each line of the second kind, we have to emit a 'dep.h:'
-  # dummy dependency, to avoid the deleted-header problem.
-  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
-## The order of this option in the case statement is important, since the
+icc)
-## shell code in configure will try each of these formats in the order
+  # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
-## listed in this file.  A plain '-MD' option would be understood by many
+  # However on
-## compilers, so we must ensure this comes after the gcc and icc options.
+  #    $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-pgcc)
+  # ICC 7.0 will fill foo.d with something like
-  # Portland's C compiler understands '-MD'.
+  #    foo.o: sub/foo.c
-  # Will always output deps to 'file.d' where file is the root name of the
+  #    foo.o: sub/foo.h
-  # source file under compilation, even if file resides in a subdirectory.
+  # which is wrong.  We want
-  # The object file name does not affect the name of the '.d' file.
+  #    sub/foo.o: sub/foo.c
-  # pgcc 10.2 will output
+  #    sub/foo.o: sub/foo.h
+  #    sub/foo.c:
+  #    sub/foo.h:
+  # ICC 7.1 will output
   #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using '\' :
+  # and will wrap long lines using '\':
   #    foo.o: sub/foo.c ... \
   #     sub/foo.h ... \
   #     ...
-  set_dir_from "$object"
+  # tcc 0.9.26 (FIXME still under development at the moment of writing)
-  # Use the source, not the object, to determine the base name, since
+  # will emit a similar output, but also prepend the continuation lines
-  # that's sadly what pgcc will do too.
+  # with horizontal tabulation characters.
-  set_base_from "$source"
+  "$@" -MD -MF "$tmpdepfile"
-  tmpdepfile=$base.d
+  stat=$?
-
+  if test $stat -eq 0; then :
-  # For projects that build the same source file twice into different object
+  else
-  # files, the pgcc approach of using the *source* file root name can cause
-  # problems in parallel builds.  Use a locking strategy to avoid stomping on
-  # the same $tmpdepfile.
-  lockdir=$base.d-lock
-  trap "
-    echo '$0: caught signal, cleaning up...' >&2
-    rmdir '$lockdir'
-    exit 1
-  " 1 2 13 15
-  numtries=100
-  i=$numtries
-  while test $i -gt 0; do
-    # mkdir is a portable test-and-set.
-    if mkdir "$lockdir" 2>/dev/null; then
-      # This process acquired the lock.
-      "$@" -MD
-      stat=$?
-      # Release the lock.
-      rmdir "$lockdir"
-      break
-    else
-      # If the lock is being held by a different process, wait
-      # until the winning process is done or we timeout.
-      while test -d "$lockdir" && test $i -gt 0; do
-        sleep 1
-        i=`expr $i - 1`
-      done
-    fi
-    i=`expr $i - 1`
-  done
-  trap - 1 2 13 15
-  if test $i -le 0; then
-    echo "$0: failed to acquire lock after $numtries attempts" >&2
-    echo "$0: check lockdir '$lockdir'" >&2
-    exit 1
-  fi
-
-  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
   rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
+  # Each line is of the form 'foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
   # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
+  # '$object: dependent.h' and one to simply 'dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  sed -e "s/^[ $tab][ $tab]*/  /" -e "s,^[^:]*:,$object :," \
-  # Some versions of the HPUX 10.20 sed can't process this invocation
+    < "$tmpdepfile" > "$depfile"
-  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed '
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+    s/[ '"$tab"'][ '"$tab"']*/ /g
-    | sed -e 's/$/ :/' >> "$depfile"
+    s/^ *//
+    s/ *\\*$//
+    s/^[^:]*: *//
+    /^$/d
+    /:$/d
+    s/$/ :/
+  ' < "$tmpdepfile" >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -439,8 +342,9 @@ hp2)
   # 'foo.d', which lands next to the object file, wherever that
   # happens to be.
   # Much of this is similar to the tru64 case; see comments there.
-  set_dir_from  "$object"
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  set_base_from "$object"
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
   if test "$libtool" = yes; then
     tmpdepfile1=$dir$base.d
     tmpdepfile2=$dir.libs/$base.d
@@ -451,7 +355,8 @@ hp2)
     "$@" +Maked
   fi
   stat=$?
-  if test $stat -ne 0; then
+  if test $stat -eq 0; then :
+  else
      rm -f "$tmpdepfile1" "$tmpdepfile2"
      exit $stat
   fi
@@ -461,61 +366,76 @@ hp2)
     test -f "$tmpdepfile" && break
   done
   if test -f "$tmpdepfile"; then
-    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
+    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
     # Add 'dependent.h:' lines.
     sed -ne '2,${
-               s/^ *//
+	       s/^ *//
-               s/ \\*$//
+	       s/ \\*$//
-               s/$/:/
+	       s/$/:/
-               p
+	       p
-             }' "$tmpdepfile" >> "$depfile"
+	     }' "$tmpdepfile" >> "$depfile"
   else
-    make_dummy_depfile
+    echo "#dummy" > "$depfile"
   fi
   rm -f "$tmpdepfile" "$tmpdepfile2"
   ;;
 
 tru64)
-  # The Tru64 compiler uses -MD to generate dependencies as a side
+   # The Tru64 compiler uses -MD to generate dependencies as a side
-  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+   # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
-  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-  # dependencies in 'foo.d' instead, so we check for that too.
+   # dependencies in 'foo.d' instead, so we check for that too.
-  # Subdirectories are respected.
+   # Subdirectories are respected.
-  set_dir_from  "$object"
+   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  set_base_from "$object"
+   test "x$dir" = "x$object" && dir=
+   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
 
-  if test "$libtool" = yes; then
+   if test "$libtool" = yes; then
-    # Libtool generates 2 separate objects for the 2 libraries.  These
+      # With Tru64 cc, shared objects can also be used to make a
-    # two compilations output dependencies in $dir.libs/$base.o.d and
+      # static library.  This mechanism is used in libtool 1.4 series to
-    # in $dir$base.o.d.  We have to check for both files, because
+      # handle both shared and static libraries in a single compilation.
-    # one of the two compilations can be disabled.  We should prefer
+      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+      #
-    # automatically cleaned when .libs/ is deleted, while ignoring
+      # With libtool 1.5 this exception was removed, and libtool now
-    # the former would cause a distcleancheck panic.
+      # generates 2 separate objects for the 2 libraries.  These two
-    tmpdepfile1=$dir$base.o.d          # libtool 1.5
+      # compilations output dependencies in $dir.libs/$base.o.d and
-    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
+      # in $dir$base.o.d.  We have to check for both files, because
-    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
+      # one of the two compilations can be disabled.  We should prefer
-    "$@" -Wc,-MD
+      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-  else
+      # automatically cleaned when .libs/ is deleted, while ignoring
-    tmpdepfile1=$dir$base.d
+      # the former would cause a distcleancheck panic.
-    tmpdepfile2=$dir$base.d
+      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-    tmpdepfile3=$dir$base.d
+      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-    "$@" -MD
+      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-  fi
+      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
+      "$@" -Wc,-MD
+   else
+      tmpdepfile1=$dir$base.o.d
+      tmpdepfile2=$dir$base.d
+      tmpdepfile3=$dir$base.d
+      tmpdepfile4=$dir$base.d
+      "$@" -MD
+   fi
 
-  stat=$?
+   stat=$?
-  if test $stat -ne 0; then
+   if test $stat -eq 0; then :
-    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+   else
-    exit $stat
+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-  fi
+      exit $stat
+   fi
 
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-  do
+   do
-    test -f "$tmpdepfile" && break
+     test -f "$tmpdepfile" && break
-  done
+   done
-  # Same post-processing that is required for AIX mode.
+   if test -f "$tmpdepfile"; then
-  aix_post_process_depfile
+      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-  ;;
+      sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+   else
+      echo "#dummy" > "$depfile"
+   fi
+   rm -f "$tmpdepfile"
+   ;;
 
 msvc7)
   if test "$libtool" = yes; then
@@ -526,7 +446,8 @@ msvc7)
   "$@" $showIncludes > "$tmpdepfile"
   stat=$?
   grep -v '^Note: including file: ' "$tmpdepfile"
-  if test $stat -ne 0; then
+  if test "$stat" = 0; then :
+  else
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -552,7 +473,6 @@ $ {
   G
   p
 }' >> "$depfile"
-  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
   rm -f "$tmpdepfile"
   ;;
 
@@ -604,14 +524,13 @@ dashmstdout)
   # in the target name.  This is to cope with DOS-style filenames:
   # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
   "$@" $dashmflag |
-    sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
+    sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this sed invocation
+  tr ' ' "$nl" < "$tmpdepfile" | \
-  # correctly.  Breaking it into two sed invocations is a workaround.
+## Some versions of the HPUX 10.20 sed can't process this invocation
-  tr ' ' "$nl" < "$tmpdepfile" \
+## correctly.  Breaking it into two sed invocations is a workaround.
-    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -664,12 +583,10 @@ makedepend)
   # makedepend may prepend the VPATH from the source file name to the object.
   # No need to regex-escape $object, excess matching of '.' is harmless.
   sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process the last invocation
+  sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
-  # correctly.  Breaking it into two sed invocations is a workaround.
+## Some versions of the HPUX 10.20 sed can't process this invocation
-  sed '1,2d' "$tmpdepfile" \
+## correctly.  Breaking it into two sed invocations is a workaround.
-    | tr ' ' "$nl" \
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
-    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile" "$tmpdepfile".bak
   ;;
 
@@ -705,10 +622,10 @@ cpp)
     esac
   done
 
-  "$@" -E \
+  "$@" -E |
-    | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-             -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    | sed '$ s: \\$::' > "$tmpdepfile"
+    sed '$ s: \\$::' > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
   cat < "$tmpdepfile" >> "$depfile"
@@ -740,15 +657,15 @@ msvisualcpp)
       shift
       ;;
     "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-        set fnord "$@"
+	set fnord "$@"
-        shift
+	shift
-        shift
+	shift
-        ;;
+	;;
     *)
-        set fnord "$@" "$arg"
+	set fnord "$@" "$arg"
-        shift
+	shift
-        shift
+	shift
-        ;;
+	;;
     esac
   done
   "$@" -E 2>/dev/null |

archivers/libarchive/files/build/autoconf/iconv.m4

@@ -1,5 +1,5 @@
-# iconv.m4 serial 19 (gettext-0.18.2)
+# iconv.m4 serial 18 (gettext-0.18.2)
-dnl Copyright (C) 2000-2002, 2007-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2007-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -72,33 +72,27 @@ AC_DEFUN([AM_ICONV_LINK],
       if test $am_cv_lib_iconv = yes; then
         LIBS="$LIBS $LIBICONV"
       fi
-      am_cv_func_iconv_works=no
+      AC_RUN_IFELSE(
-      for ac_iconv_const in '' 'const'; do
+        [AC_LANG_SOURCE([[
-        AC_RUN_IFELSE(
-          [AC_LANG_PROGRAM(
-             [[
 #include <iconv.h>
 #include <string.h>
-
+int main ()
-#ifndef ICONV_CONST
+{
-# define ICONV_CONST $ac_iconv_const
+  int result = 0;
-#endif
-             ]],
-             [[int result = 0;
   /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
      returns.  */
   {
     iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
     if (cd_utf8_to_88591 != (iconv_t)(-1))
       {
-        static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
+        static const char input[] = "\342\202\254"; /* EURO SIGN */
         char buf[10];
-        ICONV_CONST char *inptr = input;
+        const char *inptr = input;
         size_t inbytesleft = strlen (input);
         char *outptr = buf;
         size_t outbytesleft = sizeof (buf);
         size_t res = iconv (cd_utf8_to_88591,
-                            &inptr, &inbytesleft,
+                            (char **) &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
           result |= 1;
@@ -111,14 +105,14 @@ AC_DEFUN([AM_ICONV_LINK],
     iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
     if (cd_ascii_to_88591 != (iconv_t)(-1))
       {
-        static ICONV_CONST char input[] = "\263";
+        static const char input[] = "\263";
         char buf[10];
-        ICONV_CONST char *inptr = input;
+        const char *inptr = input;
         size_t inbytesleft = strlen (input);
         char *outptr = buf;
         size_t outbytesleft = sizeof (buf);
         size_t res = iconv (cd_ascii_to_88591,
-                            &inptr, &inbytesleft,
+                            (char **) &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
           result |= 2;
@@ -130,14 +124,14 @@ AC_DEFUN([AM_ICONV_LINK],
     iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
     if (cd_88591_to_utf8 != (iconv_t)(-1))
       {
-        static ICONV_CONST char input[] = "\304";
+        static const char input[] = "\304";
         static char buf[2] = { (char)0xDE, (char)0xAD };
-        ICONV_CONST char *inptr = input;
+        const char *inptr = input;
         size_t inbytesleft = 1;
         char *outptr = buf;
         size_t outbytesleft = 1;
         size_t res = iconv (cd_88591_to_utf8,
-                            &inptr, &inbytesleft,
+                            (char **) &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
           result |= 4;
@@ -150,14 +144,14 @@ AC_DEFUN([AM_ICONV_LINK],
     iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
     if (cd_88591_to_utf8 != (iconv_t)(-1))
       {
-        static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+        static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
         char buf[50];
-        ICONV_CONST char *inptr = input;
+        const char *inptr = input;
         size_t inbytesleft = strlen (input);
         char *outptr = buf;
         size_t outbytesleft = sizeof (buf);
         size_t res = iconv (cd_88591_to_utf8,
-                            &inptr, &inbytesleft,
+                            (char **) &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if ((int)res > 0)
           result |= 8;
@@ -177,14 +171,17 @@ AC_DEFUN([AM_ICONV_LINK],
       && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
     result |= 16;
   return result;
-]])],
+}]])],
-          [am_cv_func_iconv_works=yes], ,
+        [am_cv_func_iconv_works=yes],
-          [case "$host_os" in
+        [am_cv_func_iconv_works=no],
-             aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+        [
-             *)            am_cv_func_iconv_works="guessing yes" ;;
+changequote(,)dnl
-           esac])
+         case "$host_os" in
-        test "$am_cv_func_iconv_works" = no || break
+           aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
-      done
+           *)            am_cv_func_iconv_works="guessing yes" ;;
+         esac
+changequote([,])dnl
+        ])
       LIBS="$am_save_LIBS"
     ])
     case "$am_cv_func_iconv_works" in