aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES1
-rw-r--r--Mk/bsd.port.mk8
-rw-r--r--audio/abcde/Makefile2
-rw-r--r--audio/atunes/Makefile8
-rw-r--r--audio/cripple/Makefile10
-rw-r--r--audio/gnormalize/Makefile3
-rw-r--r--audio/grip/Makefile10
-rw-r--r--audio/mp3burn/Makefile9
-rw-r--r--audio/mp3c/Makefile20
-rw-r--r--audio/prokyon3/Makefile15
-rw-r--r--emulators/virtualbox-ose-legacy/Makefile7
-rw-r--r--emulators/virtualbox-ose/Makefile7
-rw-r--r--games/kevedit/Makefile10
-rw-r--r--misc/lesspipe/Makefile10
-rw-r--r--multimedia/2mandvd/Makefile4
-rw-r--r--multimedia/devede/Makefile43
-rw-r--r--multimedia/dvd-slideshow/Makefile47
-rw-r--r--multimedia/dvdrip/Makefile4
-rw-r--r--multimedia/dvdstyler/Makefile4
-rw-r--r--multimedia/kdenlive/Makefile9
-rw-r--r--multimedia/lives/Makefile4
-rw-r--r--multimedia/qdvdauthor/Makefile73
-rw-r--r--multimedia/tovid/Makefile8
-rw-r--r--net/gpxe/Makefile15
-rw-r--r--sysutils/bashburn/Makefile48
-rw-r--r--sysutils/burn/Makefile3
-rw-r--r--sysutils/cdbkup/Makefile13
-rw-r--r--sysutils/dvd+rw-tools/Makefile12
-rw-r--r--sysutils/eroaster/Makefile8
-rw-r--r--sysutils/freesbie/Makefile9
-rw-r--r--sysutils/gcombust/Makefile14
-rw-r--r--sysutils/gnomebaker/Makefile23
-rw-r--r--sysutils/graveman/Makefile3
-rw-r--r--sysutils/k3b-kde4/Makefile3
-rw-r--r--sysutils/k3b/Makefile56
-rw-r--r--sysutils/livecd/Makefile9
-rw-r--r--sysutils/memtest86+/Makefile52
-rw-r--r--sysutils/mybashburn/Makefile49
-rw-r--r--sysutils/nautilus-cd-burner/Makefile4
-rw-r--r--sysutils/tkdvd/Makefile14
-rw-r--r--sysutils/xcdroast/Makefile28
-rw-r--r--sysutils/xfburn/Makefile4
42 files changed, 279 insertions, 404 deletions
diff --git a/CHANGES b/CHANGES
index d62f25b361d1..e09f2dfd977b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -13,6 +13,7 @@ All ports committers are allowed to commit to this file.
20130425:
AUTHOR: bapt@FreeBSD.org
+ * USE_CDRTOOLS is no longer recognized
* USE_FREETYPE is no longer recognized
20130423:
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index be5a944256c7..e7a86ee2a322 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -524,8 +524,6 @@ FreeBSD_MAINTAINER= portmgr@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}/${GHOSTSCRIPT_PORT}
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}
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>
diff --git a/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile
index 4fec6bcd39c6..0b2d87686dd5 100644
--- a/emulators/virtualbox-ose-legacy/Makefile
+++ b/emulators/virtualbox-ose-legacy/Makefile
@@ -23,16 +23,17 @@ BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \
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
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index c94bf6b97f15..2d327b079308 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -22,16 +22,17 @@ BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \
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
diff --git a/games/kevedit/Makefile b/games/kevedit/Makefile
index 95dcc21e3ac8..ff4d4084d868 100644
--- a/games/kevedit/Makefile
+++ b/games/kevedit/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: kevedit
-# Date created: 16 September 2007
-# Whom: Raymond Pasco <ray@cultofray.net>
-#
+# Created by: Raymond Pasco <ray@cultofray.net>
# $FreeBSD$
-#
PORTNAME= kevedit
PORTVERSION= 0.5.1
@@ -14,8 +10,10 @@ MASTER_SITES= SF
MAINTAINER= ports@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>
diff --git a/misc/lesspipe/Makefile b/misc/lesspipe/Makefile
index bcc80a2d9624..dc2d938541ad 100644
--- a/misc/lesspipe/Makefile
+++ b/misc/lesspipe/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: lesspipe
-# Date created: 11 December 2004
-# Whom: Slaven Rezic <slaven@rezic.de>
-#
+# Created by: Slaven Rezic <slaven@rezic.de>
# $FreeBSD$
-#
PORTNAME= lesspipe
PORTVERSION= 1.55
@@ -26,8 +22,8 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
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
diff --git a/multimedia/2mandvd/Makefile b/multimedia/2mandvd/Makefile
index 82c1ccf4cb83..8c8149d842a8 100644
--- a/multimedia/2mandvd/Makefile
+++ b/multimedia/2mandvd/Makefile
@@ -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
diff --git a/multimedia/devede/Makefile b/multimedia/devede/Makefile
index 95faa1d3e744..af9e30e89033 100644
--- a/multimedia/devede/Makefile
+++ b/multimedia/devede/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: devede
-# Date created: 2007-06-20
-# Whom: Lars Engels <lars.engels@0x20.net>
-#
+# Created by: Lars Engels <lars.engels@0x20.net>
# $FreeBSD$
-#
PORTNAME= devede
DISTVERSION= 3.23.0
@@ -17,43 +13,40 @@ COMMENT= Create video DVDs, VCDs, sVCDs, or CVDs from any number of video files
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>
diff --git a/multimedia/dvd-slideshow/Makefile b/multimedia/dvd-slideshow/Makefile
index 9d7a08103fb9..808482a9e522 100644
--- a/multimedia/dvd-slideshow/Makefile
+++ b/multimedia/dvd-slideshow/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: dvd-slideshow
-# Date created: 2005-02-16
-# Whom: Phil Oleson <oz@nixil.net>
-#
+# Created by: Phil Oleson <oz@nixil.net>
# $FreeBSD$
-#
PORTNAME= dvd-slideshow
PORTVERSION= 0.8.2
@@ -25,18 +21,17 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \
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>
diff --git a/multimedia/dvdrip/Makefile b/multimedia/dvdrip/Makefile
index abf8d26e5e91..af7dffd87cf3 100644
--- a/multimedia/dvdrip/Makefile
+++ b/multimedia/dvdrip/Makefile
@@ -26,7 +26,8 @@ RUN_DEPENDS+= cdrdao:${PORTSDIR}/sysutils/cdrdao \
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 getting subtitles
PERL_CONFIGURE= yes
CONFIGURE_ENV= SKIP_UNPACK_REQUIRED_MODULES=1
-USE_CDRTOOLS= yes
USES= gettext
MAKE_JOBS_UNSAFE= yes
diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile
index 6f4fafa5d9b3..cb481a832a9e 100644
--- a/multimedia/dvdstyler/Makefile
+++ b/multimedia/dvdstyler/Makefile
@@ -25,7 +25,8 @@ RUN_DEPENDS= wxsvg>=1.1.13:${PORTSDIR}/graphics/wxsvg \
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}" \
diff --git a/multimedia/kdenlive/Makefile b/multimedia/kdenlive/Makefile
index 9de097d665ca..9c8e635b2054 100644
--- a/multimedia/kdenlive/Makefile
+++ b/multimedia/kdenlive/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for: kdenlive
-# Date created: 15 October 2008
-# Whom: Alberto Villa <villa.alberto@gmail.com>
-#
+# Created by: Alberto Villa <villa.alberto@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}
diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile
index c0cdc5cb8a66..cd75c6c63933 100644
--- a/multimedia/lives/Makefile
+++ b/multimedia/lives/Makefile
@@ -38,7 +38,8 @@ RUN_DEPENDS= ${LOCALBASE}/bin/analyseplugin:${PORTSDIR}/audio/ladspa \
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
diff --git a/multimedia/qdvdauthor/Makefile b/multimedia/qdvdauthor/Makefile
index b4e3d62ff858..27d28e2672f5 100644
--- a/multimedia/qdvdauthor/Makefile
+++ b/multimedia/qdvdauthor/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: qdvdauthor
-# Date created: 05/07/04
-# Whom: oz@nixil.net
-#
+# Created by: oz@nixil.net
# $FreeBSD$
-#
PORTNAME= qdvdauthor
PORTVERSION= 1.1.0
@@ -57,69 +53,46 @@ CONFIGURE_ARGS= --prefix=${PREFIX} --qt-dir=${LOCALBASE} --with-qt-lib=qt-mt \
--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>
diff --git a/multimedia/tovid/Makefile b/multimedia/tovid/Makefile
index cfeb23b473a3..ba0e7395bb42 100644
--- a/multimedia/tovid/Makefile
+++ b/multimedia/tovid/Makefile
@@ -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@FreeBSD.org>
-#
+# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= tovid
PORTVERSION= 0.30
@@ -29,6 +25,7 @@ RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer \
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
diff --git a/net/gpxe/Makefile b/net/gpxe/Makefile
index b1d4e5a1b8aa..07e8de4ec67d 100644
--- a/net/gpxe/Makefile
+++ b/net/gpxe/Makefile
@@ -1,12 +1,9 @@
-# New ports collection Makefile for: gpxe
-# Date created: 27-02-2010
-# Whom: Guerkan Karaman <gk.freebsd@googlemail.com>
-#
+# Created by: Guerkan Karaman <gk.freebsd@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 implementation and bootloader
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>
diff --git a/sysutils/bashburn/Makefile b/sysutils/bashburn/Makefile
index 44a640906476..ecd71803bc35 100644
--- a/sysutils/bashburn/Makefile
+++ b/sysutils/bashburn/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: sysutils/bashburn
-# Date created: 24 august 2007
-# Whom: Martin Tournoij <carpetsmoker@xs4all.nl>
-#
+# Created by: Martin Tournoij <carpetsmoker@xs4all.nl>
# $FreeBSD$
-#
PORTNAME= bashburn
PORTVERSION= 2.1.2
@@ -15,48 +11,46 @@ DISTNAME= BashBurn-${PORTVERSION}
MAINTAINER= sylvio@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>
diff --git a/sysutils/burn/Makefile b/sysutils/burn/Makefile
index 452d8d418c5d..8e828f3a090e 100644
--- a/sysutils/burn/Makefile
+++ b/sysutils/burn/Makefile
@@ -14,7 +14,8 @@ RUN_DEPENDS+= cdrdao:${PORTSDIR}/sysutils/cdrdao
LICENSE= GPLv2
-USE_CDRTOOLS= yes
+RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools
+
USE_GNUSTEP= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
diff --git a/sysutils/cdbkup/Makefile b/sysutils/cdbkup/Makefile
index a53d46be9e61..356b2f16d377 100644
--- a/sysutils/cdbkup/Makefile
+++ b/sysutils/cdbkup/Makefile
@@ -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@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
diff --git a/sysutils/dvd+rw-tools/Makefile b/sysutils/dvd+rw-tools/Makefile
index 17addb5fbde1..0be2a8971ff3 100644
--- a/sysutils/dvd+rw-tools/Makefile
+++ b/sysutils/dvd+rw-tools/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for: dvd+rw-tools
-# Date created: 2003-6-15
-# Whom: chuck@pkix.net
-#
+# Created by: chuck@pkix.net
# $FreeBSD$
PORTNAME= dvd+rw-tools
@@ -13,7 +10,8 @@ MASTER_SITES= http://www.pkix.net/mirror/fy.chalmers.se/ \
MAINTAINER= ports@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+rw-booktype dvd+rw-mediainfo dvd-ram-cont
PLIST_FILES= ${BIN_FILES:S|^|bin/|}
PORTDOCS= index.html
+.include <bsd.port.options.mk>
+
post-patch:
@${REINPLACE_CMD} -e 's/-O2//' ${WRKSRC}/Makefile.m4
@@ -38,7 +38,7 @@ do-install:
${INSTALL_MAN} ${WRKSRC}/growisofs.1 ${MANPREFIX}/man/man1/
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
${INSTALL_MAN} ${WRKSRC}/index.html ${DOCSDIR}
.endif
diff --git a/sysutils/eroaster/Makefile b/sysutils/eroaster/Makefile
index 7daf2b287f5b..ee6fafd1d46e 100644
--- a/sysutils/eroaster/Makefile
+++ b/sysutils/eroaster/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: eroaster
-# Date Created: 20 Dic 2003
-# Whom: Davide D'Amico <dave@gufi.org>
-#
+# Created by: Davide D'Amico <dave@gufi.org>
# $FreeBSD$
-#
PORTNAME= eroaster
PORTVERSION= 2.2.0.0.6
@@ -16,6 +12,7 @@ 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
+RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools
.if defined(WITH_ADDITIONAL_PROGRAMS)
BUILD_DEPENDS+= bchunk:${PORTSDIR}/sysutils/bchunk \
@@ -30,7 +27,6 @@ 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 5389620234a2..5eab22d7b36f 100644
--- a/sysutils/freesbie/Makefile
+++ b/sysutils/freesbie/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: FreeSBIE
-# Date created: 27 March 2003
-# Whom: Thomas E. Zander <riggs@rrr.de>
-#
+# Created by: Thomas E. Zander <riggs@rrr.de>
# $FreeBSD$
-#
PORTNAME= freesbie
PORTVERSION= 2.0.20070710
@@ -16,8 +12,9 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/2.0.//}
MAINTAINER= riggs@rrr.de
COMMENT= Yet another cool answer to the system-on-cd question
+RUN_DEPENDS= cdrecord:${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 ed07b8de2ffa..bbc24735e13a 100644
--- a/sysutils/gcombust/Makefile
+++ b/sysutils/gcombust/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: gcombust
-# Date created: Tue Jun 22 21:17:03 MET DST 1999
-# Whom: Juergen Lock <nox@jelal.kn-bremen.de>
-#
+# Created by: Juergen Lock <nox@jelal.kn-bremen.de>
# $FreeBSD$
-#
PORTNAME= gcombust
PORTVERSION= 0.1.55
@@ -17,17 +13,19 @@ COMMENT= A GTK+ frontend for mkisofs and cdrecord
LICENSE= GPLv2
-RUN_DEPENDS= cdlabelgen:${PORTSDIR}/print/cdlabelgen
+RUN_DEPENDS= cdlabelgen:${PORTSDIR}/print/cdlabelgen \
+ cdrecord:${PORTSDIR}/sysutils/cdrtools
USES= gettext
USE_PERL5_BUILD=yes
USE_GNOME= gtk12 gnomehier
-USE_CDRTOOLS= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--without-included-gettext --datadir=${PREFIX}/share
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
CPPFLAGS+= -I${LOCALBASE}/include
+.include <bsd.port.options.mk>
+
pre-patch:
@${REINPLACE_CMD} -e 's|DATADIRNAME=lib|DATADIRNAME=share|g' \
${WRKSRC}/configure
@@ -37,7 +35,7 @@ post-configure:
cd ${WRKSRC}/po && ${MAKE} update-po
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${PREFIX}/share/doc/gcombust
${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/NEWS ${DOCSDIR}
diff --git a/sysutils/gnomebaker/Makefile b/sysutils/gnomebaker/Makefile
index 57e218c84cc3..6eee09dc9840 100644
--- a/sysutils/gnomebaker/Makefile
+++ b/sysutils/gnomebaker/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: gnomebaker
-# Date created: 2005-02-20
-# Whom: Dominique Goncalves <dominique.goncalves@gmail.com>
-#
+# Created by: Dominique Goncalves <dominique.goncalves@gmail.com>
# $FreeBSD$
-#
PORTNAME= gnomebaker
PORTVERSION= 0.6.4
@@ -15,10 +11,13 @@ DIST_SUBDIR= gnome2
MAINTAINER= dominique.goncalves@gmail.com
COMMENT= A CD/DVD recording GUI for Gnome
-OPTIONS= DVD "Enable DVD support" off
+OPTIONS_DEFINE= DVD
+DVD_DESC= DVD support
+
+RUN_DEPENDS+= cdrdao:${PORTSDIR}/sysutils/cdrdao \
+ cdrecord:${PORTSDIR}/sysutils/cdrtools
USE_GNOME= gnomeprefix gnomehack libgnomeui desktopfileutils
-USE_CDRTOOLS= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
INSTALLS_OMF= yes
@@ -29,17 +28,15 @@ CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -export-dynamic
ONLY_FOR_ARCHS= i386
-NOT_FOR_ARCHS_REASON= Coredump on amd64, see PR: ports/130972
-
-.include <bsd.port.pre.mk>
+NOT_FOR_ARCHS_REASON= Coredump on amd64, see PR: ports/130972
-RUN_DEPENDS+= cdrdao:${PORTSDIR}/sysutils/cdrdao
+.include <bsd.port.options.mk>
-.if defined(WITH_DVD)
+.if ${PORT_OPTIONS:MDVD}
RUN_DEPENDS+= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
.endif
post-install:
@-update-desktop-database
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/graveman/Makefile b/sysutils/graveman/Makefile
index 003870d4d90f..4094c86e94b7 100644
--- a/sysutils/graveman/Makefile
+++ b/sysutils/graveman/Makefile
@@ -12,11 +12,12 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Another GTK2 frontend for cdrecord, mkisofs, readcd, and sox
LIB_DEPENDS= mng:${PORTSDIR}/graphics/libmng
+BUILD_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools
+RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_CDRTOOLS= yes
USES= pathfix pkgconfig gettext
USE_GNOME= libglade2 intlhack gnomeprefix
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile
index 5348a9a50b29..4221fe9dfbab 100644
--- a/sysutils/k3b-kde4/Makefile
+++ b/sysutils/k3b-kde4/Makefile
@@ -12,6 +12,8 @@ COMMENT= KDE CD/DVD writing suite
LIB_DEPENDS= cdda_paranoia:${PORTSDIR}/audio/cdparanoia \
samplerate:${PORTSDIR}/audio/libsamplerate
+RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools
+BUILD_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools
LATEST_LINK= ${PORTNAME}-kde4
@@ -20,7 +22,6 @@ USES= cmake
CMAKE_ARGS= -DK3B_BUILD_K3BSETUP:BOOL=OFF \
-DK3B_ENABLE_MUSICBRAINZ:BOOL=OFF
USE_KDE4= automoc4 kdeprefix kdelibs libkcddb
-USE_CDRTOOLS= yes
USE_QT4= gui dbus network phonon qt3support sql svg webkit xml \
qmake_build moc_build rcc_build uic_build
USE_LDCONFIG= yes
diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index 3eb22c6fb336..748ed2e1efca 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: k3b
-# Date created: 2003/02/13
-# Whom: Heiner <h.eichmann@gmx.de>
-#
+# Created by: Heiner <h.eichmann@gmx.de>
# $FreeBSD$
-#
PORTNAME= k3b
PORTVERSION= 1.0.5
@@ -14,7 +10,8 @@ MASTER_SITES= SF
MAINTAINER= 5u623l20@gmail.com
COMMENT= A CD/DVD recording GUI for KDE
-RUN_DEPENDS= cdrdao:${PORTSDIR}/sysutils/cdrdao
+RUN_DEPENDS= cdrdao:${PORTSDIR}/sysutils/cdrdao \
+ cdrecord:${PORTSDIR}/sysutils/cdrtools
LIB_DEPENDS= tag:${PORTSDIR}/audio/taglib \
samplerate:${PORTSDIR}/audio/libsamplerate
@@ -28,21 +25,18 @@ CONFIGURE_ARGS= --with-k3bsetup=no \
--without-musepack \
--without-musicbrainz
USE_GMAKE= yes
-USE_CDRTOOLS= yes
USE_LDCONFIG= yes
USE_KDELIBS_VER= 3
-OPTIONS= ALSA "Add audio/alsa-lib support" Off \
- DVDPLUSRW "Add DVD+RW Tools (for DVD+/-R(W) burning)" On \
- EMOVIX "Add eMovix (to burn bootable video CD)" Off \
- FFMPEG "Add multimedia/ffmpeg decoder (for wma files)" Off \
- FLAC "Add audio/flac decoder" On \
- LAME "Add audio/lame encoder (for mp3 files)" On \
- LIBDVDREAD "Use libdvdread (for video dvd ripping)" On \
- NORMALIZE "Add Normalize (adjust audio to a std. level)" Off \
- SOX "Add SoX (more audio encoding formats)" Off \
- TRANSCODE "Add Transcode (for DVD ripping)" Off \
- VCDIMAGER "Add VCDImager (for Video CD burning)" Off
+OPTIONS_DEFINE= ALSA DVDPLUSRW EMOVIX FFMPEG FLAC LAME LIBDVDREAD NORMALIZE SOX TRANSCODE VCDIMAGER
+OPTIONS_DEFAULT= DVDPLUSRW FLAC LAME LIBDVDREAD
+DVDPLUSRW_DESC= Add DVD+RW Tools (for DVD+/-R(W) burning)
+EMOVIX_DESC= Add eMovix (to burn bootable video CD)
+LIBDVDREAD_DESC= Use libdvdread (for video dvd ripping)
+NORMALIZE_DESC= Add Normalize (adjust audio to a std. level)
+SOX_DESC= Add SoX (more audio encoding formats)
+TRANSCODE_DESC= Add Transcode (for DVD ripping)
+VCDIMAGER_DESC= Add VCDImager (for Video CD burning)
pre-configure:
${RM} ${WRKSRC}/admin/cvs.sh
@@ -55,7 +49,7 @@ post-install:
showinfo:
more ${PKGMESSAGE}
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if ${OSVERSION} >= 900044
EXTRA_PATCHES= ${FILESDIR}/extra-patch-libk3bdevice-k3bscsicommandbsd.cpp
@@ -63,7 +57,7 @@ EXTRA_PATCHES= ${FILESDIR}/extra-patch-libk3bdevice-k3bscsicommandbsd.cpp
PKGMESSAGE= ${PKGDIR}/pkg-message-7
-.if defined(WITH_FLAC)
+.if ${PORT_OPTIONS:MFLAC}
PLIST_SUB+= FLAC=""
LIB_DEPENDS+= FLAC:${PORTSDIR}/audio/flac
.else
@@ -71,7 +65,7 @@ PLIST_SUB+= FLAC="@comment "
CONFIGURE_ARGS+= --without-flac
.endif
-.if defined(WITH_LAME)
+.if ${PORT_OPTIONS:MLAME}
PLIST_SUB+= LAME=""
LIB_DEPENDS+= mp3lame:${PORTSDIR}/audio/lame
.else
@@ -79,7 +73,7 @@ PLIST_SUB+= LAME="@comment "
CONFIGURE_ARGS+= --without-lame
.endif
-.if defined(WITH_FFMPEG)
+.if ${PORT_OPTIONS:MFFMPEG}
PLIST_SUB+= FFMPEG=""
LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg
.else
@@ -87,7 +81,7 @@ PLIST_SUB+= FFMPEG="@comment "
CONFIGURE_ARGS+= --without-ffmpeg
.endif
-.if defined(WITH_LIBDVDREAD)
+.if ${PORT_OPTIONS:MLIBDVDREAD}
PLIST_SUB+= LIBDVDREAD=""
LIB_DEPENDS+= dvdread.4:${PORTSDIR}/multimedia/libdvdread
.else
@@ -95,31 +89,31 @@ PLIST_SUB+= LIBDVDREAD="@comment "
CONFIGURE_ARGS+= --without-libdvdread
.endif
-.if !defined (WITHOUT_DVDPLUSRW)
+.if ${PORT_OPTIONS:MDVDPLUSRW}
RUN_DEPENDS+= dvd+rw-format:${PORTSDIR}/sysutils/dvd+rw-tools
.endif
-.if defined (WITH_TRANSCODE)
+.if ${PORT_OPTIONS:MTRANSCODE}
RUN_DEPENDS+= transcode:${PORTSDIR}/multimedia/transcode
.endif
-.if defined (WITH_EMOVIX)
+.if ${PORT_OPTIONS:MEMOVIX}
RUN_DEPENDS+= mkmovixiso:${PORTSDIR}/multimedia/emovix
.endif
-.if defined (WITH_NORMALIZE)
+.if ${PORT_OPTIONS:MNORMALIZE}
RUN_DEPENDS+= normalize:${PORTSDIR}/audio/normalize
.endif
-.if defined (WITH_SOX)
+.if ${PORT_OPTIONS:MSOX}
RUN_DEPENDS+= sox:${PORTSDIR}/audio/sox
.endif
-.if defined (WITH_VCDIMAGER)
+.if ${PORT_OPTIONS:MVCDIMAGER}
RUN_DEPENDS+= vcdxrip:${PORTSDIR}/multimedia/vcdimager
.endif
-.if defined (WITH_ALSA)
+.if ${PORT_OPTIONS:MALSA}
PLIST_SUB+= ALSA=""
LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib
CONFIGURE_ARGS+= --with-alsa
@@ -128,4 +122,4 @@ PLIST_SUB+= ALSA="@comment "
CONFIGURE_ARGS+= --without-alsa
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/livecd/Makefile b/sysutils/livecd/Makefile
index d72e850eedad..7a9fe08e6295 100644
--- a/sysutils/livecd/Makefile
+++ b/sysutils/livecd/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: FreeBSD LiveCD
-# Date created: Wed Jun 26 21:40:01 UTC 2002
-# Whom: Edson Brandi <ebrandi.home@uol.com.br> et al
-#
+# Created by: Edson Brandi <ebrandi.home@uol.com.br>
# $FreeBSD$
-#
PORTNAME= livecd
PORTVERSION= 1.2.4b
@@ -14,8 +10,9 @@ MASTER_SITES= http://www.primeirospassos.org/
MAINTAINER= ebrandi.home@uol.com.br
COMMENT= Tool Set to create custom FreeBSD LiveCD
+RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools
+
NO_BUILD= yes
-USE_CDRTOOLS= yes
MAKE_ENV= INSTALL_DATA="${INSTALL_DATA}" \
INSTALL_SCRIPT="${INSTALL_SCRIPT}"
diff --git a/sysutils/memtest86+/Makefile b/sysutils/memtest86+/Makefile
index 30fce8bf72b2..7836c6971b4d 100644
--- a/sysutils/memtest86+/Makefile
+++ b/sysutils/memtest86+/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: memtest86+
-# Date created: 2009-03-10
-# Whom: Andriy Gapon <avg@icyb.net.ua>
-#
+# Created by: Andriy Gapon <avg@icyb.net.ua>
# $FreeBSD$
-#
PORTNAME= memtest86+
PORTVERSION= 4.20
@@ -24,39 +20,35 @@ PORTDOCS= *
# Please provide absolute path below (cannot be root)
BOOT_DIR?= /boot/opt
-OPTIONS= ISO "Build bootable ISO image" off \
- BOOT "Build ELF image loadable by boot2 and loader" on \
- SERIAL "Enable serial console at COM1/9600" off \
- HISPEED "Set COM1 serial console speed to 115200" off
+OPTIONS_DEFINE= SERIAL HISPEED DOCS
+OPTIONS_DEFAULT= BOOT
+OPTIONS_MULTI= BOOT_TYPE
+OPTIONS_MULTI_BOOT_TYPE= ISO BOOT
+ISO_DESC= Build bootable ISO image
+BOOT_DESC= Build ELF image loadable by boot2 and loader
+SERIAL_DESC= Enable serial console at COM1/9600
+HISPEED_DESC= Set COM1 serial console speed to 115200
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITHOUT_ISO) && defined(WITHOUT_BOOT)
-IGNORE= cannot be built: neither ISO nor BOOT selected
-.endif
-
-.if defined(WITH_BOOT)
+.if ${PORT_OPTIONS:MBOOT}
SUB_FILES= pkg-message
SUB_LIST+= BOOT_DIR=${BOOT_DIR}
.endif
-.if defined(WITH_ISO)
-USE_CDRTOOLS= yes
+.if ${PORT_OPTIONS:MISO}
+BUILD_DEPENDS+= mkisofs:${PORTSDIR}/sysutils/cdrtools
ALL_TARGET+= iso
.endif
-.if defined(WITH_SERIAL)
+.if ${PORT_OPTIONS:MSERIAL}
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-config.h
-.if defined(WITH_HISPEED)
+.if ${PORT_OPTIONS:MHISPEED}
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-config.h-115200
.endif
.endif # WITH_SERIAL
-.if ${OSVERSION} < 700042
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-Makefile
-.endif
-
pre-fetch:
.if !defined(PACKAGE_BUILDING)
@${ECHO} "If you only need bootable ISO image of memtest86+, you can"
@@ -71,36 +63,36 @@ PLIST= ${WRKDIR}/pkg-plist
pre-install:
# Generate PLIST dynamically because install things outside normal ${PREFIX}
@${TEST} -f ${PLIST} && ${RM} ${PLIST} || ${TRUE}
-.if defined(WITH_ISO)
+.if ${PORT_OPTIONS:MISO}
@${ECHO} "%%DATADIR%%/mt${PORTVERSION:C/\.//}.iso" >> ${PLIST}
@${ECHO} "@dirrm %%DATADIR%%" >> ${PLIST}
.endif
-.if defined(WITH_BOOT)
+.if ${PORT_OPTIONS:MBOOT}
@${ECHO} "@cwd ${BOOT_DIR:H}" >> ${PLIST}
@${ECHO} "${BOOT_DIR:T}/memtest86+" >> ${PLIST}
@${ECHO} "@dirrm ${BOOT_DIR:T}" >> ${PLIST}
.endif
do-install:
-.if defined(WITH_ISO)
+.if ${PORT_OPTIONS:MISO}
@${MKDIR} ${DATADIR}
${INSTALL_DATA} ${WRKSRC}/mt${PORTVERSION:C/\.//}.iso ${DATADIR}
.endif
-.if defined(WITH_BOOT)
+.if ${PORT_OPTIONS:MBOOT}
@${MKDIR} ${BOOT_DIR}
# XXX is INSTALL_KLD really appropriate here? XXX
${INSTALL_KLD} ${WRKSRC}/memtest ${BOOT_DIR}/memtest86+
.endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
.endif
post-install:
-.if defined(WITH_BOOT)
+.if ${PORT_OPTIONS:MBOOT}
@${ECHO_MSG}
@${CAT} ${PKGMESSAGE}
@${ECHO_MSG}
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/mybashburn/Makefile b/sysutils/mybashburn/Makefile
index 679ef3170131..efd25e0f2333 100644
--- a/sysutils/mybashburn/Makefile
+++ b/sysutils/mybashburn/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: mybashburn
-# Date created: 24 jan 2008
-# Whom: Martin Tournoij <carpetsmoker@xs4all.nl>
-#
+# Created by: Martin Tournoij <carpetsmoker@xs4all.nl>
# $FreeBSD$
-#
PORTNAME= mybashburn
PORTVERSION= 1.0.2
@@ -17,49 +13,48 @@ COMMENT= Ncurses CD burning bash script
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \
cdialog:${PORTSDIR}/devel/cdialog
+RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools
+
NO_BUILD= yes
-USE_CDRTOOLS= yes
MAN1= mybashburn.1
MANCOMPRESSED= yes
PORTDOCS= COPYING CREDITS ChangeLog FAQ FILES HOWTO INSTALL README TODO
-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 DOCS
+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+= cdrdao:${PORTSDIR}/sysutils/cdrdao
.endif
-.if !defined(WITHOUT_DVDTOOLS)
+.if ${PORT_OPTIONS:MDVDTOOLS}
RUN_DEPENDS+= dvd+rw-mediainfo:${PORTSDIR}/sysutils/dvd+rw-tools
.endif
-.if !defined(WITHOUT_EJECT)
+.if ${PORT_OPTIONS:MEJECT}
RUN_DEPENDS+= eject:${PORTSDIR}/sysutils/eject
.endif
-.if !defined(WITHOUT_FLAC)
+.if ${PORT_OPTIONS:MFLAC}
RUN_DEPENDS+= flac:${PORTSDIR}/audio/flac
.endif
-.if !defined(WITHOUT_LAME)
+.if ${PORT_OPTIONS:MLAME}
RUN_DEPENDS+= lame:${PORTSDIR}/audio/lame
.endif
-.if !defined(WITHOUT_MPG123)
+.if ${PORT_OPTIONS:MMPG123}
RUN_DEPENDS+= mpg123:${PORTSDIR}/audio/mpg123
.endif
-.if !defined(WITHOUT_NORMALIZE)
+.if ${PORT_OPTIONS:MNORMALIZE}
RUN_DEPENDS+= normalize:${PORTSDIR}/audio/normalize
.endif
-.if !defined(WITH_SUDO)
+.if ${PORT_OPTIONS:MSUDO}
RUN_DEPENDS+= sudo:${PORTSDIR}/security/sudo
.endif
-.if !defined(WITHOUT_VORBIS)
+.if ${PORT_OPTIONS:MVORBIS}
RUN_DEPENDS+= ogg123:${PORTSDIR}/audio/vorbis-tools
.endif
@@ -76,9 +71,9 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/etc/mybashburnrc ${PREFIX}/etc/mybashburnrc.sample
@(cd ${WRKSRC}/ && ${COPYTREE_SHARE} "burning config convert lang menus misc" ${DATADIR}/)
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 7b47b256de12..c438acb254b0 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -14,7 +14,8 @@ COMMENT= CD burner view for Nautilus
BUILD_DEPENDS= gnome-mount:${PORTSDIR}/sysutils/gnome-mount
RUN_DEPENDS= gnome-mount:${PORTSDIR}/sysutils/gnome-mount \
- cdrdao:${PORTSDIR}/sysutils/cdrdao
+ cdrdao:${PORTSDIR}/sysutils/cdrdao \
+ cdrecord:${PORTSDIR}/sysutils/cdrtools
CONFIGURE_ARGS= --enable-gnome-mount
USE_BZIP2= yes
@@ -23,7 +24,6 @@ USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomeprefix gnomehack intlhack nautilus2 ltverhack \
desktopfileutils ltasneededhack eel2 libgnomeui
-USE_CDRTOOLS= yes
INSTALLS_ICONS= yes
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
diff --git a/sysutils/tkdvd/Makefile b/sysutils/tkdvd/Makefile
index 84324f67a54d..eee3935f5a39 100644
--- a/sysutils/tkdvd/Makefile
+++ b/sysutils/tkdvd/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: tkdvd
-# Date created: 01 Sep 2008
-# Whom: Dmitry Marakasov <amdmi3@FreeBSD.org>
-#
+# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= tkdvd
PORTVERSION= 4.0.9
@@ -15,11 +11,11 @@ MASTER_SITES= http://regis.damongeot.free.fr/tkdvd/dl/ \
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= GUI to dvd+rw-tools and cdrecord
-RUN_DEPENDS= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
+RUN_DEPENDS= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
+ cdrecord:${PORTSDIR}/sysutils/cdrtools
USE_TCL= 84+
USE_TK= 84+
-USE_CDRTOOLS= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
@@ -33,6 +29,8 @@ DESKTOP_ENTRIES="TkDVD" \
"" \
true
+.include <bsd.port.options.mk>
+
post-patch:
@${REINPLACE_CMD} -e 's|tclsh|${TCLSH}|' ${WRKSRC}/install.tcl \
${WRKSRC}/configure
@@ -47,7 +45,7 @@ do-install:
${INSTALL_SCRIPT} ${WRKSRC}/tkdvd-install.sh ${PREFIX}/bin/tkdvd
${INSTALL_DATA} ${WRKSRC}/icons/tkdvd-2-48.png \
${PREFIX}/share/pixmaps/tkdvd.png
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/FAQ ${WRKSRC}/doc/c* \
${DOCSDIR}
diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index d95c29ab31c9..cc3072306ef0 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: xcdroast
-# Date Created: 28 Sep 2000
-# Whom: Oliver Lehmann <Kai_Allard_Liao@gmx.de>
-#
+# Created by: Oliver Lehmann <Kai_Allard_Liao@gmx.de>
# $FreeBSD$
-#
PORTNAME= xcdroast
PORTVERSION= 0.98.a.16
@@ -17,12 +13,14 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.a./alpha/}
MAINTAINER= oliver@FreeBSD.org
COMMENT= Another X11 frontend to mkisofs/cdrecord
-OPTIONS= GTK2 "Enable GTK2 support" on \
- NONROOT "Use xcdroast w/o being root" off \
- NLS "Native language support" on
+OPTIONS_DEFINE= GTK2 NONROOT NLS
+OPTIONS_DEFAULT= GTK2
+NONROOT_DESC= Use xcdroast w/o being root
+
+RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools
+BUILD_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools
USES= gettext
-USE_CDRTOOLS= yes
GNU_CONFIGURE= yes
WANT_GNOME= yes
USE_GMAKE= yes
@@ -36,16 +34,16 @@ CONFIGURE_ARGS= --with-cdrtools-prefix=${LOCALBASE} \
MAN1= xcdroast.1
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB= NLS="@comment "
.else
PLIST_SUB= NLS=""
.endif
-.if defined(WITH_GTK2)
+.if ${PORT_OPTIONS:MGTK2}
CONFIGURE_ARGS+=--enable-gtk2
USE_GNOME= gtk20
.else
@@ -53,7 +51,7 @@ CONFIGURE_ARGS+=--disable-gtk2
USE_GNOME= gdkpixbuf
.endif
-.if defined(WITH_NONROOT)
+.if ${PORT_OPTIONS:MNONROOT}
CONFIGURE_ARGS+=--enable-nonrootmode
.else
CONFIGURE_ARGS+=--disable-nonrootmode
@@ -64,7 +62,7 @@ post-patch:
${WRKSRC}/src/xtools.c
pre-everything::
-.if defined(WITH_NONROOT)
+.if ${PORT_OPTIONS:MNONROOT}
@${CAT} ${PKGMESSAGE}
@${ECHO_MSG}
@${ECHO_MSG} "Are you sure you want this? If not, hit Ctrl+C right now "
@@ -76,4 +74,4 @@ pre-everything::
sleep 5
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/xfburn/Makefile b/sysutils/xfburn/Makefile
index 501423e2b6c5..ff325b0b7d5a 100644
--- a/sysutils/xfburn/Makefile
+++ b/sysutils/xfburn/Makefile
@@ -14,7 +14,8 @@ COMMENT= CD/DVD burning tool for Xfce
LIB_DEPENDS= burn:${PORTSDIR}/devel/libburn \
isofs:${PORTSDIR}/devel/libisofs
-RUN_DEPENDS= cdrdao:${PORTSDIR}/sysutils/cdrdao
+RUN_DEPENDS= cdrdao:${PORTSDIR}/sysutils/cdrdao \
+ cdrecord:${PORTSDIR}/sysutils/cdrtools
GNU_CONFIGURE= yes
CONFIGURE_ENV= GMSGFMT=${PREFIX}/bin/msgfmt DATADIRNAME=share
@@ -24,7 +25,6 @@ USE_GMAKE= yes
USE_GNOME= intltool
USE_XFCE= configenv libexo libgui
USES= pkgconfig
-USE_CDRTOOLS= yes
INSTALLS_ICONS= yes
MAN1= xfburn.1