1 files changed, 23 insertions, 29 deletions

diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index a605a4539914..3b2225b5ec23 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -12,6 +12,8 @@ DISTNAME=	cdrdao-${PORTVERSION}
 MAINTAINER=	marius@FreeBSD.org
 COMMENT?=	Record CD-R[W]s in disk-at-once mode
 
+LICENSE=	GPLv2
+
 USES=		alias gmake tar:bzip2
 GNU_CONFIGURE=	yes
 
@@ -19,10 +21,15 @@ MP3OGG_LIB_DEPENDS=	libao.so:${PORTSDIR}/audio/libao \
 			libmad.so:${PORTSDIR}/audio/libmad \
 			libvorbis.so:${PORTSDIR}/audio/libvorbis
 
-OPTIONS_DEFINE=	DOCS TOC2MP3 MP3OGG
-OPTIONS_DEFAULT=MP3OGG
-TOC2MP3_DESC=	Build with toc2mp3
-MP3OGG_DESC=	MP3 and Ogg Vorbis support
+.if ${PORTNAME} == "cdrdao"
+OPTIONS_DEFINE=		DOCS TOC2MP3 MP3OGG
+
+OPTIONS_DEFAULT=	MP3OGG
+MP3OGG_DESC=		Build with MP3/Ogg support (for sysutils/gcdmaster)
+TOC2MP3_DESC=		Build with toc2mp3 (requires audio/lame)
+
+.include <bsd.port.options.mk>
+.endif
 
 .if ${PORTNAME} == "gcdmaster"
 USES+=			pkgconfig
@@ -35,7 +42,7 @@ RUN_DEPENDS+=		${LOCALBASE}/bin/cdrdao:${PORTSDIR}/sysutils/cdrdao \
 CONFIGURE_ARGS+=	--with-lame=no
 .else
 CONFIGURE_ARGS+=	--with-xdao=no
-.if defined(WITH_TOC2MP3)
+.if ${PORT_OPTIONS:MTOC2MP3}
 LIB_DEPENDS+=		libmp3lame.so:${PORTSDIR}/audio/lame
 CONFIGURE_ARGS+=	--with-lame-include=${LOCALBASE}/include \
 			--with-lame-lib=${LOCALBASE}/lib
@@ -44,7 +51,7 @@ PLIST_SUB+=		TOC2MP3=""
 CONFIGURE_ARGS+=	--with-lame=no
 PLIST_SUB+=		TOC2MP3="@comment "
 .endif
-.if !defined(WITHOUT_MP3OGG)
+.if ${PORT_OPTIONS:MMP3OGG}
 USES+=			pkgconfig
 LIB_DEPENDS+=		${MP3OGG_LIB_DEPENDS}
 CONFIGURE_ENV+=		AO_CFLAGS=-I${LOCALBASE}/include \
@@ -65,23 +72,6 @@ SCSILIBTARGET=		${ARCH:S/powerpc64/powerpc/}-freebsd-cc
 
 .include <bsd.port.pre.mk>
 
-pre-everything::
-.if ${PORTNAME} != "gcdmaster" && \
-	(!defined(WITH_TOC2MP3) || !defined(WITHOUT_MP3OGG))
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "You may use the following build option(s):"
-	@${ECHO_MSG} ""
-.if !defined(WITH_TOC2MP3)
-	@${ECHO_MSG} "WITH_TOC2MP3=yes	builds with toc2mp3 (requires audio/lame)"
-.endif
-.if !defined(WITHOUT_MP3OGG)
-	@${ECHO_MSG} "WITHOUT_MP3OGG=yes	builds without support for decoding MP3 and Ogg Vorbis"
-	@${ECHO_MSG} "			files (not required unless using sysutils/gcdmaster;"
-	@${ECHO_MSG} "			disabling saves a couple of dependencies)"
-.endif
-	@${ECHO_MSG} ""
-.endif
-
 post-extract:
 	@(cd ${WRKSRC}/scsilib/RULES && ${CP} os-freebsd.id os-dragonfly.id)
 .if ${SCSILIBTARGET} != "i386-freebsd-cc"
@@ -144,11 +134,14 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.xml \
 		${STAGEDIR}${LOCALBASE}/share/mime/packages
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/xdao/glade/Preferences.glade ${STAGEDIR}${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/xdao/glade/ProjectChooser.glade ${STAGEDIR}${DATADIR}
+	@${INSTALL_DATA} ${WRKSRC}/xdao/glade/Preferences.glade \
+		${STAGEDIR}${DATADIR}
+	@${INSTALL_DATA} ${WRKSRC}/xdao/glade/ProjectChooser.glade \
+		${STAGEDIR}${DATADIR}
 .else
 	@${INSTALL_PROGRAM} ${WRKSRC}/dao/cdrdao ${STAGEDIR}${PREFIX}/bin
-	@${INSTALL_MAN} ${WRKSRC}/dao/cdrdao.man ${STAGEDIR}${PREFIX}/man/man1/cdrdao.1
+	@${INSTALL_MAN} ${WRKSRC}/dao/cdrdao.man \
+		${STAGEDIR}${PREFIX}/man/man1/cdrdao.1
 	@${INSTALL_PROGRAM} ${WRKSRC}/utils/cue2toc ${STAGEDIR}${PREFIX}/bin
 	@${INSTALL_MAN} ${WRKSRC}/utils/cue2toc.1 ${STAGEDIR}${PREFIX}/man/man1
 	@${INSTALL_PROGRAM} ${WRKSRC}/utils/toc2cddb ${STAGEDIR}${PREFIX}/bin
@@ -156,9 +149,10 @@ do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/utils/toc2cue ${STAGEDIR}${PREFIX}/bin
 	@${INSTALL_MAN} ${WRKSRC}/utils/toc2cue.1 ${STAGEDIR}${PREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/dao/cdrdao.drivers ${STAGEDIR}${DATADIR}/drivers
-.if defined(WITH_TOC2MP3)
-	@${INSTALL_PROGRAM} ${WRKSRC}/utils/toc2mp3 ${STAGEDIR}{PREFIX}/bin
+	@${INSTALL_DATA} ${WRKSRC}/dao/cdrdao.drivers \
+		${STAGEDIR}${DATADIR}/drivers
+.if ${PORT_OPTIONS:MTOC2MP3}
+	@${INSTALL_PROGRAM} ${WRKSRC}/utils/toc2mp3 ${STAGEDIR}${PREFIX}/bin
 .endif
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in CREDITS ChangeLog README README.PlexDAE