summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/cripple/DESCR2
-rw-r--r--audio/cripple/MESSAGE4
-rw-r--r--audio/rip/MESSAGE4
-rw-r--r--mk/defaults/mk.conf4
-rw-r--r--multimedia/dvdrip/Makefile6
-rw-r--r--pkgtools/cdpack/Makefile6
-rw-r--r--sysutils/burn/Makefile5
-rw-r--r--sysutils/cdbkup/Makefile10
-rw-r--r--sysutils/dvd+rw-tools/Makefile5
-rw-r--r--sysutils/dvdrecord/MESSAGE4
-rw-r--r--sysutils/gcombust/Makefile6
-rw-r--r--sysutils/mklivecd/Makefile6
-rw-r--r--sysutils/nautilus-cd-burner/Makefile6
13 files changed, 35 insertions, 33 deletions
diff --git a/audio/cripple/DESCR b/audio/cripple/DESCR
index 6b21559ce34..cc73dc6c21e 100644
--- a/audio/cripple/DESCR
+++ b/audio/cripple/DESCR
@@ -1,5 +1,5 @@
Cripple is a simple command line CD ripper wrapper. It uses audio/cdparanoia,
-misc/libcdio or sysutils/cdrecord to rip, and audio/lame or audio/bladeenc to
+misc/libcdio or sysutils/cdrtools to rip, and audio/lame or audio/bladeenc to
encode tracks from a CD.
Cripple retrieves naming information for filenames and ID3 tags from the freedb
diff --git a/audio/cripple/MESSAGE b/audio/cripple/MESSAGE
index 11189f781e3..7ed73319c0e 100644
--- a/audio/cripple/MESSAGE
+++ b/audio/cripple/MESSAGE
@@ -1,11 +1,11 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2005/12/28 15:52:01 ghen Exp $
+$NetBSD: MESSAGE,v 1.2 2006/01/05 23:29:04 wiz Exp $
To use this package you will need at least one of the following rippers:
audio/cdparanoia
misc/libcdio
-sysutils/cdrecord
+sysutils/cdrtools
and one of the following encoders:
diff --git a/audio/rip/MESSAGE b/audio/rip/MESSAGE
index 8dd9aa87e04..c9b2b29f427 100644
--- a/audio/rip/MESSAGE
+++ b/audio/rip/MESSAGE
@@ -1,12 +1,12 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.2 2005/09/28 14:15:48 rillig Exp $
+$NetBSD: MESSAGE,v 1.3 2006/01/05 23:29:04 wiz Exp $
To actually use rip, you need to install at least one of the
following rippers and encoders:
Rippers:
- audio/cdparanoia
- - sysutils/cdrecord (includes cdda2wav)
+ - sysutils/cdrtools (includes cdda2wav)
Encoders:
- audio/bladeenc
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index 31bcd39bdfa..59492fb26d1 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.107 2006/01/01 18:25:07 tron Exp $
+# $NetBSD: mk.conf,v 1.108 2006/01/05 23:29:04 wiz Exp $
#
# This file provides default values for variables that may be overridden
@@ -628,7 +628,7 @@ CANNA_USER?= daemon
#CDRECORD_CONF= ${PKG_SYSCONFDIR}/cdrecord.conf
# The location of the cdrtools/cdrecord configuration file. The
-# sysutils/cdrecord pkg issues a warning if the cdrtools default of
+# sysutils/cdrtools pkg issues a warning if the cdrtools default of
# /etc/default/cdrecord is changed, and the man pages are updated
# accordingly. This is required by the cdrtools license.
# Possible: any file name
diff --git a/multimedia/dvdrip/Makefile b/multimedia/dvdrip/Makefile
index 26f0f8af030..e42e7b16b95 100644
--- a/multimedia/dvdrip/Makefile
+++ b/multimedia/dvdrip/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2005/12/11 09:40:45 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2006/01/05 23:29:04 wiz Exp $
#
DISTNAME= Video-DVDRip-0.50.18
PKGNAME= ${DISTNAME:C|Video-DVDRip|dvdrip|}
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= multimedia x11 sysutils
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Video/}
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.exit1.org/dvdrip/
COMMENT= Graphical frontend for DVD ripping
DEPENDS+= cdrdao>=1.1.7:../../sysutils/cdrdao
-DEPENDS+= {cdrecord,cdrtools-ossdvd}>=1.10:../../sysutils/cdrecord
+DEPENDS+= {cdrtools,cdrtools-ossdvd}>=1.10:../../sysutils/cdrtools
DEPENDS+= mplayer>=0.90:../../multimedia/mplayer
DEPENDS+= ogmtools-[0-9]*:../../multimedia/ogmtools
DEPENDS+= p5-Gdk-Pixbuf-[0-9]*:../../graphics/p5-Gdk-Pixbuf
diff --git a/pkgtools/cdpack/Makefile b/pkgtools/cdpack/Makefile
index f003163b20f..9f6e0256eda 100644
--- a/pkgtools/cdpack/Makefile
+++ b/pkgtools/cdpack/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2005/08/01 21:47:43 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.21 2006/01/05 23:29:05 wiz Exp $
#
-DISTNAME= cdpack-1.6
+DISTNAME= cdpack-1.7
CATEGORIES= pkgtools
MASTER_SITES= # empty
DISTFILES= # empty
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.NetBSD.org/
COMMENT= Utility to create multi-cd binary package collections
# for mkisofs
-DEPENDS+= cdrecord-[0-9]*:../../sysutils/cdrecord
+DEPENDS+= cdrtools-[0-9]*:../../sysutils/cdrtools
WRKSRC= ${WRKDIR}
NO_CHECKSUM= yes
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