Depend on cdrtools instead of cdrecord. Bump PKGREVISION.

Update some messages/comments.

7 files changed, 22 insertions, 20 deletions

diff --git a/sysutils/burn/Makefile b/sysutils/burn/Makefile
index 8254eea31f6..f92d2e56411 100644
--- a/sysutils/burn/Makefile
+++ b/sysutils/burn/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2005/06/01 18:03:21 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2006/01/05 23:29:05 wiz Exp $
 #
 
 DISTNAME=	burn-0.4.0
+PKGREVISION=	1
 CATEGORIES=	sysutils gnustep
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gsburn/}
 
@@ -10,7 +11,7 @@ HOMEPAGE=	http://gsburn.sourceforge.net/
 COMMENT=	GNUstep based CD burning program
 
 DEPENDS+=	cdparanoia>=3.0.9.8:../../audio/cdparanoia
-DEPENDS+=	cdrecord>=1.10:../../sysutils/cdrecord
+DEPENDS+=	cdrtools>=1.10:../../sysutils/cdrtools
 DEPENDS+=	cdrdao>=1.1.5:../../sysutils/cdrdao
 DEPENDS+=	gworkspace-[0-9]*:../../sysutils/gworkspace
 
diff --git a/sysutils/cdbkup/Makefile b/sysutils/cdbkup/Makefile
index ec12464a231..b611ef25f63 100644
--- a/sysutils/cdbkup/Makefile
+++ b/sysutils/cdbkup/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2005/12/05 23:55:19 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2006/01/05 23:29:05 wiz Exp $
 
 DISTNAME=		cdbkup-1.0
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=cdbkup/} \
 			ftp://batraq.anything3d.com/pub/cdbkup/cdbkup-1/ \
@@ -11,9 +11,7 @@ MAINTAINER=		mishka@terabyte.com.ua
 HOMEPAGE=		http://sourceforge.net/projects/cdbkup/
 COMMENT=		CD-R(W) backup/restore system
 
-.include "../../mk/bsd.prefs.mk"
-
-DEPENDS+=		cdrecord>=1.10:../../sysutils/cdrecord
+DEPENDS+=		cdrtools>=1.10:../../sysutils/cdrtools
 
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		cat date gtar perl:run
@@ -21,6 +19,8 @@ CONFIGURE_ENV+=		CAT=${TOOLS_CAT:Q}
 CONFIGURE_ENV+=		DATE=${TOOLS_DATE:Q}
 CONFIGURE_ENV+=		GNUTAR=${TOOLS_TAR:Q}
 
+.include "../../mk/bsd.prefs.mk"
+
 .if (${OPSYS} == SunOS)
 CDBKUP_SNARDIR?=	/var/${PKGBASE}
 CDBKUP_DUMPGRP?=	sys
diff --git a/sysutils/dvd+rw-tools/Makefile b/sysutils/dvd+rw-tools/Makefile
index adb6fd72a26..ea6c7a67ee0 100644
--- a/sysutils/dvd+rw-tools/Makefile
+++ b/sysutils/dvd+rw-tools/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2005/12/05 20:51:00 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2006/01/05 23:29:05 wiz Exp $
 #
 
 DISTNAME=	dvd+rw-tools-5.21.4.10.8
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://fy.chalmers.se/~appro/linux/DVD+RW/tools/
 
@@ -9,7 +10,7 @@ MAINTAINER=	dan@NetBSD.org
 HOMEPAGE=	http://fy.chalmers.se/~appro/linux/DVD+RW/
 COMMENT=	Tools for writing DVD+R[W] disks
 
-DEPENDS+=	{cdrecord-[1-9]*,cdrtools-ossdvd-[0-9]*}:../../sysutils/cdrecord
+DEPENDS+=	{cdrtools-[1-9]*,cdrtools-ossdvd-[0-9]*}:../../sysutils/cdrtools
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
diff --git a/sysutils/dvdrecord/MESSAGE b/sysutils/dvdrecord/MESSAGE
index 1fcd9442055..a98d86a2dd1 100644
--- a/sysutils/dvdrecord/MESSAGE
+++ b/sysutils/dvdrecord/MESSAGE
@@ -1,6 +1,6 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2003/01/17 13:53:11 toshii Exp $
+$NetBSD: MESSAGE,v 1.2 2006/01/05 23:29:05 wiz Exp $
 
 To create DVD filesystem images, you will probably need mkisofs,
-which is contained in pkgsrc/sysutils/cdrecord.
+which is contained in pkgsrc/sysutils/cdrtools.
 ===========================================================================
diff --git a/sysutils/gcombust/Makefile b/sysutils/gcombust/Makefile
index 9b07bb25307..3be16158db4 100644
--- a/sysutils/gcombust/Makefile
+++ b/sysutils/gcombust/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2005/04/11 21:47:23 tv Exp $
+# $NetBSD: Makefile,v 1.42 2006/01/05 23:29:05 wiz Exp $
 #
 
 DISTNAME=		gcombust-0.1.54
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		x11 sysutils
 MASTER_SITES=		${HOMEPAGE}
 
@@ -10,7 +10,7 @@ MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.abo.fi/~jmunsin/gcombust/
 COMMENT=		Graphical frontend for CD mastering (mkisofs, cdrecord, ...)
 
-DEPENDS+=		cdrecord>=1.10:../../sysutils/cdrecord
+DEPENDS+=		cdrtools>=1.10:../../sysutils/cdrtools
 DEPENDS+=		cdlabelgen-[0-9]*:../../graphics/cdlabelgen
 DEPENDS+=		gv-[0-9]*:../../print/gv
 
diff --git a/sysutils/mklivecd/Makefile b/sysutils/mklivecd/Makefile
index 0125f4cdd9b..858ec136ddc 100644
--- a/sysutils/mklivecd/Makefile
+++ b/sysutils/mklivecd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2005/10/08 23:20:10 xtraeme Exp $
+# $NetBSD: Makefile,v 1.26 2006/01/05 23:29:05 wiz Exp $
 
-DISTNAME=	mklivecd-0.13.2
+DISTNAME=	mklivecd-0.13.3
 CATEGORIES=	sysutils
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -8,7 +8,7 @@ DISTFILES=	# empty
 MAINTAINER=	xtraeme@NetBSD.org
 COMMENT=	Make your own NetBSD/i386 Live CD-ROM/DVD-ROM
 
-DEPENDS+=	{cdrecord,cdrtools-ossdvd}-[0-9]*:../../sysutils/cdrecord
+DEPENDS+=	{cdcrtools,cdrtools-ossdvd}-[0-9]*:../../sysutils/cdrtools
 DEPENDS+=	grub>=0.97:../../sysutils/grub
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 2f6ef6fe200..b0aee2d8f14 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2005/12/31 12:32:45 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2006/01/05 23:29:05 wiz Exp $
 #
 
 DISTNAME=	nautilus-cd-burner-2.12.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/nautilus-cd-burner/2.12/}
 EXTRACT_SUFX=	.tar.bz2
@@ -11,7 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	CD burner view for Nautilus
 
-DEPENDS+=		{cdrecord,cdrtools-ossdvd}-[0-9]*:../../sysutils/cdrecord
+DEPENDS+=		{cdrtools,cdrtools-ossdvd}-[0-9]*:../../sysutils/cdrtools
 BUILD_USES_MSGFMT=	yes
 USE_MSGFMT_PLURALS=	yes