Chase the merge of sysutils/mkisofs into sysutils/cdrtools.

Submitted by:	marius

12 files changed, 19 insertions, 23 deletions

diff --git a/sysutils/cdbakeoven/Makefile b/sysutils/cdbakeoven/Makefile
index 4ecf9a17d901..3785ab03e906 100644
--- a/sysutils/cdbakeoven/Makefile
+++ b/sysutils/cdbakeoven/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cdbakeoven
 PORTVERSION=	1.8.9
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +16,6 @@ MAINTAINER=	lofi@freebsd.org
 COMMENT=	KDE frontend for cdrecord and mkisofs/mkhybrid
 
 RUN_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools \
-		mkisofs:${PORTSDIR}/sysutils/mkisofs \
 		mpg123:${PORTSDIR}/audio/mpg123 \
 		ogg123:${PORTSDIR}/audio/vorbis-tools
 
diff --git a/sysutils/cdbkup/Makefile b/sysutils/cdbkup/Makefile
index 4570f7344c0c..3cc2dcb7e58d 100644
--- a/sysutils/cdbkup/Makefile
+++ b/sysutils/cdbkup/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cdbkup
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,10 +17,8 @@ MAINTAINER=	kay_lehmann@web.de
 COMMENT=	Simple but full-featured backup/restore perl scripts (uses gnu tar)
 
 BUILD_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools \
-		mkisofs:${PORTSDIR}/sysutils/mkisofs \
 		${LOCALBASE}/sbin/eject:${PORTSDIR}/sysutils/eject
 RUN_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools \
-		mkisofs:${PORTSDIR}/sysutils/mkisofs \
 		${LOCALBASE}/sbin/eject:${PORTSDIR}/sysutils/eject
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/sysutils/dvd+rw-tools/Makefile b/sysutils/dvd+rw-tools/Makefile
index 38f5d287202b..e5518131649c 100644
--- a/sysutils/dvd+rw-tools/Makefile
+++ b/sysutils/dvd+rw-tools/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	dvd+rw-tools
 PORTVERSION=	5.19.4.9.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.pkix.net/mirror/fy.chalmers.se/ \
 		http://fy.chalmers.se/~appro/linux/DVD+RW/tools/
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.pkix.net/mirror/fy.chalmers.se/ \
 MAINTAINER=	chuck@pkix.net
 COMMENT=	DVD burning software
 
-RUN_DEPENDS=	${LOCALBASE}/bin/mkisofs:${PORTSDIR}/sysutils/mkisofs
+RUN_DEPENDS=	${LOCALBASE}/bin/mkisofs:${PORTSDIR}/sysutils/cdrtools
 
 USE_REINPLACE=	yes
 
diff --git a/sysutils/eroaster/Makefile b/sysutils/eroaster/Makefile
index 6ae7212c7f4c..7d2034a7e385 100644
--- a/sysutils/eroaster/Makefile
+++ b/sysutils/eroaster/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	eroaster
 PORTVERSION=	2.2.0.0.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	eroaster
@@ -17,7 +17,6 @@ MAINTAINER=	dave@gufi.org
 COMMENT=	A GNOME2 frontend to mkisofs/cdrecord
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gnome/_gnome.so:${PORTSDIR}/x11-toolkits/py-gnome2 \
-		mkisofs:${PORTSDIR}/sysutils/mkisofs \
 		cdrecord:${PORTSDIR}/sysutils/cdrtools
 
 .if defined(WITH_ADDITIONAL_PROGRAMS)
diff --git a/sysutils/freesbie/Makefile b/sysutils/freesbie/Makefile
index 23800ce686df..968dc53f3310 100644
--- a/sysutils/freesbie/Makefile
+++ b/sysutils/freesbie/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	freesbie
 PORTVERSION=	0.0.20040207
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.stud.uni-karlsruhe.de/~uedc/freesbie/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/0.0.//}
@@ -14,7 +15,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/0.0.//}
 MAINTAINER=	riggs@rrr.de
 COMMENT=	Yet another cool answer to the system-on-cd question
 
-RUN_DEPENDS=	mkisofs:${PORTSDIR}/sysutils/mkisofs \
+RUN_DEPENDS=	mkisofs:${PORTSDIR}/sysutils/cdrtools \
 		create_compressed_fs:${PORTSDIR}/sysutils/cloop-utils
 
 USE_BZIP2=	yes
