aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/abcde/Makefile2
-rw-r--r--audio/grip/Makefile2
-rw-r--r--audio/mp3burn/Makefile2
-rw-r--r--audio/prokyon3/Makefile4
-rw-r--r--graphics/lphoto/Makefile2
-rw-r--r--misc/lesspipe/Makefile2
-rw-r--r--multimedia/dvd-slideshow/Makefile2
-rw-r--r--multimedia/dvdrip/Makefile2
-rw-r--r--multimedia/ldvd/Makefile2
-rw-r--r--multimedia/qdvdauthor/Makefile2
-rw-r--r--multimedia/tovid/Makefile2
-rw-r--r--sysutils/cdbakeoven/Makefile4
-rw-r--r--sysutils/cdbkup/Makefile7
-rw-r--r--sysutils/dvd+rw-tools/Makefile2
-rw-r--r--sysutils/eroaster/Makefile4
-rw-r--r--sysutils/freesbie/Makefile3
-rw-r--r--sysutils/gcombust/Makefile4
-rw-r--r--sysutils/gnomebaker/Makefile7
-rw-r--r--sysutils/gtoaster/Makefile3
-rw-r--r--sysutils/hal/Makefile4
-rw-r--r--sysutils/k3b-kde4/Makefile4
-rw-r--r--sysutils/k3b/Makefile4
-rw-r--r--sysutils/livecd/Makefile3
-rw-r--r--sysutils/nautilus-cd-burner/Makefile4
-rw-r--r--sysutils/xcdroast/Makefile3
25 files changed, 34 insertions, 46 deletions
diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile
index 6cda99117d85..72fa74aadd02 100644
--- a/audio/abcde/Makefile
+++ b/audio/abcde/Makefile
@@ -28,7 +28,7 @@ MAN1= abcde.1 cddb-tool.1
PLIST_FILES= bin/abcde bin/cddb-tool etc/abcde.conf
.if defined(WITH_CDDA2WAV)
-RUN_DEPENDS+= cdda2wav:${PORTSDIR}/sysutils/cdrtools
+USE_CDRTOOLS= yes
.endif
.if defined(WITH_DAGRAB)
diff --git a/audio/grip/Makefile b/audio/grip/Makefile
index 892c428f9363..d1dda068fd49 100644
--- a/audio/grip/Makefile
+++ b/audio/grip/Makefile
@@ -63,7 +63,7 @@ CONFIGURE_ARGS+= --disable-cdpar
.endif
.if defined(WITH_CDDA2WAV)
-RUN_DEPENDS+= cdda2wav:${PORTSDIR}/sysutils/cdrtools
+USE_CDRTOOLS= yes
.endif
.if defined(WITH_BLADEENC)
diff --git a/audio/mp3burn/Makefile b/audio/mp3burn/Makefile
index caa0782c7ef2..6197254a3cb3 100644
--- a/audio/mp3burn/Makefile
+++ b/audio/mp3burn/Makefile
@@ -17,13 +17,13 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 \
ogg123:${PORTSDIR}/audio/vorbis-tools \
${SITE_PERL}/MP3/Info.pm:${PORTSDIR}/audio/p5-MP3-Info \
${SITE_PERL}/${PERL_ARCH}/Ogg/Vorbis/Header.pm:${PORTSDIR}/audio/p5-Ogg-Vorbis-Header \
- cdrecord:${PORTSDIR}/sysutils/cdrtools \
${SITE_PERL}/String/ShellQuote.pm:${PORTSDIR}/textproc/p5-String-ShellQuote
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_BZIP2= yes
USE_PERL5= yes
+USE_CDRTOOLS= yes
NO_BUILD= yes
MAN1= mp3burn.1
diff --git a/audio/prokyon3/Makefile b/audio/prokyon3/Makefile
index f2cddb476f98..142c5f5914f8 100644
--- a/audio/prokyon3/Makefile
+++ b/audio/prokyon3/Makefile
@@ -38,8 +38,8 @@ CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include \
.endif
.if defined(WITH_BURN)
-RUN_DEPENDS+= cdrecord:${PORTSDIR}/sysutils/cdrtools \
- mpg123:${PORTSDIR}/audio/mpg123 \
+USE_CDRTOOLS= yes
+RUN_DEPENDS+= mpg123:${PORTSDIR}/audio/mpg123 \
ogg123:${PORTSDIR}/audio/vorbis-tools \
normalize:${PORTSDIR}/audio/normalize \
bash:${PORTSDIR}/shells/bash2
diff --git a/graphics/lphoto/Makefile b/graphics/lphoto/Makefile
index 424913ed7602..5abc1f4c6475 100644
--- a/graphics/lphoto/Makefile
+++ b/graphics/lphoto/Makefile
@@ -23,7 +23,7 @@ BUILD_DEPENDS= kdepyuic:${PORTSDIR}/x11-toolkits/py-kde
RUN_DEPENDS= gphoto2:${PORTSDIR}/graphics/gphoto2 \
kdepyuic:${PORTSDIR}/x11-toolkits/py-kde \
${PYTHON_SITELIBDIR}/OpenGL/GL/GL__init__.py:${PORTSDIR}/graphics/py-opengl
-# cdrecord:${PORTSDIR}/sysutils/cdrtools
+#USE_CDRTOOLS= yes
USE_PYTHON= yes
NO_BUILD= yes
diff --git a/misc/lesspipe/Makefile b/misc/lesspipe/Makefile
index 6b0658804605..63643cf4e301 100644
--- a/misc/lesspipe/Makefile
+++ b/misc/lesspipe/Makefile
@@ -27,8 +27,8 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
dvi2tty:${PORTSDIR}/print/dvi2tty \
pstotext:${PORTSDIR}/print/pstotext \
mp3info:${PORTSDIR}/audio/mp3info \
- isoinfo:${PORTSDIR}/sysutils/cdrtools \
cabextract:${PORTSDIR}/archivers/cabextract
+USE_CDRTOOLS= yes
.endif
USE_PERL5= yes
diff --git a/multimedia/dvd-slideshow/Makefile b/multimedia/dvd-slideshow/Makefile
index 03112080ef69..2cab23da44a4 100644
--- a/multimedia/dvd-slideshow/Makefile
+++ b/multimedia/dvd-slideshow/Makefile
@@ -20,11 +20,11 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \
ffmpeg:${PORTSDIR}/multimedia/ffmpeg \
sox:${PORTSDIR}/audio/sox \
dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
- mkisofs:${PORTSDIR}/sysutils/cdrtools \
seq2:${PORTSDIR}/misc/seq2 \
${X11BASE}/lib/X11/fonts/urwfonts-ttf/README:${PORTSDIR}/x11-fonts/urwfonts-ttf
NO_BUILD= yes
+USE_CDRTOOLS= yes
OPTIONS= DVDRWTOOLS "Needed to record/burn DVD" off \
LAME "Optional support for audio" off \
diff --git a/multimedia/dvdrip/Makefile b/multimedia/dvdrip/Makefile
index 0a4ff4442c9c..0044f23a86b3 100644
--- a/multimedia/dvdrip/Makefile
+++ b/multimedia/dvdrip/Makefile
@@ -16,7 +16,6 @@ MAINTAINER= rainer.alves@gmail.com
COMMENT= This is dvd::rip, a Perl Gtk+ based dvd-ripper
RUN_DEPENDS+= cdrdao:${PORTSDIR}/sysutils/cdrdao \
- cdrecord:${PORTSDIR}/sysutils/cdrtools \
convert:${PORTSDIR}/graphics/ImageMagick \
mplayer:${PORTSDIR}/multimedia/mplayer \
pstree:${PORTSDIR}/sysutils/pstree \
@@ -38,6 +37,7 @@ OPTIONS= SUBTITLE "Enable support for getting subtitles" on \
PERL_CONFIGURE= yes
CONFIGURE_ENV= SKIP_UNPACK_REQUIRED_MODULES=1
USE_PERL5= yes
+USE_CDRTOOLS= yes
USE_GETTEXT= yes
MAN1= dvdrip.1 dvdrip-progress.1 dvdrip-splitpipe.1
diff --git a/multimedia/ldvd/Makefile b/multimedia/ldvd/Makefile
index 00d168b7b128..214f4a586e37 100644
--- a/multimedia/ldvd/Makefile
+++ b/multimedia/ldvd/Makefile
@@ -18,7 +18,6 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
LIB_DEPENDS= dvdread.3:${PORTSDIR}/multimedia/libdvdread
RUN_DEPENDS= transcode:${PORTSDIR}/multimedia/transcode \
growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
- mkisofs:${PORTSDIR}/sysutils/cdrtools \
ifo_dump:${PORTSDIR}/multimedia/ogle \
dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
buffer:${PORTSDIR}/misc/buffer \
@@ -27,6 +26,7 @@ RUN_DEPENDS= transcode:${PORTSDIR}/multimedia/transcode \
USE_BZIP2= yes
USE_PERL5= yes
+USE_CDRTOOLS= yes
DATA= de.lang en.lang
PORTDOCS= AUTHORS HISTORY README.de README.en
PLIST_FILES= bin/ldvd bin/ldvd-ls etc/ldvd.conf.sample \
diff --git a/multimedia/qdvdauthor/Makefile b/multimedia/qdvdauthor/Makefile
index fe655dce0e16..78f6e427af42 100644
--- a/multimedia/qdvdauthor/Makefile
+++ b/multimedia/qdvdauthor/Makefile
@@ -80,7 +80,7 @@ RUN_DEPENDS+= pngtopnm:${PORTSDIR}/graphics/netpbm
RUN_DEPENDS+= mpeg2enc:${PORTSDIR}/multimedia/mjpegtools
.endif
.if !defined(WITHOUT_CDRTOOLS)
-RUN_DEPENDS+= mkisofs:${PORTSDIR}/sysutils/cdrtools
+USE_CDRTOOLS= yes
.endif
.if defined(WITH_DVDRWTOOLS)
RUN_DEPENDS+= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
diff --git a/multimedia/tovid/Makefile b/multimedia/tovid/Makefile
index e75595178133..7c1173899543 100644
--- a/multimedia/tovid/Makefile
+++ b/multimedia/tovid/Makefile
@@ -33,7 +33,6 @@ BUILD_DEPENDS= \
tcrequant:${PORTSDIR}/multimedia/transcode \
vcdxbuild:${PORTSDIR}/multimedia/vcdimager \
cdrdao:${PORTSDIR}/sysutils/cdrdao \
- mkisofs:${PORTSDIR}/sysutils/cdrtools \
growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
RUN_DEPENDS= \
${BUILD_DEPENDS} \
@@ -41,6 +40,7 @@ RUN_DEPENDS= \
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+USE_CDRTOOLS= yes
USE_WX= 2.6
WX_COMPS= python
GNU_CONFIGURE= yes
diff --git a/sysutils/cdbakeoven/Makefile b/sysutils/cdbakeoven/Makefile
index 70e822f02740..0555b7de73d9 100644
--- a/sysutils/cdbakeoven/Makefile
+++ b/sysutils/cdbakeoven/Makefile
@@ -15,11 +15,11 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= lofi@freebsd.org
COMMENT= KDE frontend for cdrecord and mkisofs/mkhybrid
-RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools \
- mpg123:${PORTSDIR}/audio/mpg123 \
+RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 \
ogg123:${PORTSDIR}/audio/vorbis-tools
USE_BZIP2= yes
+USE_CDRTOOLS= yes
USE_KDEBASE_VER=3
USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
diff --git a/sysutils/cdbkup/Makefile b/sysutils/cdbkup/Makefile
index 1f9a18e0864f..2c08796c76ad 100644
--- a/sysutils/cdbkup/Makefile
+++ b/sysutils/cdbkup/Makefile
@@ -16,15 +16,14 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}-1
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple but full-featured backup/restore perl scripts (uses gnu tar)
-BUILD_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools \
- ${LOCALBASE}/sbin/eject:${PORTSDIR}/sysutils/eject
-RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools \
- ${LOCALBASE}/sbin/eject:${PORTSDIR}/sysutils/eject
+BUILD_DEPENDS= ${LOCALBASE}/sbin/eject:${PORTSDIR}/sysutils/eject
+RUN_DEPENDS= ${LOCALBASE}/sbin/eject:${PORTSDIR}/sysutils/eject
WRKSRC= ${WRKDIR}/${PORTNAME}
GNU_CONFIGURE= yes
USE_PERL5= yes
+USE_CDRTOOLS= yes
CONFIGURE_ENV+= PATH=${PATH}:${LOCALBASE}/sbin
MAN1= cdbkup.1 cdappend.1 cdcat.1 cdrstr.1 cdsplit.1
diff --git a/sysutils/dvd+rw-tools/Makefile b/sysutils/dvd+rw-tools/Makefile
index 0905c73aae18..bbf990b5761d 100644
--- a/sysutils/dvd+rw-tools/Makefile
+++ b/sysutils/dvd+rw-tools/Makefile
@@ -13,7 +13,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/cdrtools
+USE_CDRTOOLS= yes
MAN1= growisofs.1
BIN_FILES= growisofs dvd+rw-format dvd+rw-booktype dvd+rw-mediainfo dvd-ram-control
diff --git a/sysutils/eroaster/Makefile b/sysutils/eroaster/Makefile
index 707d8fb68f73..1f77cd9f7bfe 100644
--- a/sysutils/eroaster/Makefile
+++ b/sysutils/eroaster/Makefile
@@ -16,8 +16,7 @@ DISTNAME= ${PORTNAME}-2.2.0-0.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 \
- cdrecord:${PORTSDIR}/sysutils/cdrtools
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gnome/_gnome.so:${PORTSDIR}/x11-toolkits/py-gnome2
.if defined(WITH_ADDITIONAL_PROGRAMS)
BUILD_DEPENDS+= bchunk:${PORTSDIR}/sysutils/bchunk \
@@ -32,6 +31,7 @@ BUILD_DEPENDS+= bchunk:${PORTSDIR}/sysutils/bchunk \
GNU_CONFIGURE= yes
USE_PYTHON= yes
+USE_CDRTOOLS= yes
pre-everything::
@${ECHO_MSG} "===> You can enable more features by defining WITH_ADDITIONAL_PROGRAMS"
diff --git a/sysutils/freesbie/Makefile b/sysutils/freesbie/Makefile
index e5434cf8f563..82863d43ef76 100644
--- a/sysutils/freesbie/Makefile
+++ b/sysutils/freesbie/Makefile
@@ -14,9 +14,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/2.0.//}
MAINTAINER= riggs@rrr.de
COMMENT= Yet another cool answer to the system-on-cd question
-RUN_DEPENDS= mkisofs:${PORTSDIR}/sysutils/cdrtools
-
USE_BZIP2= yes
+USE_CDRTOOLS= yes
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME}2
diff --git a/sysutils/gcombust/Makefile b/sysutils/gcombust/Makefile
index 5f70c4b19dca..14d4cbe02ca4 100644
--- a/sysutils/gcombust/Makefile
+++ b/sysutils/gcombust/Makefile
@@ -14,13 +14,13 @@ MASTER_SITES= http://www.abo.fi/~jmunsin/gcombust/
MAINTAINER= mcdouga9@msu.edu
COMMENT= A GTK+ frontend for mkisofs and cdrecord
-RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools \
- cdlabelgen:${PORTSDIR}/print/cdlabelgen
+RUN_DEPENDS= cdlabelgen:${PORTSDIR}/print/cdlabelgen
USE_GETTEXT= yes
USE_X_PREFIX= yes
USE_PERL5_BUILD=yes
USE_GNOME= gtk12 gnomehier
+USE_CDRTOOLS= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--without-included-gettext --datadir=${PREFIX}/share
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/sysutils/gnomebaker/Makefile b/sysutils/gnomebaker/Makefile
index d1337f7c2985..189626a4621f 100644
--- a/sysutils/gnomebaker/Makefile
+++ b/sysutils/gnomebaker/Makefile
@@ -19,6 +19,7 @@ OPTIONS= DVD "Enable DVD support" off \
USE_XLIB= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui desktopfileutils
+USE_CDRTOOLS= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
INSTALLS_OMF= yes
@@ -32,12 +33,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
RUN_DEPENDS+= cdrdao:${PORTSDIR}/sysutils/cdrdao
-.if defined(WITH_CJK)
-RUN_DEPENDS+= cdrecord:${PORTSDIR}/sysutils/cdrtools-cjk
-.else
-RUN_DEPENDS+= cdrecord:${PORTSDIR}/sysutils/cdrtools
-.endif
-
.if defined(WITH_DVD)
RUN_DEPENDS+= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
.endif
diff --git a/sysutils/gtoaster/Makefile b/sysutils/gtoaster/Makefile
index c5260f3c19c4..fed7570b68c4 100644
--- a/sysutils/gtoaster/Makefile
+++ b/sysutils/gtoaster/Makefile
@@ -17,8 +17,6 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= Graphical cd cooking interface
-RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools
-
WRKSRC= ${WRKDIR}/${PORTNAME}
PLIST_FILES= bin/gtoaster
@@ -27,6 +25,7 @@ USE_X_PREFIX= yes
WANT_GNOME= yes
USE_GNOME= gnomehack gnometarget gtk12
USE_GMAKE= yes
+USE_CDRTOOLS= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index c6be8dc02f0a..d38c80350ba7 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -18,8 +18,8 @@ COMMENT?= Hardware Abstraction Layer for simplifying device access
.if !defined(HAL_SLAVE)
LIB_DEPENDS= polkit.0:${PORTSDIR}/sysutils/policykit \
volume_id.0:${PORTSDIR}/devel/libvolume_id
-RUN_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids \
- isoinfo:${PORTSDIR}/sysutils/cdrtools
+RUN_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids
+USE_CDRTOOLS= yes
.endif
USE_BZIP2= yes
diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile
index 2484a980a650..161d7dbd89d6 100644
--- a/sysutils/k3b-kde4/Makefile
+++ b/sysutils/k3b-kde4/Makefile
@@ -14,8 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= h.eichmann@gmx.de
COMMENT= A CD/DVD recording GUI for KDE
-RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools \
- cdrdao:${PORTSDIR}/sysutils/cdrdao
+RUN_DEPENDS= cdrdao:${PORTSDIR}/sysutils/cdrdao
LIB_DEPENDS= tag:${PORTSDIR}/audio/taglib \
dvdcss:${PORTSDIR}/multimedia/libdvdcss \
samplerate:${PORTSDIR}/audio/libsamplerate
@@ -25,6 +24,7 @@ USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-k3bsetup=no --without-resmgr --without-hal
USE_GMAKE= yes
+USE_CDRTOOLS= yes
USE_LDCONFIG= yes
LDCONFIG_DIRS= %%PREFIX%%/lib %%PREFIX%%/lib/kde3
USE_KDELIBS_VER= 3
diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index 2484a980a650..161d7dbd89d6 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -14,8 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= h.eichmann@gmx.de
COMMENT= A CD/DVD recording GUI for KDE
-RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools \
- cdrdao:${PORTSDIR}/sysutils/cdrdao
+RUN_DEPENDS= cdrdao:${PORTSDIR}/sysutils/cdrdao
LIB_DEPENDS= tag:${PORTSDIR}/audio/taglib \
dvdcss:${PORTSDIR}/multimedia/libdvdcss \
samplerate:${PORTSDIR}/audio/libsamplerate
@@ -25,6 +24,7 @@ USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-k3bsetup=no --without-resmgr --without-hal
USE_GMAKE= yes
+USE_CDRTOOLS= yes
USE_LDCONFIG= yes
LDCONFIG_DIRS= %%PREFIX%%/lib %%PREFIX%%/lib/kde3
USE_KDELIBS_VER= 3
diff --git a/sysutils/livecd/Makefile b/sysutils/livecd/Makefile
index 9a1d246bb9f9..d72e850eedad 100644
--- a/sysutils/livecd/Makefile
+++ b/sysutils/livecd/Makefile
@@ -14,9 +14,8 @@ 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/cdrtools
-
NO_BUILD= yes
+USE_CDRTOOLS= yes
MAKE_ENV= INSTALL_DATA="${INSTALL_DATA}" \
INSTALL_SCRIPT="${INSTALL_SCRIPT}"
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 823d13d436ea..b5d283d87451 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -25,6 +25,7 @@ USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomeprefix gnomehack intlhack nautilus2 ltverhack \
desktopfileutils
+USE_CDRTOOLS= yes
INSTALLS_ICONS= yes
USE_AUTOTOOLS= libtool:15
USE_LDCONFIG= yes
@@ -40,10 +41,7 @@ OPTIONS= DVD "Enable DVD support" on \
.include <bsd.port.pre.mk>
.if defined(WITH_CJK)
-RUN_DEPENDS+= cdrecord:${PORTSDIR}/sysutils/cdrtools-cjk
WITHOUT_DVD= yes
-.else
-RUN_DEPENDS+= cdrecord:${PORTSDIR}/sysutils/cdrtools
.endif
.if !defined(WITHOUT_DVD)
diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index 47811083cdcc..4ba24892af82 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -19,8 +19,6 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:src new_configure.tar.gz:patch
MAINTAINER= oliver@FreeBSD.org
COMMENT= Another X11 frontend to mkisofs/cdrecord
-RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools
-
OPTIONS= GTK2 "Enable GTK2 support" off \
NONROOT "Use xcdroast w/o being root" off \
NLS "Native language support" on
@@ -28,6 +26,7 @@ OPTIONS= GTK2 "Enable GTK2 support" off \
USE_X_PREFIX= yes
USE_GETTEXT= yes
USE_ICONV= yes
+USE_CDRTOOLS= yes
GNU_CONFIGURE= yes
WANT_GNOME= yes