Update sysutils/mklivecd to 0.7.

Changes:

* s/DEPENDS/BUILD_DEPENDS/ for grub and cdrecord.
* Don't use "j" flag in tar(1), it is not available on NetBSD 1.6.x,
 use "z" flag instead.
* Replace harcoded tar with @TAR@ in the scripts.
* s/.tbz/.tgz/g

Thanks to Raoul Bhoedjang for his comments in private email.

4 files changed, 29 insertions, 26 deletions

diff --git a/sysutils/mklivecd/MESSAGE b/sysutils/mklivecd/MESSAGE
index 00c0c9143d2..8e9f8b33eed 100644
--- a/sysutils/mklivecd/MESSAGE
+++ b/sysutils/mklivecd/MESSAGE
@@ -1,10 +1,8 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2004/06/20 21:08:13 xtraeme Exp $
+$NetBSD: MESSAGE,v 1.5 2004/10/29 17:47:30 xtraeme Exp $
 
-In order to use ${PKGNAME}, you'll have to install sysutils/grub.
-
-Don't forget to create the ``menu.lst'' in $ISODIR/boot/grub to specify
-what kernels you want to boot.
+Don't forget to create the ``menu.lst'' file in $ISODIR/boot/grub
+to specify what kernels you want to boot.
 
 Good luck!
 
diff --git a/sysutils/mklivecd/Makefile b/sysutils/mklivecd/Makefile
index 75ea7c8657a..5190ceb00d7 100644
--- a/sysutils/mklivecd/Makefile
+++ b/sysutils/mklivecd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2004/07/28 20:36:28 xtraeme Exp $
+# $NetBSD: Makefile,v 1.11 2004/10/29 17:47:30 xtraeme Exp $
 
-DISTNAME=	mklivecd-0.6
+DISTNAME=	mklivecd-0.7
 CATEGORIES=	sysutils
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -8,7 +8,8 @@ DISTFILES=	# empty
 MAINTAINER=	xtraeme@NetBSD.org
 COMMENT=	Build a NetBSD i386 Live CD via command line
 
-DEPENDS+=	{cdrecord,cdrtools-ossdvd}-[0-9]*:../../sysutils/cdrecord
+BUILD_DEPENDS+=	{cdrecord,cdrtools-ossdvd}-[0-9]*:../../sysutils/cdrecord
+BUILD_DEPENDS+=	grub>=0.95:../../sysutils/grub
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
@@ -23,16 +24,20 @@ NO_BUILD=	YES
 
 INSTALLATION_DIRS=	man/man8 sbin share/mklivecd
 
-FILES=	    KERN-LIVECD mfs_rcd personal_config
+FILES=	    KERN-LIVECD personal_config
 
 do-install:
+.for f in mfs_rcd mklivecd.sh
 	@${SED} -e "s,@PREFIX@,${PREFIX},g" \
 		-e "s,@LOCALBASE@,${LOCALBASE},g" \
+		-e "s,@TAR@,${TAR},g" \
 		-e "s,@MACHINE_ARCH@,${MACHINE_ARCH},g" \
-		${FILESDIR}/mklivecd.sh > ${WRKDIR}/mklivecd
+		${FILESDIR}/${f} > ${WRKDIR}/${f}
+.endfor
 	${INSTALL_DATA_DIR} ${PREFIX}/share/mklivecd
-	${INSTALL_SCRIPT} ${WRKDIR}/mklivecd ${PREFIX}/sbin
+	${INSTALL_SCRIPT} ${WRKDIR}/mklivecd.sh ${PREFIX}/sbin/mklivecd
 	${INSTALL_MAN} ${FILESDIR}/mklivecd.8 ${PREFIX}/man/man8
+	${INSTALL_DATA} ${WRKDIR}/mfs_rcd ${PREFIX}/share/mklivecd
 .for F in ${FILES}
 	${INSTALL_DATA} ${FILESDIR}/${F} ${PREFIX}/share/mklivecd
 .endfor
diff --git a/sysutils/mklivecd/files/mfs_rcd b/sysutils/mklivecd/files/mfs_rcd
index 01f744bea1a..810d746e48a 100644
--- a/sysutils/mklivecd/files/mfs_rcd
+++ b/sysutils/mklivecd/files/mfs_rcd
@@ -1,4 +1,4 @@
-# $NetBSD: mfs_rcd,v 1.3 2004/04/27 21:12:43 xtraeme Exp $ 
+# $NetBSD: mfs_rcd,v 1.4 2004/10/29 17:47:30 xtraeme Exp $ 
 #
 # Mount mfs directories and unpack the required file
 # before anything.
@@ -29,7 +29,7 @@ mfsrc_start()
 
 	for f in mfs_dev mfs_etc mfs_var mfs_root
 	do
-	    tar xfjp /stand/$f.tbz -C / 
+	    @TAR@ xfzp /stand/$f.tgz -C / 
 	done
 	echo "=> Finished successfully."
 }
