[src/netbsd-7]: src/distrib Pull up following revision(s) (requested by riast...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d764ba60e9b6
branches:  netbsd-7
changeset: 798247:d764ba60e9b6
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Aug 15 10:23:21 2014 +0000

description:
Pull up following revision(s) (requested by riastradh in ticket #17):
        distrib/vax/cdroms/installcd/Makefile: revision 1.9
        distrib/amd64/cdroms/Makefile.cdrom: revision 1.11
        distrib/i386/cdroms/Makefile.cdrom: revision 1.31
        distrib/sparc64/cdroms/installcd/Makefile: revision 1.19
CD images need libarchive if MKBSDTAR is yes.

diffstat:

 distrib/amd64/cdroms/Makefile.cdrom       |  5 ++++-
 distrib/i386/cdroms/Makefile.cdrom        |  5 ++++-
 distrib/sparc64/cdroms/installcd/Makefile |  5 ++++-
 distrib/vax/cdroms/installcd/Makefile     |  5 ++++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diffs (76 lines):

diff -r 6fd99de056bc -r d764ba60e9b6 distrib/amd64/cdroms/Makefile.cdrom
--- a/distrib/amd64/cdroms/Makefile.cdrom       Fri Aug 15 09:53:48 2014 +0000
+++ b/distrib/amd64/cdroms/Makefile.cdrom       Fri Aug 15 10:23:21 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.10 2014/07/26 19:34:08 dholland Exp $
+# $NetBSD: Makefile.cdrom,v 1.10.2.1 2014/08/15 10:23:22 martin Exp $
 
 .include <bsd.own.mk>
 
@@ -37,6 +37,9 @@
 CDRUNTIME+=    ./usr/bin/tput
 CDRUNTIME+=    ./usr/bin/vi
 CDRUNTIME+=    ./usr/bin/vmstat
+.if ${MKBSDTAR} != "no"
+CDRUNTIME+=    ./usr/lib/libarchive.so*
+.endif
 CDRUNTIME+=    ./usr/lib/libbz2.so*
 CDRUNTIME+=    ./usr/lib/libc.so*
 CDRUNTIME+=    ./usr/lib/libcurses.so*
diff -r 6fd99de056bc -r d764ba60e9b6 distrib/i386/cdroms/Makefile.cdrom
--- a/distrib/i386/cdroms/Makefile.cdrom        Fri Aug 15 09:53:48 2014 +0000
+++ b/distrib/i386/cdroms/Makefile.cdrom        Fri Aug 15 10:23:21 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.30 2014/07/26 19:34:08 dholland Exp $
+# $NetBSD: Makefile.cdrom,v 1.30.2.1 2014/08/15 10:23:22 martin Exp $
 
 .include <bsd.own.mk>
 
@@ -37,6 +37,9 @@
 CDRUNTIME+=    ./usr/bin/tput
 CDRUNTIME+=    ./usr/bin/vi
 CDRUNTIME+=    ./usr/bin/vmstat
+.if ${MKBSDTAR} != "no"
+CDRUNTIME+=    ./usr/lib/libarchive.so*
+.endif
 CDRUNTIME+=    ./usr/lib/libbz2.so*
 CDRUNTIME+=    ./usr/lib/libc.so*
 CDRUNTIME+=    ./usr/lib/libcurses.so*
diff -r 6fd99de056bc -r d764ba60e9b6 distrib/sparc64/cdroms/installcd/Makefile
--- a/distrib/sparc64/cdroms/installcd/Makefile Fri Aug 15 09:53:48 2014 +0000
+++ b/distrib/sparc64/cdroms/installcd/Makefile Fri Aug 15 10:23:21 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.18 2014/07/26 19:34:08 dholland Exp $
+#      $NetBSD: Makefile,v 1.18.2.1 2014/08/15 10:23:22 martin Exp $
 CDBASE=                sparc64cd               # gives ${CDBASE}.iso
 CDRELEASE=     true                    # include $RELEASEDIR/$MACHINE
 
@@ -38,6 +38,9 @@
 CDRUNTIME+=    ./usr/bin/tput
 CDRUNTIME+=    ./usr/bin/vi
 CDRUNTIME+=    ./usr/bin/vmstat
+.if ${MKBSDTAR} != "no"
+CDRUNTIME+=    ./usr/lib/libarchive.so*
+.endif
 CDRUNTIME+=    ./usr/lib/libbz2.so*
 CDRUNTIME+=    ./usr/lib/libc.so*
 CDRUNTIME+=    ./usr/lib/libcurses.so*
diff -r 6fd99de056bc -r d764ba60e9b6 distrib/vax/cdroms/installcd/Makefile
--- a/distrib/vax/cdroms/installcd/Makefile     Fri Aug 15 09:53:48 2014 +0000
+++ b/distrib/vax/cdroms/installcd/Makefile     Fri Aug 15 10:23:21 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2014/07/26 19:34:08 dholland Exp $
+#      $NetBSD: Makefile,v 1.8.2.1 2014/08/15 10:23:21 martin Exp $
 CDBASE=                vaxcd                   # gives ${CDBASE}.iso
 CDRELEASE=     true                    # include $RELEASEDIR/$MACHINE
 CDKERNELS=     ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-GENERIC.gz        netbsd.gz
@@ -68,6 +68,9 @@
 CDRUNTIME+=    ./usr/bin/tput
 CDRUNTIME+=    ./usr/bin/vi
 CDRUNTIME+=    ./usr/bin/vmstat
+.if ${MKBSDTAR} != "no"
+CDRUNTIME+=    ./usr/lib/libarchive.so*
+.endif
 CDRUNTIME+=    ./usr/lib/libbz2.so*
 CDRUNTIME+=    ./usr/lib/libc.so*
 CDRUNTIME+=    ./usr/lib/libcurses.so*