Index: head/audio/libnjb/Makefile
===================================================================
--- head/audio/libnjb/Makefile	(revision 422995)
+++ head/audio/libnjb/Makefile	(revision 422996)
@@ -1,39 +1,39 @@
 # Created by: adrianm
 # $FreeBSD$
 
 PORTNAME=	libnjb
 PORTVERSION=	2.2.7
 PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C library, API for communicating with Creative and Dell audio players
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		pathfix ncurses libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 PORTDOCS=	*
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOXYGEN
 
-DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen
-DOCS_CONFIGURE_ENV_OFF=	ac_cv_prog_HAVE_DOXYGEN=no
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
+DOXYGEN_CONFIGURE_ENV_OFF=	ac_cv_prog_HAVE_DOXYGEN=no
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/^SHOW_DIRECTORIES/d' ${WRKSRC}/doc/Doxyfile.in
 	@${REINPLACE_CMD} -e \
 		'/pkgdocdir/s|-$$(VERSION)||g' ${WRKSRC}/doc/Makefile.in
 	@${REINPLACE_CMD} -e 's|-lcurses|-lncurses|' ${WRKSRC}/configure \
 		${WRKSRC}/sample/Makefile.am ${WRKSRC}/sample/Makefile.in
 
 .include <bsd.port.mk>
Index: head/audio/mp3splt-gtk/Makefile
===================================================================
--- head/audio/mp3splt-gtk/Makefile	(revision 422995)
+++ head/audio/mp3splt-gtk/Makefile	(revision 422996)
@@ -1,46 +1,46 @@
 # Created by: Timothy Beyer <beyert@cs.ucr.edu>
 # $FreeBSD$
 
 PORTNAME=	mp3splt-gtk
 PORTVERSION=	0.9.2
 CATEGORIES=	audio
 MASTER_SITES=	SF/mp3splt/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	beyert@cs.ucr.edu
 COMMENT=	Utility to split mp3 and ogg files (via GTK Interface)
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libmp3splt.so:audio/libmp3splt \
 		libmad.so:audio/libmad \
 		libogg.so:audio/libogg \
 		libvorbis.so:audio/libvorbis \
 		libid3tag.so:audio/libid3tag \
 		libltdl.so:devel/libltdl
 
 INSTALLS_OMF=	yes
 USE_GSTREAMER1=	yes
 USE_GNOME=	gnomedocutils gtk30
 GNU_CONFIGURE=	yes
 USES=		desktop-file-utils gmake pkgconfig
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--disable-audacious --with-mp3splt=${LOCALBASE} \
 		--with-mp3splt-includes=${LOCALBASE}/include \
 		--with-mp3splt-libraries=${LOCALBASE}/lib --disable-mp3splttest
 
 #PORTDOCS=	*
 
 #OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=	gettext
 
-#DOCS_LIB_DEPENDS=	libgvc.so:graphics/graphviz
-#DOCS_BUILD_DEPENDS=	${LOCALBASE}/bin/doxygen:devel/doxygen
-#DOCS_CONFIGURE_OFF=	--disable-doxygen-doc
+#DOXYGEN_LIB_DEPENDS=	libgvc.so:graphics/graphviz
+#DOXYGEN_BUILD_DEPENDS=	${LOCALBASE}/bin/doxygen:devel/doxygen
+#DOXYGEN_CONFIGURE_OFF=	--disable-doxygen-doc
 
 .include <bsd.port.mk>
Index: head/comms/rtl-sdr/Makefile
===================================================================
--- head/comms/rtl-sdr/Makefile	(revision 422995)
+++ head/comms/rtl-sdr/Makefile	(revision 422996)
@@ -1,36 +1,36 @@
 # Created by: Ganael Laplanche <ganael.laplanche@martymac.org>
 # $FreeBSD$
 
 PORTNAME=	rtl-sdr
 PORTVERSION=	20140210
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://contribs.martymac.org/FreeBSD-ports/distfiles/ \
 		LOCAL/martymac
 
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	Commandline tool that performs SDR with RTL2832-based USB sticks
 
 LICENSE=	GPLv2
 
 USES=		autoreconf gmake pkgconfig libtool tar:tgz
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/librtlsdr
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOXYGEN
 
-DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen
-DOCS_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-Makefile.am
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
+DOXYGEN_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-Makefile.am
 
 post-patch:
 	@${REINPLACE_CMD} 's|^pkgdocdir=.*|pkgdocdir=${DOCSDIR}|' \
 		${WRKSRC}/Makefile.am
 	@${REINPLACE_CMD} 's|^pkgconfigdir =.*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|' \
 		${WRKSRC}/Makefile.am
 
 .include <bsd.port.mk>