Remove USE_CDRTOOLS from bsd.port.mk

This macros has been useless since cdrtools-cjk port has gone.
This macros also lead to badly handled dependencies assuming that the dependency
on cdrtools was most BUILD and RUN dependency. While most of the time it is
simply a RUN dependency and sometime a build one.

While here:
- Trim some headers
- Convert some ports to optionsng
- Convert some ports to USES= gettext

8 files changed, 33 insertions, 44 deletions

diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile
index 657bd30a4573..5d8e6128dd61 100644
--- a/audio/abcde/Makefile
+++ b/audio/abcde/Makefile
@@ -33,7 +33,7 @@ REPLAYGAIN_DESC?=	Enable (vorbis|mp3)gain support
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCDDA2WAV}
-USE_CDRTOOLS=	yes
+RUN_DEPENDS+=	cdda2wav:${PORTSDIR}/sysutils/cdrtools
 .endif
 
 .if ${PORT_OPTIONS:MDAGRAB}
diff --git a/audio/atunes/Makefile b/audio/atunes/Makefile
index 08bdca7b80d3..2e1b3298f5e2 100644
--- a/audio/atunes/Makefile
+++ b/audio/atunes/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	atunes
-# Date Created:		29 Dec 2007
-# Whom:			Lars Engels <lme@FreeBSD.org>
-#
+# Created by: Lars Engels <lme@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	atunes
 PORTVERSION=	3.0.3
@@ -49,7 +45,7 @@ LIB_DEPENDS+=	xine:${PORTSDIR}/multimedia/libxine
 .endif
 
 .if ${PORT_OPTIONS:MCDDA2WAV}
-USE_CDRTOOLS=	yes
+RUN_DEPENDS+=	cdda2wav:${PORTSDIR}/sysutils/cdrtools
 .endif
 
 .if ${PORT_OPTIONS:MLAME}
diff --git a/audio/cripple/Makefile b/audio/cripple/Makefile
index b66329c7989e..b5ec50572714 100644
--- a/audio/cripple/Makefile
+++ b/audio/cripple/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	cripple
-# Date created:		2007-10-15
-# Whom:			Martin Wilke <miwi@FreeBSD.org>
-#
+# Created by: Martin Wilke <miwi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	cripple
 PORTVERSION=	0.06b
@@ -16,12 +12,12 @@ COMMENT=	Command line CD ripper/encoder wrapper with cddb support
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_CDRTOOLS=	yes
 MAKE_JOBS_SAFE=	yes
 
 LIB_DEPENDS+=	cdio.13:${PORTSDIR}/sysutils/libcdio
 RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame\
-		cdparanoia:${PORTSDIR}/audio/cdparanoia
+		cdparanoia:${PORTSDIR}/audio/cdparanoia \
+		cdda2wav:${PORTSDIR}/sysutils/cdrtools
 
 MAN1=		cripple.1
 
diff --git a/audio/gnormalize/Makefile b/audio/gnormalize/Makefile
index 6215780386ec..876b55d802c7 100644
--- a/audio/gnormalize/Makefile
+++ b/audio/gnormalize/Makefile
@@ -1,5 +1,4 @@
 # Created by: Denise H. G. <darcsis@gmail.com>
-#
 # $FreeBSD$
 
 PORTNAME=	gnormalize
@@ -44,7 +43,7 @@ RUN_DEPENDS+=	faac:${PORTSDIR}/audio/faac \
 .endif
 
 .if ${PORT_OPTIONS:MCDPARANOIA} || ${PORT_OPTIONS:MCDDA2WAV}
-USE_CDRTOOLS=	yes
+RUN_DEPENDS+=	cdda2wav:${PORTSDIR}/sysutils/cdrtools
 .else
 RUN_DEPENDS+=	cdparanoia:${PORTSDIR}/audio/cdparanoia
 .endif
diff --git a/audio/grip/Makefile b/audio/grip/Makefile
index 7d285081c66e..0e8ef304f11a 100644
--- a/audio/grip/Makefile
+++ b/audio/grip/Makefile
@@ -22,7 +22,7 @@ USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	CDPARANOIA CDDA2WAV LAME VORBIS FAAC FLAC
+OPTIONS_DEFINE=	CDPARANOIA CDDA2WAV LAME VORBIS FAAC FLAC NLS
 OPTIONS_DEFAULT=	CDPARANOIA VORBIS
 
 .if !defined(PACKAGE_BUILDING)
@@ -45,7 +45,7 @@ CONFIGURE_ARGS+=	--disable-cdpar
 .endif
 
 .if ${PORT_OPTIONS:MCDDA2WAV}
-USE_CDRTOOLS=	yes
+RUN_DEPENDS+=	cdda2wav:${PORTSDIR}/sysutils/cdrtools
 .endif
 
 .if ${PORT_OPTIONS:MFAAC}