diff --git a/sysutils/mklivecd/files/mklivecd.sh b/sysutils/mklivecd/files/mklivecd.sh
index 27df94b7842..764dd89c3e7 100755
--- a/sysutils/mklivecd/files/mklivecd.sh
+++ b/sysutils/mklivecd/files/mklivecd.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: mklivecd.sh,v 1.14 2004/05/20 02:11:41 uebayasi Exp $
+# $NetBSD: mklivecd.sh,v 1.15 2004/10/29 17:47:30 xtraeme Exp $
 #
 # Copyright (c) 2004 Juan RP <xtraeme@NetBSD.org>
 # All rights reserved.
@@ -294,7 +294,7 @@ do_cdlive()
 			if [ "$verbose_mode" = "on" ]; then
 			    echo "=> Unpacking $S"
 			fi
-			tar xfzp $BASE_SETS_DIR/$S -C $ISODIR
+			@TAR@ xfzp $BASE_SETS_DIR/$S -C $ISODIR
 		    fi
 		done
 
@@ -316,7 +316,7 @@ do_cdlive()
 				if [ "$verbose_mode" = "on" ]; then
 				    echo "=> Unpacking $X"
 				fi
-				tar xfzp $X11_SETS_DIR/$X -C $ISODIR
+				@TAR@ xfzp $X11_SETS_DIR/$X -C $ISODIR
 			    fi
 			done
 		    fi
@@ -349,7 +349,7 @@ do_cdlive()
 		cat > $ISODIR/etc/rc.d/root <<_EOF_
 #!/bin/sh
 #
-# \$NetBSD: mklivecd.sh,v 1.14 2004/05/20 02:11:41 uebayasi Exp $
+# \$NetBSD: mklivecd.sh,v 1.15 2004/10/29 17:47:30 xtraeme Exp $
 # 
 
 # PROVIDE: root
@@ -370,7 +370,7 @@ load_rc_config \$name
 run_rc_command "\$1"
 _EOF_
 		# Make sure the devices are created before creating
-		# the .tbz files.
+		# the .tgz files.
 
 		showmsg "Creating devices"
 		cd $ISODIR/dev && ./MAKEDEV all
@@ -427,9 +427,9 @@ _EOF_
 		cp -f $SHAREDIR/mfs_rcd $ISODIR/etc/rc.d
 
 		SUBST_H="mount_mfs $MNT_HOME_ARGS swap /home"
-		SUBST_HT="tar xfjp /stand/mfs_home.tbz -C /"
+		SUBST_HT="@TAR@ xfzp /stand/mfs_home.tgz -C /"
 		SUBST_S="mount_mfs $MNT_PKG_SYSCONFDIR_ARGS swap /$PKG_SYSCONFDIR"
-		SUBST_ST="tar xfjp /stand/mfs_pkg_sysconfdir.tbz -C /"
+		SUBST_ST="@TAR@ xfjp /stand/mfs_pkg_sysconfdir.tgz -C /"
 
 		sed -e "s,@MNT_DEV_ARGS@,$MNT_DEV_ARGS,g" \
 		    -e "s,@MNT_ETC_ARGS@,$MNT_ETC_ARGS,g" \
@@ -442,8 +442,8 @@ _EOF_
 		for U in root var dev etc home
 		do
 		    if [ -d $ISODIR/$U ]; then
-			tar cfjp $ISODIR/stand/mfs_$U.tbz $U >/dev/null 2>&1
-			showmsg "Creating /stand/mfs_$U.tbz"
+			@TAR@ cfzp $ISODIR/stand/mfs_$U.tgz $U >/dev/null 2>&1
+			showmsg "Creating /stand/mfs_$U.tgz"
 		    fi
 		done
  
@@ -459,9 +459,9 @@ _EOF_
 		fi
                         
 		if [ -d $ISODIR/$PKG_SYSCONFDIR ]; then
-		    tar cfjp $ISODIR/stand/mfs_pkg_sysconfdir.tbz \
+		    @TAR@ cfzp $ISODIR/stand/mfs_pkg_sysconfdir.tgz \
 			$PKG_SYSCONFDIR >/dev/null 2>&1
-		    showmsg "Creating /stand/mfs_pkg_sysconfdir.tbz"
+		    showmsg "Creating /stand/mfs_pkg_sysconfdir.tgz"
 		    sed -e "s,@USRPKGETC@,$SUBST_S," \
 			-e "s,@USRPKGETCTAR@,$SUBST_ST," \
 			$ISODIR/etc/rc.d/mfs_rcd > $ISODIR/etc/rc.d/mfs_rcd.f
@@ -538,9 +538,9 @@ _EOF_
 		showmsg "Done."
 	;;
 	iso)
-		if [ ! -f $ISODIR/stand/mfs_etc.tbz ]; then
+		if [ ! -f $ISODIR/stand/mfs_etc.tgz ]; then
 			showmsg "Target iso failed!"
-			showmsg "Can't find mfs_etc.tbz file."
+			showmsg "Can't find mfs_etc.tgz file."
 			bye 1
 		fi