- Add OPTIONal RUN_DEPENDS that where mentioned in pkg-message; default them to

off with the exception of dvd+rw tools since DVDs are used more that CDs these
days.
- bump PORTREVISION for DEPENDS change.

PR:		ports/117450
Submitted by:	Artem Naluzhnyy
Approved by:	Heiner (maintainer)

4 files changed, 64 insertions, 18 deletions

diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile
index 6245fe7102f5..74363aaee2a0 100644
--- a/sysutils/k3b-kde4/Makefile
+++ b/sysutils/k3b-kde4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	k3b
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	sysutils multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -35,7 +36,13 @@ OPTIONS=	FLAC "Add audio/flac decoder" On \
 		FFMPEG "Add multimedia/ffmpeg decoder (for wma files)" Off \
 		MUSICBRAINZ "Use audio/libmusicbrainz music meta database" Off \
 		MPC "Add audio/libmpcdec decoder (for musepack file)" Off \
-		LIBDVDREAD "Use libdvdread (for video dvd ripping)" On
+		LIBDVDREAD "Use libdvdread (for video dvd ripping)" On \
+		DVDPLUSRW "Add DVD+RW Tools (for DVD+/-R(W) burning)" On \
+		TRANSCODE "Add Transcode (for DVD ripping)" Off \
+		EMOVIX "Add eMovix (to burn bootable video CD)" Off \
+		NORMALIZE "Add Normalize (adjust audio to a std. level)" Off \
+		SOX "Add SoX (more audio encoding formats)" Off \
+		VCDIMAGER "Add VCDImager (for Video CD burning)" Off
 
 pre-configure:
 	${RM} ${WRKSRC}/admin/cvs.sh
@@ -98,4 +105,28 @@ PLIST_SUB+=	LIBDVDREAD="@comment "
 CONFIGURE_ARGS+=	--without-libdvdread
 .endif
 
+.if !defined (WITHOUT_DVDPLUSRW)
+RUN_DEPENDS+=	dvd+rw-format:${PORTSDIR}/sysutils/dvd+rw-tools
+.endif
+
+.if defined (WITH_TRANSCODE)
+RUN_DEPENDS+=	transcode:${PORTSDIR}/multimedia/transcode
+.endif
+
+.if defined (WITH_EMOVIX)
+RUN_DEPENDS+=	mkmovixiso:${PORTSDIR}/multimedia/emovix
+.endif
+
+.if defined (WITH_NORMALIZE)
+RUN_DEPENDS+=	normalize:${PORTSDIR}/audio/normalize
+.endif
+
+.if defined (WITH_SOX)
+RUN_DEPENDS+=	sox:${PORTSDIR}/audio/sox
+.endif
+
+.if defined (WITH_VCDIMAGER)
+RUN_DEPENDS+=   vcdxrip:${PORTSDIR}/multimedia/vcdimager
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/sysutils/k3b-kde4/pkg-message b/sysutils/k3b-kde4/pkg-message
index 7bb969a092f1..3c5a6df33c09 100644
--- a/sysutils/k3b-kde4/pkg-message
+++ b/sysutils/k3b-kde4/pkg-message
@@ -49,13 +49,5 @@ Notes for FreeBSD 5.x and onwards users:
    recorder click on the string "auto" behind "Cdrdao driver:" For most of the 
    recent drives "generic-mmc" or "generic-mmc-raw" should work. 
    See http://cdrdao.sourceforge.net/drives.html.
-7. To burn video CDs install the port multimedia/vcdimager.
-8. To rip DVDs additionally install the ports multimedia/transcode,
-   multimedia/libdvdread and multimedia/xvid.The ripping process itself is described 
-   in http://k3b.plainblack.com/videoencoding.
-9. To burn bootable video CDs, install the port multimedia/emovix.
-10. To burn DVDs, install the port sysutils/dvd+rw-tools.
-11. To normalize the volumes of audio cds, install the port audio/normalize.
-12. To rip into more audio formats, install the port audio/sox.
 
 To read this instructions again, type 'make showinfo' in the k3b port directory
diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index 6245fe7102f5..74363aaee2a0 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	k3b
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	sysutils multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -35,7 +36,13 @@ OPTIONS=	FLAC "Add audio/flac decoder" On \
 		FFMPEG "Add multimedia/ffmpeg decoder (for wma files)" Off \
 		MUSICBRAINZ "Use audio/libmusicbrainz music meta database" Off \
 		MPC "Add audio/libmpcdec decoder (for musepack file)" Off \
-		LIBDVDREAD "Use libdvdread (for video dvd ripping)" On
+		LIBDVDREAD "Use libdvdread (for video dvd ripping)" On \
+		DVDPLUSRW "Add DVD+RW Tools (for DVD+/-R(W) burning)" On \
+		TRANSCODE "Add Transcode (for DVD ripping)" Off \
+		EMOVIX "Add eMovix (to burn bootable video CD)" Off \
+		NORMALIZE "Add Normalize (adjust audio to a std. level)" Off \
+		SOX "Add SoX (more audio encoding formats)" Off \
+		VCDIMAGER "Add VCDImager (for Video CD burning)" Off
 
 pre-configure:
 	${RM} ${WRKSRC}/admin/cvs.sh
@@ -98,4 +105,28 @@ PLIST_SUB+=	LIBDVDREAD="@comment "
 CONFIGURE_ARGS+=	--without-libdvdread
 .endif
 
+.if !defined (WITHOUT_DVDPLUSRW)
+RUN_DEPENDS+=	dvd+rw-format:${PORTSDIR}/sysutils/dvd+rw-tools
+.endif
+
+.if defined (WITH_TRANSCODE)
+RUN_DEPENDS+=	transcode:${PORTSDIR}/multimedia/transcode
+.endif
+
+.if defined (WITH_EMOVIX)
+RUN_DEPENDS+=	mkmovixiso:${PORTSDIR}/multimedia/emovix
+.endif
+
+.if defined (WITH_NORMALIZE)
+RUN_DEPENDS+=	normalize:${PORTSDIR}/audio/normalize
+.endif
+
+.if defined (WITH_SOX)
+RUN_DEPENDS+=	sox:${PORTSDIR}/audio/sox
+.endif
+
+.if defined (WITH_VCDIMAGER)
+RUN_DEPENDS+=   vcdxrip:${PORTSDIR}/multimedia/vcdimager
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/sysutils/k3b/pkg-message b/sysutils/k3b/pkg-message
index 7bb969a092f1..3c5a6df33c09 100644
--- a/sysutils/k3b/pkg-message
+++ b/sysutils/k3b/pkg-message
@@ -49,13 +49,5 @@ Notes for FreeBSD 5.x and onwards users:
    recorder click on the string "auto" behind "Cdrdao driver:" For most of the 
    recent drives "generic-mmc" or "generic-mmc-raw" should work. 
    See http://cdrdao.sourceforge.net/drives.html.
-7. To burn video CDs install the port multimedia/vcdimager.
-8. To rip DVDs additionally install the ports multimedia/transcode,
-   multimedia/libdvdread and multimedia/xvid.The ripping process itself is described 
-   in http://k3b.plainblack.com/videoencoding.
-9. To burn bootable video CDs, install the port multimedia/emovix.
-10. To burn DVDs, install the port sysutils/dvd+rw-tools.
-11. To normalize the volumes of audio cds, install the port audio/normalize.
-12. To rip into more audio formats, install the port audio/sox.
 
 To read this instructions again, type 'make showinfo' in the k3b port directory