@@ -64,9 +64,9 @@ RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame
 RUN_DEPENDS+=	ogg123:${PORTSDIR}/audio/vorbis-tools
 .endif
 
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=		yes
-PLIST_SUB+=		NLS=""
+.if ${PORT_OPTIONS:MNLS}
+USES+=	gettext
+PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		NLS="@comment "
diff --git a/audio/mp3burn/Makefile b/audio/mp3burn/Makefile
index b87abeb33c5c..587a56903c0f 100644
--- a/audio/mp3burn/Makefile
+++ b/audio/mp3burn/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	mp3burn
-# Date created:				17th December 2003
-# Whom:					Vincent Tantardini <vinc@FreeBSD-fr.org>
-#
+# Created by: Vincent Tantardini <vinc@FreeBSD-fr.org>
 # $FreeBSD$
 
 PORTNAME=	mp3burn
@@ -17,13 +14,13 @@ RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123 \
 		ogg123:${PORTSDIR}/audio/vorbis-tools \
 		p5-MP3-Info>=0:${PORTSDIR}/audio/p5-MP3-Info \
 		p5-Ogg-Vorbis-Header>=0:${PORTSDIR}/audio/p5-Ogg-Vorbis-Header \
-		p5-String-ShellQuote>=0:${PORTSDIR}/textproc/p5-String-ShellQuote
+		p5-String-ShellQuote>=0:${PORTSDIR}/textproc/p5-String-ShellQuote \
+		cdda2wav:${PORTSDIR}/sysutils/cdrtools
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_BZIP2=	yes
 USE_PERL5=	yes
-USE_CDRTOOLS=	yes
 NO_BUILD=	yes
 
 PLIST_FILES=	bin/mp3burn
diff --git a/audio/mp3c/Makefile b/audio/mp3c/Makefile
index 5f01bcf01e81..30cd3c251324 100644
--- a/audio/mp3c/Makefile
+++ b/audio/mp3c/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mp3c
-# Date created:				11 Jul 2002
-# Whom:					Joris Vandalon <joris@vandalon.nl>
-#
+# Created by: Joris Vandalon <joris@vandalon.nl>
 # $FreeBSD$
-#
 
 PORTNAME=	mp3c
 PORTVERSION=	0.31
@@ -17,21 +13,23 @@ EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 MAINTAINER=	joris@vandalon.nl
 COMMENT=	A CD to mp3c converter with a console frontend
 
-RUN_DEPENDS=	mp3info:${PORTSDIR}/audio/mp3info
+RUN_DEPENDS=	mp3info:${PORTSDIR}/audio/mp3info \
+		cdrecord:${PORTSDIR}/sysutils/cdrtools
 
-USE_CDRTOOLS=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=${PREFIX}"
 
 MAN1=		mp3c.1
 MANCOMPRESSED=	no
 
-.if defined(WITHOUT_NLS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
+USES+=		gettext
+PLIST_SUB+=		NLS=""
+.else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		NLS="@comment "
-.else
-USES=		gettext
-PLIST_SUB+=		NLS=""
 .endif
 
 post-patch:
diff --git a/audio/prokyon3/Makefile b/audio/prokyon3/Makefile
index 3256ebb05aac..d4d978f6f814 100644
--- a/audio/prokyon3/Makefile
+++ b/audio/prokyon3/Makefile
@@ -21,6 +21,9 @@ RUN_DEPENDS=	${LOCALBASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/dat
 DEPRECATED=	Depends on Qt3; unmaintained
 EXPIRATION_DATE=	2013-07-01
 
+OPTIONS_DEFINE=	BURN
+BURN_DESC=	CD/DVD burning support
+
 USE_XORG=	x11 xft
 USE_QT_VER=	3
 USE_MYSQL=	yes
@@ -34,14 +37,14 @@ CONFIGURE_ARGS=	--with-other-includes=${LOCALBASE}/include \
 		--without-musicbrainz
 MAKE_ARGS=	LIBS="-lqt-mt ${PTHREAD_LIBS}"
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_BURN)
-USE_CDRTOOLS=	yes
+.if ${PORT_OPTIONS:MBURN}
 RUN_DEPENDS+=	mpg123:${PORTSDIR}/audio/mpg123 \
 		ogg123:${PORTSDIR}/audio/vorbis-tools \
 		normalize:${PORTSDIR}/audio/normalize \
-		bash:${PORTSDIR}/shells/bash
+		bash:${PORTSDIR}/shells/bash \
+		cdrecord:${PORTSDIR}/sysutils/cdrtools
 PLIST_SUB+=	BURN=""
 .else
 PLIST_SUB+=	BURN="@comment "
@@ -60,11 +63,11 @@ post-patch:
 		's|getopt.$$(OBJEXT)||g' ${WRKSRC}/src/Makefile.in
 
 post-install:
-.if defined(WITH_BURN)
+.if ${PORT_OPTIONS:MBURN}
 	${INSTALL_SCRIPT} ${WRKSRC}/prokburn ${PREFIX}/bin
 .endif
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>