Update libarchive and bsdtar to 2.5.5.

This further polishes bsdcpio and brings in a number of portability
fixes.

Revert temporary hack to not use vfork on IRIX.

4 files changed, 5 insertions, 19 deletions

diff --git a/archivers/bsdtar/Makefile b/archivers/bsdtar/Makefile
index 2616db3feab..3cbafccea5c 100644
--- a/archivers/bsdtar/Makefile
+++ b/archivers/bsdtar/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2008/07/13 14:25:04 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2008/07/14 14:56:50 joerg Exp $
 #
 
-DISTNAME=	bsdtar-2.5.4b
+DISTNAME=	bsdtar-2.5.5
 CATEGORIES=	archivers
 MASTER_SITES=	http://people.freebsd.org/~kientzle/libarchive/src/
 DISTFILES=	# empty
@@ -61,6 +61,4 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bsdtar ${DESTDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/tar/bsdtar.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
-.include "../../archivers/libarchive/hacks.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/libarchive/Makefile b/archivers/libarchive/Makefile
index 5b505a371df..0b63664b142 100644
--- a/archivers/libarchive/Makefile
+++ b/archivers/libarchive/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2008/07/13 14:25:04 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2008/07/14 14:56:50 joerg Exp $
 #
 
-DISTNAME=	libarchive-2.5.4b
+DISTNAME=	libarchive-2.5.5
 CATEGORIES=	archivers
 MASTER_SITES=	http://people.freebsd.org/~kientzle/libarchive/src/
 DISTFILES=	# empty
@@ -22,8 +22,6 @@ CONFIGURE_ARGS+=	--disable-bsdtar
 do-extract:
 	${CP} -r ${FILESDIR} ${WRKSRC}
 
-.include "../../archivers/libarchive/hacks.mk"
-
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/libarchive/hacks.mk b/archivers/libarchive/hacks.mk
deleted file mode 100644
index 6eb1d36db41..00000000000
--- a/archivers/libarchive/hacks.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# $NetBSD: hacks.mk,v 1.1 2008/07/13 14:25:04 joerg Exp $
-
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(OPSYS:MIRIX*)
-CPPFLAGS+=	-Dvfork=fork
-CONFIGURE_ENV+=	ac_cv_func_vfork=yes
-.endif
diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile
index 85ad391616e..9c63f569517 100644
--- a/pkgtools/pkg_install/Makefile
+++ b/pkgtools/pkg_install/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.157 2008/07/13 14:25:05 joerg Exp $
+# $NetBSD: Makefile,v 1.158 2008/07/14 14:56:50 joerg Exp $
 
 # Notes to package maintainers:
 #
@@ -175,6 +175,4 @@ update:
 	${MAKE} ${UPDATE_TARGET}
 	${MAKE} clean
 
-.include "../../archivers/libarchive/hacks.mk"
-
 .include "../../mk/bsd.pkg.mk"