Module Name: src
Committed By: joerg
Date: Fri Apr 23 19:41:03 UTC 2010
Modified Files:
src/bin/pax: Makefile
src/external/bsd/libarchive/bin: Makefile
src/external/bsd/libarchive/bin/cpio: Makefile
src/external/bsd/libarchive/bin/tar: Makefile
src/share/mk: bsd.README bsd.own.mk
Log Message:
Add MKBSDTAR, defaulting to no. It switching cpio and tar to the
libarchive based frontends.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/bin/pax/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/libarchive/bin/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libarchive/bin/cpio/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libarchive/bin/tar/Makefile
cvs rdiff -u -r1.265 -r1.266 src/share/mk/bsd.README
cvs rdiff -u -r1.624 -r1.625 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/pax/Makefile
diff -u src/bin/pax/Makefile:1.38 src/bin/pax/Makefile:1.39
--- src/bin/pax/Makefile:1.38 Tue Feb 3 05:22:40 2009
+++ src/bin/pax/Makefile Fri Apr 23 19:41:02 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2009/02/03 05:22:40 dbj Exp $
+# $NetBSD: Makefile,v 1.39 2010/04/23 19:41:02 joerg Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
.include <bsd.own.mk>
@@ -32,11 +32,13 @@
# XXX: Interix does not have it; we need a conditional for it.
CPPFLAGS+= -DHAVE_SYS_MTIO_H
+.if ${MKBSDTAR} == "no"
LINKS+= ${BINDIR}/pax ${BINDIR}/tar
SYMLINKS+=${BINDIR}/tar /usr/bin/tar
LINKS+= ${BINDIR}/pax ${BINDIR}/cpio
SYMLINKS+=${BINDIR}/cpio /usr/bin/cpio
+.endif
.endif # } ! HOSTPROG
.if !defined(HOSTPROG) && !defined(SMALLPROG)
Index: src/external/bsd/libarchive/bin/Makefile
diff -u src/external/bsd/libarchive/bin/Makefile:1.1 src/external/bsd/libarchive/bin/Makefile:1.2
--- src/external/bsd/libarchive/bin/Makefile:1.1 Fri Sep 19 22:01:25 2008
+++ src/external/bsd/libarchive/bin/Makefile Fri Apr 23 19:41:03 2010
@@ -1,5 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2008/09/19 22:01:25 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2010/04/23 19:41:03 joerg Exp $
-SUBDIR= # cpio tar
+.include <bsd.own.mk>
+
+SUBDIR=
+
+.if ${MKBSDTAR} == "yes"
+SUBDIR+= cpio tar
+.endif
.include <bsd.subdir.mk>
Index: src/external/bsd/libarchive/bin/cpio/Makefile
diff -u src/external/bsd/libarchive/bin/cpio/Makefile:1.2 src/external/bsd/libarchive/bin/cpio/Makefile:1.3
--- src/external/bsd/libarchive/bin/cpio/Makefile:1.2 Sat Feb 20 02:55:53 2010
+++ src/external/bsd/libarchive/bin/cpio/Makefile Fri Apr 23 19:41:03 2010
@@ -1,10 +1,17 @@
-# $NetBSD: Makefile,v 1.2 2010/02/20 02:55:53 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2010/04/23 19:41:03 joerg Exp $
-PROG= bsdcpio
+PROG= cpio
SRCS= cmdline.c cpio.c
.include <bsd.init.mk>
.PATH: ${LIBARCHIVEDIR}/cpio
+CLEANFILES+= cpio.1
+
+cpio.1: ${LIBARCHIVEDIR}/cpio/bsdcpio.1
+ ${TOOL_CAT} ${LIBARCHIVEDIR}/cpio/bsdcpio.1 > $@
+
+SYMLINKS+=${BINDIR}/cpio /usr/bin/cpio
+
.include <bsd.prog.mk>
Index: src/external/bsd/libarchive/bin/tar/Makefile
diff -u src/external/bsd/libarchive/bin/tar/Makefile:1.2 src/external/bsd/libarchive/bin/tar/Makefile:1.3
--- src/external/bsd/libarchive/bin/tar/Makefile:1.2 Sat Feb 20 02:55:53 2010
+++ src/external/bsd/libarchive/bin/tar/Makefile Fri Apr 23 19:41:03 2010
@@ -1,10 +1,17 @@
-# $NetBSD: Makefile,v 1.2 2010/02/20 02:55:53 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2010/04/23 19:41:03 joerg Exp $
-PROG= bsdtar
+PROG= tar
SRCS= bsdtar.c cmdline.c getdate.c read.c subst.c tree.c util.c write.c
.include <bsd.init.mk>
.PATH: ${LIBARCHIVEDIR}/tar
+CLEANFILES+= tar.1
+
+tar.1: ${LIBARCHIVEDIR}/tar/bsdtar.1
+ ${TOOL_CAT} ${LIBARCHIVEDIR}/tar/bsdtar.1 > $@
+
+SYMLINKS+=${BINDIR}/tar /usr/bin/tar
+
.include <bsd.prog.mk>
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.265 src/share/mk/bsd.README:1.266
--- src/share/mk/bsd.README:1.265 Mon Feb 22 12:33:22 2010
+++ src/share/mk/bsd.README Fri Apr 23 19:41:03 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.265 2010/02/22 12:33:22 njoly Exp $
+# $NetBSD: bsd.README,v 1.266 2010/04/23 19:41:03 joerg Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -119,9 +119,14 @@
MKBFD Obsolete, use MKBINUTILS
-MKBINUTILS If "no", don't build binutils (gas, ld, etc and libbfd, libopcodes)
+MKBINUTILS If "no", don't build binutils (gas, ld, etc and libbfd,
+ libopcodes)
Default: yes
+MKBSDTAR If "yes", use the libarchive based cpio and tar instead of
+ the pax frontends.
+ Default: no
+
MKCATPAGES If "no", don't build or install the catman pages.
Default: yes
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.624 src/share/mk/bsd.own.mk:1.625
--- src/share/mk/bsd.own.mk:1.624 Mon Mar 22 03:35:26 2010
+++ src/share/mk/bsd.own.mk Fri Apr 23 19:41:03 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.624 2010/03/22 03:35:26 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.625 2010/04/23 19:41:03 joerg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -721,7 +721,7 @@
# default for some platforms, see above.
#
_MKVARS.no= \
- MKCRYPTO_IDEA MKCRYPTO_MDC2 MKCRYPTO_RC5 MKDEBUG MKDEBUGLIB \
+ MKBSDTAR MKCRYPTO_IDEA MKCRYPTO_MDC2 MKCRYPTO_RC5 MKDEBUG MKDEBUGLIB \
MKDTRACE MKEXTSRC \
MKMANDOC MKMANZ MKOBJDIRS \
MKPCC MKPCCCMDS \
