svn commit: r316600 - in head: . Mk audio/abcde audio/atunes audio/cripple audio/gnormalize audio/grip audio/mp3burn audio/mp3c audio/prokyon3 emulators/virtualbox-ose emulators/virtualbox-ose-lega...

Fri Apr 26 12:35:57 UTC 2013

Author: bapt
Date: Fri Apr 26 12:35:50 2013
New Revision: 316600
URL: http://svnweb.freebsd.org/changeset/ports/316600

Log:
  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

Modified:
  head/CHANGES
  head/Mk/bsd.port.mk
  head/audio/abcde/Makefile
  head/audio/atunes/Makefile
  head/audio/cripple/Makefile
  head/audio/gnormalize/Makefile
  head/audio/grip/Makefile
  head/audio/mp3burn/Makefile
  head/audio/mp3c/Makefile
  head/audio/prokyon3/Makefile
  head/emulators/virtualbox-ose-legacy/Makefile
  head/emulators/virtualbox-ose/Makefile
  head/games/kevedit/Makefile
  head/misc/lesspipe/Makefile
  head/multimedia/2mandvd/Makefile
  head/multimedia/devede/Makefile
  head/multimedia/dvd-slideshow/Makefile
  head/multimedia/dvdrip/Makefile
  head/multimedia/dvdstyler/Makefile
  head/multimedia/kdenlive/Makefile
  head/multimedia/lives/Makefile
  head/multimedia/qdvdauthor/Makefile
  head/multimedia/tovid/Makefile
  head/net/gpxe/Makefile
  head/sysutils/bashburn/Makefile
  head/sysutils/burn/Makefile
  head/sysutils/cdbkup/Makefile
  head/sysutils/dvd+rw-tools/Makefile
  head/sysutils/eroaster/Makefile
  head/sysutils/freesbie/Makefile
  head/sysutils/gcombust/Makefile
  head/sysutils/gnomebaker/Makefile
  head/sysutils/graveman/Makefile
  head/sysutils/k3b-kde4/Makefile
  head/sysutils/k3b/Makefile
  head/sysutils/livecd/Makefile
  head/sysutils/memtest86+/Makefile
  head/sysutils/mybashburn/Makefile
  head/sysutils/nautilus-cd-burner/Makefile
  head/sysutils/tkdvd/Makefile
  head/sysutils/xcdroast/Makefile
  head/sysutils/xfburn/Makefile

Modified: head/CHANGES
==============================================================================

--- head/CHANGES	Fri Apr 26 12:31:01 2013	(r316599)
+++ head/CHANGES	Fri Apr 26 12:35:50 2013	(r316600)
@@ -13,6 +13,7 @@ All ports committers are allowed to comm
 20130425:
 AUTHOR: bapt at FreeBSD.org
 
+  * USE_CDRTOOLS is no longer recognized
   * USE_FREETYPE is no longer recognized
 
 20130423:

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Fri Apr 26 12:31:01 2013	(r316599)
+++ head/Mk/bsd.port.mk	Fri Apr 26 12:35:50 2013	(r316600)
@@ -524,8 +524,6 @@ FreeBSD_MAINTAINER=	portmgr at FreeBSD.org
 ##
 # USE_APACHE	- If set, this port relies on an apache webserver.
 #
-# USE_CDRTOOLS	- If set, this port depends on sysutils/cdrtools.
-#
 # USE_NCURSES	- If set, this port relies on the ncurses package.
 #
 # Conflict checking.  Use if your port cannot be installed at the same time as
@@ -2140,12 +2138,6 @@ BUILD_DEPENDS+=	gs:${PORTSDIR}/${GHOSTSC
 RUN_DEPENDS+=	gs:${PORTSDIR}/${GHOSTSCRIPT_PORT}
 .endif
 
-# Set up the cdrtools.
-.if defined(USE_CDRTOOLS)
-BUILD_DEPENDS+=	cdrecord:${PORTSDIR}/sysutils/cdrtools
-RUN_DEPENDS+=	cdrecord:${PORTSDIR}/sysutils/cdrtools
-.endif
-
 # Macro for doing in-place file editing using regexps
 REINPLACE_ARGS?=	-i.bak
 REINPLACE_CMD?=	${SED} ${REINPLACE_ARGS}

Modified: head/audio/abcde/Makefile
==============================================================================
--- head/audio/abcde/Makefile	Fri Apr 26 12:31:01 2013	(r316599)
+++ head/audio/abcde/Makefile	Fri Apr 26 12:35:50 2013	(r316600)
@@ -33,7 +33,7 @@ REPLAYGAIN_DESC?=	Enable (vorbis|mp3)gai
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCDDA2WAV}
-USE_CDRTOOLS=	yes
+RUN_DEPENDS+=	cdda2wav:${PORTSDIR}/sysutils/cdrtools
 .endif
 
 .if ${PORT_OPTIONS:MDAGRAB}

Modified: head/audio/atunes/Makefile
==============================================================================
--- head/audio/atunes/Makefile	Fri Apr 26 12:31:01 2013	(r316599)
+++ head/audio/atunes/Makefile	Fri Apr 26 12:35:50 2013	(r316600)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	atunes
-# Date Created:		29 Dec 2007
-# Whom:			Lars Engels <lme at FreeBSD.org>
-#
+# Created by: Lars Engels <lme at FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	atunes
 PORTVERSION=	3.0.3
@@ -49,7 +45,7 @@ LIB_DEPENDS+=	xine:${PORTSDIR}/multimedi
 .endif
 
 .if ${PORT_OPTIONS:MCDDA2WAV}