diff --git a/sysutils/gcombust/Makefile b/sysutils/gcombust/Makefile
index 395f31a49922..c0cb81f34852 100644
--- a/sysutils/gcombust/Makefile
+++ b/sysutils/gcombust/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gcombust
 PORTVERSION=	0.1.53
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.abo.fi/~jmunsin/gcombust/
 
@@ -15,7 +15,6 @@ MAINTAINER=	mcdouga9@msu.edu
 COMMENT=	A GTK+ frontend for mkisofs and cdrecord
 
 RUN_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools \
-		mkisofs:${PORTSDIR}/sysutils/mkisofs \
 		cdlabelgen:${PORTSDIR}/print/cdlabelgen
 
 USE_GETTEXT=	yes
diff --git a/sysutils/gtoaster/Makefile b/sysutils/gtoaster/Makefile
index 5a8bcfcb7444..0e4d254b5507 100644
--- a/sysutils/gtoaster/Makefile
+++ b/sysutils/gtoaster/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtoaster
 PORTVERSION=	1.0.b6
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://gnometoaster.rulez.org/archive/
@@ -17,8 +17,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical cd cooking interface
 
-RUN_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools \
-		mkisofs:${PORTSDIR}/sysutils/mkisofs
+RUN_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile
index 7c18bbbb8c88..1badee1f9ddd 100644
--- a/sysutils/k3b-kde4/Makefile
+++ b/sysutils/k3b-kde4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	k3b
 PORTVERSION=	0.11.9
+PORTREVISION=	1
 CATEGORIES=	sysutils multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,8 +16,7 @@ MAINTAINER=	h.eichmann@gmx.de
 COMMENT=	A CD/DVD recording GUI for KDE
 
 RUN_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools \
-		cdrdao:${PORTSDIR}/sysutils/cdrdao \
-		mkisofs:${PORTSDIR}/sysutils/mkisofs
+		cdrdao:${PORTSDIR}/sysutils/cdrdao
 LIB_DEPENDS=	mad:${PORTSDIR}/audio/libmad \
 		id3tag:${PORTSDIR}/audio/libid3tag \
 		vorbis:${PORTSDIR}/audio/libvorbis \
diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index 7c18bbbb8c88..1badee1f9ddd 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	k3b
 PORTVERSION=	0.11.9
+PORTREVISION=	1
 CATEGORIES=	sysutils multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,8 +16,7 @@ MAINTAINER=	h.eichmann@gmx.de
 COMMENT=	A CD/DVD recording GUI for KDE
 
 RUN_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools \
-		cdrdao:${PORTSDIR}/sysutils/cdrdao \
-		mkisofs:${PORTSDIR}/sysutils/mkisofs
+		cdrdao:${PORTSDIR}/sysutils/cdrdao
 LIB_DEPENDS=	mad:${PORTSDIR}/audio/libmad \
 		id3tag:${PORTSDIR}/audio/libid3tag \
 		vorbis:${PORTSDIR}/audio/libvorbis \
diff --git a/sysutils/livecd/Makefile b/sysutils/livecd/Makefile
index 6de2906ccd78..41354de20242 100644
--- a/sysutils/livecd/Makefile
+++ b/sysutils/livecd/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	livecd
 PORTVERSION=	1.2.4b
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.primeirospassos.org/
 
 MAINTAINER=	ebrandi.home@uol.com.br
 COMMENT=	Tool Set to create custom FreeBSD LiveCD
 
-RUN_DEPENDS=	mkisofs:${PORTSDIR}/sysutils/mkisofs
+RUN_DEPENDS=	mkisofs:${PORTSDIR}/sysutils/cdrtools
 
 USE_REINPLACE=	yes
 NO_BUILD=	yes
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index dcdccfa3cfd4..e69961a018fb 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nautilus-cd-burner
 PORTVERSION=	2.6.1
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.6
@@ -15,8 +16,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	CD burner view for Nautilus
 
-RUN_DEPENDS=	mkisofs:${PORTSDIR}/sysutils/mkisofs \
-		cdrecord:${PORTSDIR}/sysutils/cdrtools
+RUN_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index 84bff42de80c..96bdbfa75578 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xcdroast
 PORTVERSION=	0.98.a.15
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.xcdroast.org/download/:src \
@@ -20,7 +20,6 @@ MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Another X11 frontend to mkisofs/cdrecord
 
 RUN_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools \
-		mkisofs:${PORTSDIR}/sysutils/mkisofs
 
 USE_X_PREFIX=	yes
 USE_GETTEXT=	yes