-USE_CDRTOOLS=	yes
+RUN_DEPENDS+=	cdda2wav:${PORTSDIR}/sysutils/cdrtools
 .endif
 
 .if ${PORT_OPTIONS:MLAME}

Modified: head/audio/cripple/Makefile
==============================================================================
--- head/audio/cripple/Makefile	Fri Apr 26 12:31:01 2013	(r316599)
+++ head/audio/cripple/Makefile	Fri Apr 26 12:35:50 2013	(r316600)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	cripple
-# Date created:		2007-10-15
-# Whom:			Martin Wilke <miwi at FreeBSD.org>
-#
+# Created by: Martin Wilke <miwi at FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	cripple
 PORTVERSION=	0.06b
@@ -16,12 +12,12 @@ COMMENT=	Command line CD ripper/encoder 
 
 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
 

Modified: head/audio/gnormalize/Makefile
==============================================================================
--- head/audio/gnormalize/Makefile	Fri Apr 26 12:31:01 2013	(r316599)
+++ head/audio/gnormalize/Makefile	Fri Apr 26 12:35:50 2013	(r316600)
@@ -1,5 +1,4 @@
 # Created by: Denise H. G. <darcsis at gmail.com>
-#
 # $FreeBSD$
 
 PORTNAME=	gnormalize
@@ -44,7 +43,7 @@ RUN_DEPENDS+=	faac:${PORTSDIR}/audio/faa
 .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

Modified: head/audio/grip/Makefile
==============================================================================
--- head/audio/grip/Makefile	Fri Apr 26 12:31:01 2013	(r316599)
+++ head/audio/grip/Makefile	Fri Apr 26 12:35:50 2013	(r316600)
@@ -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/lam
 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 "

Modified: head/audio/mp3burn/Makefile
==============================================================================
--- head/audio/mp3burn/Makefile	Fri Apr 26 12:31:01 2013	(r316599)
+++ head/audio/mp3burn/Makefile	Fri Apr 26 12:35:50 2013	(r316600)
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	mp3burn
-# Date created:				17th December 2003
-# Whom:					Vincent Tantardini <vinc at FreeBSD-fr.org>
-#
+# Created by: Vincent Tantardini <vinc at FreeBSD-fr.org>
 # $FreeBSD$
 
 PORTNAME=	mp3burn
@@ -17,13 +14,13 @@ RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mp
 		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

Modified: head/audio/mp3c/Makefile
==============================================================================
--- head/audio/mp3c/Makefile	Fri Apr 26 12:31:01 2013	(r316599)
+++ head/audio/mp3c/Makefile	Fri Apr 26 12:35:50 2013	(r316600)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mp3c
-# Date created:				11 Jul 2002
-# Whom:					Joris Vandalon <joris at vandalon.nl>
-#
+# Created by: Joris Vandalon <joris at vandalon.nl>
 # $FreeBSD$
-#
 
 PORTNAME=	mp3c
 PORTVERSION=	0.31
@@ -17,21 +13,23 @@ EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	joris at 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:

Modified: head/audio/prokyon3/Makefile
==============================================================================
--- head/audio/prokyon3/Makefile	Fri Apr 26 12:31:01 2013	(r316599)
+++ head/audio/prokyon3/Makefile	Fri Apr 26 12:35:50 2013	(r316600)
@@ -21,6 +21,9 @@ RUN_DEPENDS=	${LOCALBASE}/lib/plugins/sq
 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=${
 		--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>

Modified: head/emulators/virtualbox-ose-legacy/Makefile
==============================================================================
--- head/emulators/virtualbox-ose-legacy/Makefile	Fri Apr 26 12:31:01 2013	(r316599)
+++ head/emulators/virtualbox-ose-legacy/Makefile	Fri Apr 26 12:35:50 2013	(r316600)
@@ -23,16 +23,17 @@ BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/ya
 		as86:${PORTSDIR}/devel/dev86 \
 		xsltproc:${PORTSDIR}/textproc/libxslt \
 		kmk:${PORTSDIR}/devel/kBuild \
-		gtar:${PORTSDIR}/archivers/gtar
+		gtar:${PORTSDIR}/archivers/gtar \
+		cdrecord:${PORTSDIR}/sysutils/cdrtools
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		xslt.2:${PORTSDIR}/textproc/libxslt \
 		curl.6:${PORTSDIR}/ftp/curl
-RUN_DEPENDS=	/boot/modules/vboxdrv.ko:${PORTSDIR}/emulators/virtualbox-ose-kmod-legacy
+RUN_DEPENDS=	/boot/modules/vboxdrv.ko:${PORTSDIR}/emulators/virtualbox-ose-kmod-legacy \
+		cdrecord:${PORTSDIR}/sysutils/cdrtools
 
 WRKSRC=		${WRKDIR}/VirtualBox-${PORTVERSION}
 ONLY_FOR_ARCHS=	i386 amd64
 FETCH_ARGS=	-pRr
-USE_CDRTOOLS=	yes
 USE_GCC=	any
 USE_GNOME=	libidl
 USE_BZIP2=	yes

Modified: head/emulators/virtualbox-ose/Makefile
==============================================================================
--- head/emulators/virtualbox-ose/Makefile	Fri Apr 26 12:31:01 2013	(r316599)
+++ head/emulators/virtualbox-ose/Makefile	Fri Apr 26 12:35:50 2013	(r316600)
@@ -22,16 +22,17 @@ BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/ya
 		as86:${PORTSDIR}/devel/dev86 \
 		xsltproc:${PORTSDIR}/textproc/libxslt \
 		kmk:${PORTSDIR}/devel/kBuild \
-		gtar:${PORTSDIR}/archivers/gtar
+		gtar:${PORTSDIR}/archivers/gtar \
+		cdrecord:${PORTSDIR}/sysutils/cdrtools
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		xslt.2:${PORTSDIR}/textproc/libxslt \
 		curl.6:${PORTSDIR}/ftp/curl
-RUN_DEPENDS=	${KMODDIR}/vboxdrv.ko:${PORTSDIR}/emulators/virtualbox-ose-kmod
+RUN_DEPENDS=	${KMODDIR}/vboxdrv.ko:${PORTSDIR}/emulators/virtualbox-ose-kmod \
+		cdrecord:${PORTSDIR}/sysutils/cdrtools
 
 WRKSRC=		${WRKDIR}/VirtualBox-${PORTVERSION}
 ONLY_FOR_ARCHS=	i386 amd64
 FETCH_ARGS=	-pRr
-USE_CDRTOOLS=	yes
 USE_GCC=	any
 USE_GNOME=	libidl
 USE_BZIP2=	yes

Modified: head/games/kevedit/Makefile
==============================================================================
--- head/games/kevedit/Makefile	Fri Apr 26 12:31:01 2013	(r316599)
+++ head/games/kevedit/Makefile	Fri Apr 26 12:35:50 2013	(r316600)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	kevedit
-# Date created:				16 September 2007
-# Whom:					Raymond Pasco <ray at cultofray.net>
-#
+# Created by: Raymond Pasco <ray at cultofray.net>
 # $FreeBSD$
-#
 
 PORTNAME=		kevedit
 PORTVERSION=		0.5.1
@@ -14,8 +10,10 @@ MASTER_SITES=		SF
 MAINTAINER=		ports at FreeBSD.org
 COMMENT=		Modern ZZT editor with necessary features
 
+BUILD_DEPENDS=		cdrecord:${PORTSDIR}/sysutils/cdrtools
+RUN_DEPENDS=		cdrecord:${PORTSDIR}/sysutils/cdrtools
+
 USE_SDL=		yes
-USE_CDRTOOLS=		yes
 HAS_CONFIGURE=		yes
 
 .include <bsd.port.mk>

Modified: head/misc/lesspipe/Makefile
==============================================================================
--- head/misc/lesspipe/Makefile	Fri Apr 26 12:31:01 2013	(r316599)
+++ head/misc/lesspipe/Makefile	Fri Apr 26 12:35:50 2013	(r316600)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   lesspipe
-# Date created:        11 December 2004
-# Whom:                Slaven Rezic <slaven at rezic.de>
-#
+# Created by: Slaven Rezic <slaven at rezic.de>
 # $FreeBSD$
-#
 
 PORTNAME=	lesspipe
 PORTVERSION=	1.55
@@ -26,8 +22,8 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archiver
 		dvi2tty:${PORTSDIR}/print/dvi2tty \
 		pstotext:${PORTSDIR}/print/pstotext \
 		mp3info:${PORTSDIR}/audio/mp3info \
-		cabextract:${PORTSDIR}/archivers/cabextract
-USE_CDRTOOLS=	yes
+		cabextract:${PORTSDIR}/archivers/cabextract \
+		cdrecord:${PORTSDIR}/sysutils/cdrtools
 .endif
 
 USE_PERL5=	yes

Modified: head/multimedia/2mandvd/Makefile
==============================================================================
--- head/multimedia/2mandvd/Makefile	Fri Apr 26 12:31:01 2013	(r316599)
+++ head/multimedia/2mandvd/Makefile	Fri Apr 26 12:35:50 2013	(r316600)
@@ -25,7 +25,8 @@ RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox \
 		tcprobe:${PORTSDIR}/multimedia/transcode \
 		xine:${PORTSDIR}/multimedia/xine \
 		bash:${PORTSDIR}/shells/bash \
-		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
+		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
+		cdrecord:${PORTSDIR}/sysutils/cdrtools
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
@@ -34,7 +35,6 @@ USE_QT4=	corelib gui opengl \
 USE_GL=		glu
 USE_SDL=	sdl
 USE_PERL5_RUN=	yes
-USE_CDRTOOLS=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	QTDIR="${QT_PREFIX}"
 MAKE_JOBS_SAFE=	yes

Modified: head/multimedia/devede/Makefile
==============================================================================
--- head/multimedia/devede/Makefile	Fri Apr 26 12:31:01 2013	(r316599)
+++ head/multimedia/devede/Makefile	Fri Apr 26 12:35:50 2013	(r316600)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	devede
-# Date created:		2007-06-20
-# Whom:			Lars Engels <lars.engels at 0x20.net>
-#
+# Created by: Lars Engels <lars.engels at 0x20.net>
 # $FreeBSD$
-#
 
 PORTNAME=	devede
 DISTVERSION=	3.23.0
@@ -17,43 +13,40 @@ COMMENT=	Create video DVDs, VCDs, sVCDs,
 RUN_DEPENDS=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg \
 		mencoder:${PORTSDIR}/multimedia/mencoder \
 		spumux:${PORTSDIR}/multimedia/dvdauthor \
-		vcdimager:${PORTSDIR}/multimedia/vcdimager
+		vcdimager:${PORTSDIR}/multimedia/vcdimager \
+		cdrecord:${PORTSDIR}/sysutils/cdrtools
 
 USE_BZIP2=	yes
 USE_GNOME=	pygtk2
 USE_ICONV=	yes
 USE_PYTHON=	yes
-USE_CDRTOOLS=	yes
 NO_BUILD=	yes
 
-OPTIONS=	IBUS "Enable iBus support" on \
-		PSYCO "Enable devel/py-psyco optimization support" off
+OPTIONS_DEFINE=	IBUS NLS
+OPTIONS_DEFINE_i386=	PSYCO
+OPTIONS_DEFAULT=	IBUS
+IBUS_DESC=	iBus support
+PSYCO_DESC=	devel/py-psyco optimization support
 
 DEJAVU_FONTSDIR=	${LOCALBASE}/lib/X11/fonts/dejavu
 DEJAVU_FONTFILE=	${DEJAVU_FONTSDIR}/DejaVuSans.ttf
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if ${ARCH} != "i386"
-.undef WITH_PSYCO
-
-WITHOUT_PSYCO=	yes
-.endif
-
-.if !defined(WITHOUT_IBUS)
+.if ${PORT_OPTIONS:MIBUS}
 RUN_DEPENDS+=	ibus-daemon:${PORTSDIR}/textproc/ibus
 .endif
 
-.if defined(WITHOUT_NLS)
-PLIST_SUB+=	NLS="@comment "
-.else
-USE_GETTEXT=	yes
+.if ${PORT_OPTIONS:MNLS}
+USES+=		gettext
 PLIST_SUB+=	NLS=""
+.else
+PLIST_SUB+=	NLS="@comment "
 .endif
 
 PORTDOCS=	*
 
-.if defined(WITH_PSYCO)
+.if ${PORT_OPTIONS:MPSYCO}
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psyco/_psyco.so:${PORTSDIR}/devel/py-psyco
 EXTRA_PATCHES+=	${FILESDIR}/extra-psyco-patch-devede.py
 .endif
@@ -100,7 +93,7 @@ do-install:
 
 	@${INSTALL_DATA} ${WRKSRC}/devede.svg ${PREFIX}/share/pixmaps
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 	@${INSTALL_DATA} ${WRKSRC}/po/ca.mo ${PREFIX}/share/locale/ca/LC_MESSAGES/devede.mo
 	@${INSTALL_DATA} ${WRKSRC}/po/cs_CZ.mo ${PREFIX}/share/locale/cs/LC_MESSAGES/devede.mo
 	@${INSTALL_DATA} ${WRKSRC}/po/da.mo ${PREFIX}/share/locale/da/LC_MESSAGES/devede.mo
@@ -124,9 +117,9 @@ do-install:
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}/html
 	@${INSTALL_DATA} ${WRKSRC}/docs/html/* ${DOCSDIR}/html
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/multimedia/dvd-slideshow/Makefile
==============================================================================
--- head/multimedia/dvd-slideshow/Makefile	Fri Apr 26 12:31:01 2013	(r316599)
+++ head/multimedia/dvd-slideshow/Makefile	Fri Apr 26 12:35:50 2013	(r316600)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	dvd-slideshow
-# Date created:				2005-02-16
-# Whom:					Phil Oleson <oz at nixil.net>
-#
+# Created by: Phil Oleson <oz at nixil.net>
 # $FreeBSD$
-#
 
 PORTNAME=	dvd-slideshow
 PORTVERSION=	0.8.2
@@ -25,18 +21,17 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bas
 		dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
 		jhead:${PORTSDIR}/graphics/jhead \
 		flvtool2:${PORTSDIR}/multimedia/ruby-flvtool2 \
-		${LOCALBASE}/lib/X11/fonts/urwfonts-ttf/README:${PORTSDIR}/x11-fonts/urwfonts-ttf
+		${LOCALBASE}/lib/X11/fonts/urwfonts-ttf/README:${PORTSDIR}/x11-fonts/urwfonts-ttf \
+		cdrecord:${PORTSDIR}/sysutils/cdrtools
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-2
 
 NO_BUILD=	yes
-USE_CDRTOOLS=	yes
 DATADIR=	${PREFIX}/share/apps/${PORTNAME}
 
-OPTIONS=	LAME "Optional mp3 audio support" off \
-		THEMES "Optional themes" off \
-		TOOLAME "Faster Optional mp3 audio support" off \
-		VORBISTOOLS "Optional ogg vorbis audio support" off
+OPTIONS_DEFINE=	LAME THEMES TOOLAME VORBIS
+THEMES_DESC=	Optional themes
+TOOLAME_DESC=	Faster Optional mp3 audio support
 
 MAN1=		dvd-slideshow.1 \
 		dvd-menu.1 \
@@ -44,35 +39,25 @@ MAN1=		dvd-slideshow.1 \
 		gallery1-to-slideshow.1 \
 		jigl2slideshow.1
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if exists(${LOCALBASE}/bin/lame)
-WITH_LAME=yes
-.endif
-.if exists(${LOCALBASE}/bin/oggdec)
-WITH_VORBISTOOLS=yes
-.endif
-.if exists(${LOCALBASE}/bin/toolame)
-WITH_TOOLAME=yes
-.endif
-
-.if defined(WITH_LAME)
+.if ${PORT_OPTIONS:MLAME}
 RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame
 .endif
-.if defined(WITH_VORBISTOOLS)
+.if ${PORT_OPTIONS:MVORBISTOOLS}
 RUN_DEPENDS+=	oggdec:${PORTSDIR}/audio/vorbis-tools
 .endif
-.if defined(WITH_TOOLAME)
+.if ${PORT_OPTIONS:MTOOLAME}
 RUN_DEPENDS+=	toolame:${PORTSDIR}/audio/toolame
 .endif
-.if defined(WITH_THEMES)
+.if ${PORT_OPTIONS:MTHEMES}
 DISTFILES+=	${PORTNAME}-themes-${THEMEVERSION}-1${EXTRACT_SUFX}:themes
 WRKSRC2=	${WRKDIR}/${PORTNAME}-themes-${THEMEVERSION}-1
 PLIST_SUB+=	NOTHEMES=""
 .else
 PLIST_SUB+=	NOTHEMES="@comment "
 .endif
-.if defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 PLIST_SUB+=	NOPORTDOCS="@comment "
 .else
 PLIST_SUB+=	NOPORTDOCS=""
@@ -84,7 +69,7 @@ post-patch:
 			      s|/usr/share/fonts/|${LOCALBASE}/lib/X11/fonts/|g ; \
 			      s|seq |seq2 |g' \
 				 ${WRKSRC}/${FILE}
-.ifdef(WITH_THEMES)
+.if ${PORT_OPTIONS:MTHEMES}
 	@${REINPLACE_CMD} -e 's|/opt/dvd-slideshow/themes|${DATADIR}/themes|g' \
 				${WRKSRC}/${FILE}
 .endif
@@ -99,7 +84,7 @@ do-install:
 .for FILE in ${MAN1}
 	${INSTALL_MAN} ${WRKSRC}/man/${FILE} ${PREFIX}/man/man1
 .endfor
-.ifndef(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${ECHO_MSG} "Installing doc files."
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/dvd-slideshowrc ${DOCSDIR}
@@ -107,10 +92,10 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${DOCSDIR}
 .endfor
 .endif
-.ifdef(WITH_THEMES)
+.if ${PORT_OPTIONS:MTHEMES}
 	@${ECHO_MSG} "Installing theme files."
 	${MKDIR} ${DATADIR}/themes
 	cd ${WRKSRC2} && ${FIND} * | ${CPIO} -dpmu -R ${BINOWN}:${BINGRP} --quiet ${DATADIR}/themes
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/multimedia/dvdrip/Makefile
==============================================================================
--- head/multimedia/dvdrip/Makefile	Fri Apr 26 12:31:01 2013	(r316599)
+++ head/multimedia/dvdrip/Makefile	Fri Apr 26 12:35:50 2013	(r316600)
@@ -26,7 +26,8 @@ RUN_DEPENDS+=	cdrdao:${PORTSDIR}/sysutil
 		transcode:${PORTSDIR}/multimedia/transcode \
 		vcdimager:${PORTSDIR}/multimedia/vcdimager \
 		rar:${PORTSDIR}/archivers/rar \
-		${LOCALBASE}/sbin/fping:${PORTSDIR}/net/fping
+		${LOCALBASE}/sbin/fping:${PORTSDIR}/net/fping \
+		cdrecord:${PORTSDIR}/sysutils/cdrtools
 
 OPTIONS_DEFINE=	VORBIS SUBTITLE
 OPTIONS_DEFAULT=	VORBIS SUBTITLE
@@ -34,7 +35,6 @@ SUBTITLE_DESC=	Enable support for gettin
 
 PERL_CONFIGURE=	yes
 CONFIGURE_ENV=	SKIP_UNPACK_REQUIRED_MODULES=1
-USE_CDRTOOLS=	yes
 USES=		gettext
 MAKE_JOBS_UNSAFE=	yes
 

Modified: head/multimedia/dvdstyler/Makefile
==============================================================================
--- head/multimedia/dvdstyler/Makefile	Fri Apr 26 12:31:01 2013	(r316599)
+++ head/multimedia/dvdstyler/Makefile	Fri Apr 26 12:35:50 2013	(r316600)
@@ -25,7 +25,8 @@ RUN_DEPENDS=	wxsvg>=1.1.13:${PORTSDIR}/g
 		dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
 		mplex:${PORTSDIR}/multimedia/mjpegtools \
 		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
-		zip:${PORTSDIR}/archivers/zip
+		zip:${PORTSDIR}/archivers/zip \
+		mkisofs:${PORTSDIR}/sysutils/cdrtools
 
 OPTIONS_DEFINE=	GNOME DOCS
 
@@ -35,7 +36,6 @@ USE_WX=		2.8
 WX_COMPS=	wx svg
 WX_CONF_ARGS=	absolute
 USE_GNOME=	desktopfileutils
-USE_CDRTOOLS=	yes	# dvdstyler needs mkisofs
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBAV_CFLAGS="${LIBAV_CFLAGS}" LIBAV_LIBS="${LIBAV_LIBS}" \

Modified: head/multimedia/kdenlive/Makefile
==============================================================================
--- head/multimedia/kdenlive/Makefile	Fri Apr 26 12:31:01 2013	(r316599)
+++ head/multimedia/kdenlive/Makefile	Fri Apr 26 12:35:50 2013	(r316600)
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	kdenlive
-# Date created:				15 October 2008
-# Whom:					Alberto Villa <villa.alberto at gmail.com>
-#
+# Created by: Alberto Villa <villa.alberto at gmail.com>
 # $FreeBSD$
 
 PORTNAME=	kdenlive
@@ -41,8 +38,8 @@ OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDVDWIZARD}
-RUN_DEPENDS+=	dvdauthor:${PORTSDIR}/multimedia/dvdauthor
-USE_CDRTOOLS=	yes
+RUN_DEPENDS+=	dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
+		cdrecord:${PORTSDIR}/sysutils/cdrtools
 .endif
 
 .if ${PORT_OPTIONS:MFREI0R}

Modified: head/multimedia/lives/Makefile
==============================================================================
--- head/multimedia/lives/Makefile	Fri Apr 26 12:31:01 2013	(r316599)
+++ head/multimedia/lives/Makefile	Fri Apr 26 12:35:50 2013	(r316600)
@@ -38,7 +38,8 @@ RUN_DEPENDS=	${LOCALBASE}/bin/analyseplu
 		ogmmerge:${PORTSDIR}/multimedia/ogmtools \
 		transcode:${PORTSDIR}/multimedia/transcode \
 		x264:${PORTSDIR}/multimedia/x264 \
-		xmms:${PORTSDIR}/multimedia/xmms
+		xmms:${PORTSDIR}/multimedia/xmms \
+		cdrecord:${PORTSDIR}/sysutils/cdrtools
 
 WRKSRC=		${WRKDIR}/${DISTNAME:L}
 
@@ -48,7 +49,6 @@ GNU_CONFIGURE=	yes
 USE_CSTD=	gnu89
 USE_PYTHON=	yes
 USE_PERL5=	yes
-USE_CDRTOOLS=	yes
 USE_GHOSTSCRIPT_RUN=	yes
 USE_GNOME=	gtk20
 USE_LDCONFIG=	yes

Modified: head/multimedia/qdvdauthor/Makefile
==============================================================================
--- head/multimedia/qdvdauthor/Makefile	Fri Apr 26 12:31:01 2013	(r316599)
+++ head/multimedia/qdvdauthor/Makefile	Fri Apr 26 12:35:50 2013	(r316600)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   qdvdauthor
-# Date created:        05/07/04
-# Whom:                oz at nixil.net
-#
+# Created by: oz at nixil.net
 # $FreeBSD$
-#
 
 PORTNAME=	qdvdauthor
 PORTVERSION=	1.1.0
@@ -57,69 +53,46 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} --qt-
 		--build-qslideshow --build-qplayer
 NO_BUILD=	yes
 
-OPTIONS=	NETPBM "Create mpeg2 streams for movie menus" on \
-		MJPEGTOOLS "Convert background images into mpeg2 movie" on \
-		CDRTOOLS "Create iso images of DVD on the Hard Drive" on \
-		TRANSCODE "Support for movie format conversion" on \
-		DVDRWTOOLS "Optional DVD recording/burning prog" off \
-		MPLAYER "Optional support for mplayer playback" off \
-		TOOLAME "Optional support for audio conversion" off \
-		MCTOOLAME "Optional support for audio conversion" off
+OPTIONS_DEFINE=	NETPBM MJPEGTOOLS CDRTOOLS TRANSCODE DVDRWTOOLS MPLAYER TOOLAME MCTOOLAME
+OPTIONS_DEFAULT=	NETPBM MJPEGTOOLS CDRTOOLS TRANSCODE
+NETPBM_DESC=		Create mpeg2 streams for movie menus
+MJPEGTOOLS_DESC=	Convert background images into mpeg2 movie
+CDRTOOLS_DESC=		Create iso images of DVD on the Hard Drive
+TRANSCODE_DESC=		Support for movie format conversion
+DVDRWTOOLS_DESC=	Optional DVD recording/burning prog
+MPLAYER_DESC=		Optional support for mplayer playback
+TOOLAME_DESC=		Optional support for audio conversion
+MCTOOLAME_DESC=		Optional support for audio conversion
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if exists(${LOCALBASE}/bin/pngtopnm)
-WITH_NETPBM=yes
-.endif
-.if exists(${LOCALBASE}/bin/mpeg2enc)
-WITH_MJPEGTOOLS=yes
-.endif
-.if exists(${LOCALBASE}/bin/mkisofs)
-WITH_CDRTOOLS=yes
-.endif
-.if exists(${LOCALBASE}/bin/growisofs)
-WITH_DVDRWTOOLS=yes
-.endif
-.if exists(${LOCALBASE}/bin/mplayer)
-WITH_MPLAYER=yes
-.endif
-.if exists(${LOCALBASE}/bin/transcode)
-WITH_TRANSCODE=yes
-.endif
-.if exists(${LOCALBASE}/bin/toolame)
-WITH_TOOLAME=yes
-.endif
-.if exists(${LOCALBASE}/bin/mctoolame)
-WITH_MCTOOLAME=yes
-.endif
-
-.if !defined(WITHOUT_NETPBM)
+.if ${PORT_OPTIONS:MNETPBM}
 RUN_DEPENDS+=	pngtopnm:${PORTSDIR}/graphics/netpbm
 .endif
-.if !defined(WITHOUT_MJPEGTOOLS)
+.if ${PROT_OPTIONS:MMJPEGTOOLS}
 RUN_DEPENDS+=	mpeg2enc:${PORTSDIR}/multimedia/mjpegtools
 .endif
-.if !defined(WITHOUT_CDRTOOLS)
-USE_CDRTOOLS=	yes
+.if ${PORT_OPTIONS:MCDRTOOLS}
+RUN_DEPENDS+=	cdrecord:${PORTSDIR}/sysutils/cdrtools
 .endif
-.if defined(WITH_DVDRWTOOLS)
+.if ${PORT_OPTIONS:MDVDRWTOOLS}
 RUN_DEPENDS+=	growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
 .endif
-.if !defined(WITHOUT_LIBXINE)
+.if ${PORT_OPTIONS:MLIBXINE}
 LIB_DEPENDS+=	xine.2:${PORTSDIR}/multimedia/libxine
 CONFIGURE_ARGS+=--with-xine-support
 .endif
-.if defined(WITH_MPLAYER)
+.if ${PORT_OPTIONS:MMPLAYER}
 RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
 CONFIGURE_ARGS+=--with-mplayer-support
 .endif
-.if !defined(WITHOUT_TRANSCODE)
+.if ${PORT_OPTIONS:MTRANSCODE}
 RUN_DEPENDS+=	transcode:${PORTSDIR}/multimedia/transcode
 .endif
-.if defined(WITH_TOOLAME)
+.if ${PORT_OPTIONS:MTOOLAME}
 RUN_DEPENDS+=	toolame:${PORTSDIR}/audio/toolame
 .endif
-.if defined(WITH_MCTOOLAME)
+.if ${PORT_OPTIONS:MMCTOOLAME}
 RUN_DEPENDS+=	mctoolame:${PORTSDIR}/audio/mctoolame-encoder
 .endif
 
@@ -150,4 +123,4 @@ do-install:
 .for locale in ca de es
 	${INSTALL_DATA} ${WRKSRC}/qdvdauthor/i18n/qrender_${locale}.qm  ${DATADIR}
 .endfor
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/multimedia/tovid/Makefile
==============================================================================
--- head/multimedia/tovid/Makefile	Fri Apr 26 12:31:01 2013	(r316599)
+++ head/multimedia/tovid/Makefile	Fri Apr 26 12:35:50 2013	(r316600)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	tovid
-# Date created:		Mon Dec 26 20:00:42 UTC 2005
-# Whom:			Mario Sergio Fujikawa Ferreira <lioux at FreeBSD.org>
-#
+# Created by: Mario Sergio Fujikawa Ferreira <lioux at FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	tovid
 PORTVERSION=	0.30
@@ -29,6 +25,7 @@ RUN_DEPENDS=	mplayer:${PORTSDIR}/multime
 		vcdxbuild:${PORTSDIR}/multimedia/vcdimager \
 		cdrdao:${PORTSDIR}/sysutils/cdrdao \
 		tcprobe:${PORTSDIR}/multimedia/transcode \
+		cdrecord:${PORTSDIR}/sysutils/cdrtools \
 		sox:${PORTSDIR}/audio/sox \
 		normalize:${PORTSDIR}/audio/normalize \
 		bash:${PORTSDIR}/shells/bash \
@@ -40,7 +37,6 @@ WX_COMPS=	python
 NO_BUILD=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	yes
-USE_CDRTOOLS=	yes
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 

Modified: head/net/gpxe/Makefile
==============================================================================
--- head/net/gpxe/Makefile	Fri Apr 26 12:31:01 2013	(r316599)
+++ head/net/gpxe/Makefile	Fri Apr 26 12:35:50 2013	(r316600)
@@ -1,12 +1,9 @@
-# New ports collection Makefile for:	gpxe
-# Date created:				27-02-2010
-# Whom:					Guerkan Karaman <gk.freebsd at googlemail.com>
-#
+# Created by: Guerkan Karaman <gk.freebsd at googlemail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	gpxe
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_KERNEL_ORG}
 MASTER_SITE_SUBDIR=software/utils/boot/gpxe
@@ -16,11 +13,11 @@ COMMENT=	Create an open-source PXE imple
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	syslinux:${PORTSDIR}/sysutils/syslinux
+BUILD_DEPENDS=	syslinux:${PORTSDIR}/sysutils/syslinux \
+		mkisofs:${PORTSDIR}/sysutils/cdrtools
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_CDRTOOLS=	yes
 USE_PERL5=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 MAKE_JOBS_SAFE=	yes
@@ -34,7 +31,7 @@ PLIST_FILES=	%%DATADIR%%/gpxe.dsk \
 
 SUB_FILES=	pkg-message
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 ONLY_FOR_ARCHS=		amd64 i386
 ONLY_FOR_ARCHS_REASON=	not yet ported to anything other than amd64/i386
@@ -55,4 +52,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/sysutils/bashburn/Makefile
==============================================================================
--- head/sysutils/bashburn/Makefile	Fri Apr 26 12:31:01 2013	(r316599)
+++ head/sysutils/bashburn/Makefile	Fri Apr 26 12:35:50 2013	(r316600)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	sysutils/bashburn
-# Date created:				24 august 2007
-# Whom:					Martin Tournoij <carpetsmoker at xs4all.nl>
-#
+# Created by: Martin Tournoij <carpetsmoker at xs4all.nl>
 # $FreeBSD$
-#
 
 PORTNAME=	bashburn
 PORTVERSION=	2.1.2
@@ -15,48 +11,46 @@ DISTNAME=	BashBurn-${PORTVERSION}
 MAINTAINER=	sylvio at FreeBSD.org
 COMMENT=	CD burning bash script
 
-RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
+		cdrecord:${PORTSDIR}/sysutils/cdrtools
 
 NO_BUILD=	yes
-USE_CDRTOOLS=	yes
 
-OPTIONS=	CDRDAO "Disk-At-Once Recording" on \
-		DVDTOOLS "Frontend to master DVD media" on \
-		EJECT "Ejecting the CD/DVD drive" on \
-		FLAC "Free Lossless Audio Codec" on \
-		LAME "LGPL MP3 encoder" on \
-		MPG123 "Mpg audio player (for MP3-decompression)" on \
-		NORMALIZE "An audio file volume normalizer" on \
-		SUDO "To allow non-privileged users to burn CD's" on \
-		VORBIS "ogg/vorbis audio encoding/decoding" on
+OPTIONS_DEFINE=	CDRDAO DVDTOOLS EJECT FLAC LAME MPG123 NORMALIZE SUDO VORBIS
+OPTIONS_DEFAULT=	CDRDAO DVDTOOLS EJECT FLAC LAME MPG123 NORMALIZE SUDO VORBIS
+CDRDAO_DESC=	Disk-At-Once Recording
+DVDTOOLS_DESC=	Frontend to master DVD media
+EJECT_DESC=	Ejecting the CD/DVD drive
+NORMALIZE_DESC=	An audio file volume normalizer
+SUDO_DESC=	To allow non-privileged users to burn CD's
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_CDRDAO)
+.if ${PORT_OPTIONS:MCDRDAO}
 RUN_DEPENDS+=	${LOCALBASE}/bin/cdrdao:${PORTSDIR}/sysutils/cdrdao
 .endif
-.if !defined(WITHOUT_DVDTOOLS)
+.if ${PORT_OPTIONS:MDVDTOOLS}
 RUN_DEPENDS+=	${LOCALBASE}/bin/dvd+rw-mediainfo:${PORTSDIR}/sysutils/dvd+rw-tools
 .endif
-.if !defined(WITHOUT_EJECT)
+.if ${PORT_OPTIONS:MEJECT}
 RUN_DEPENDS+=	${LOCALBASE}/sbin/eject:${PORTSDIR}/sysutils/eject
 .endif
-.if !defined(WITHOUT_FLAC)
+.if ${PORT_OPTIONS:MFLAC}
 RUN_DEPENDS+=	${LOCALBASE}/bin/flac:${PORTSDIR}/audio/flac
 .endif
-.if !defined(WITHOUT_LAME)
+.if ${PORT_OPTIONS:MLAME}
 RUN_DEPENDS+=	${LOCALBASE}/bin/lame:${PORTSDIR}/audio/lame
 .endif
-.if !defined(WITHOUT_MPG123)
+.if ${PORT_OPTIONS:MMPG123}
 RUN_DEPENDS+=	${LOCALBASE}/bin/mpg123:${PORTSDIR}/audio/mpg123
 .endif
-.if !defined(WITHOUT_NORMALIZE)
+.if ${PORT_OPTIONS:MNORMALIZE}
 RUN_DEPENDS+=	${LOCALBASE}/bin/normalize:${PORTSDIR}/audio/normalize
 .endif
-.if !defined(WITHOUT_SUDO)
+.if ${PORT_OPTIONS:MSUDO}
 RUN_DEPENDS+=	${LOCALBASE}/bin/sudo:${PORTSDIR}/security/sudo
 .endif
-.if !defined(WITHOUT_VORBIS)
+.if ${PORT_OPTIONS:MVORBIS}
 RUN_DEPENDS+=	${LOCALBASE}/bin/ogg123:${PORTSDIR}/audio/vorbis-tools
 .endif
 
@@ -75,4 +69,4 @@ do-install:
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
 	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/sysutils/burn/Makefile
==============================================================================
--- head/sysutils/burn/Makefile	Fri Apr 26 12:31:01 2013	(r316599)
+++ head/sysutils/burn/Makefile	Fri Apr 26 12:35:50 2013	(r316600)
@@ -14,7 +14,8 @@ RUN_DEPENDS+=	cdrdao:${PORTSDIR}/sysutil
 
 LICENSE=	GPLv2
 
-USE_CDRTOOLS=	yes
+RUN_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools
+
 USE_GNUSTEP=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes

Modified: head/sysutils/cdbkup/Makefile
==============================================================================
--- head/sysutils/cdbkup/Makefile	Fri Apr 26 12:31:01 2013	(r316599)
+++ head/sysutils/cdbkup/Makefile	Fri Apr 26 12:35:50 2013	(r316600)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: cdbkup
-# Date created:				19 May 2003
-# Whom:					Kay Lehmann
-#
+# Created by: Kay Lehmann
 # $FreeBSD$
-#
 
 PORTNAME=	cdbkup
 PORTVERSION=	1.0
@@ -15,14 +11,15 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}-1
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Simple but full-featured backup/restore perl scripts (uses gnu tar)
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/eject:${PORTSDIR}/sysutils/eject
-RUN_DEPENDS=	${LOCALBASE}/sbin/eject:${PORTSDIR}/sysutils/eject
+BUILD_DEPENDS=	${LOCALBASE}/sbin/eject:${PORTSDIR}/sysutils/eject \
+		cdrecord:${PORTSDIR}/sysutils/cdrtools
+RUN_DEPENDS=	${LOCALBASE}/sbin/eject:${PORTSDIR}/sysutils/eject \
+		cdrecord:${PORTSDIR}/sysutils/cdrtools
 
 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

Modified: head/sysutils/dvd+rw-tools/Makefile
==============================================================================
--- head/sysutils/dvd+rw-tools/Makefile	Fri Apr 26 12:31:01 2013	(r316599)
+++ head/sysutils/dvd+rw-tools/Makefile	Fri Apr 26 12:35:50 2013	(r316600)
@@ -1,7 +1,4 @@
-# New ports collection makefile for: dvd+rw-tools
-# Date created:        2003-6-15
-# Whom:                chuck at pkix.net
-#
+# Created by: chuck at pkix.net
 # $FreeBSD$
 
 PORTNAME=	dvd+rw-tools
@@ -13,7 +10,8 @@ MASTER_SITES=	http://www.pkix.net/mirror
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	DVD burning software
 
-USE_CDRTOOLS=	yes
+BUILD_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools
+RUN_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools
 # On some systems, among them one 900044 i386, the do-build-invoked
 # "make" will just do nothing for reasons not yet found, as of
 # dvd+rw-tools 7.1. It is supposed to call
@@ -28,6 +26,8 @@ BIN_FILES=	growisofs dvd+rw-format dvd+r
 PLIST_FILES=	${BIN_FILES:S|^|bin/|}
 PORTDOCS=	index.html
 

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
