Index: head/multimedia/libv4l/Makefile
===================================================================
--- head/multimedia/libv4l/Makefile	(revision 531198)
+++ head/multimedia/libv4l/Makefile	(revision 531199)
@@ -1,73 +1,71 @@
 # Created by: Andrew Thompson <thompsa@FreeBSD.org>
 # $FreeBSD$
 # Check v4l_compat and v4l-utils slave ports
 
 PORTNAME?=	libv4l
 PORTVERSION=	1.6.3
 PORTREVISION?=	4
 CATEGORIES=	multimedia
 MASTER_SITES=	http://linuxtv.org/downloads/v4l-utils/:master \
 		LOCAL/kwm:local
 DISTFILES+=	v4l-utils-${PORTVERSION}.tar.bz2:master \
 		linux-3.16.7-dvb-headers.tar.xz:local
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT?=	Video4Linux library
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	dual
 
-LIBV4L_SLAVE?=	no
-
 USES=		tar:bzip2
 WRKSRC=		${WRKDIR}/v4l-utils-${PORTVERSION}
 
-.if ${LIBV4L_SLAVE} != compat
+.if ${PORTNAME} == v4l-utils || ${PORTNAME} == libv4l
 BUILD_DEPENDS+=	v4l_compat>=${PORTVERSION}:multimedia/v4l_compat
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USES+=		gmake iconv jpeg libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-libdvbv5 \
 		--disable-qv4l2 \
 		--without-libudev
 INSTALL_TARGET=	install-strip
 
-. if ${LIBV4L_SLAVE} == utils
+. if ${PORTNAME} == v4l-utils
 BUILD_DEPENDS+=	libv4l>=${PORTVERSION}:multimedia/libv4l
 LIB_DEPENDS+=	libargp.so:devel/argp-standalone \
 		libv4l2.so:multimedia/libv4l
 # Disabling building libv4l in the utils slave is too much hackery
 # Lets wait for subpackages
 CONFIGURE_ARGS+=--enable-v4l-utils
 . else
 CONFIGURE_ARGS+=--disable-v4l-utils --enable-libv4l
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-configure
 . endif
 .endif
 
 HEADER_PATCHES=	extra-linux_dvb_ca.h \
 		extra-linux_dvb_osd.h \
 		patch-include_linux_dvb_frontend.h \
 		patch-include_linux_dvb_video.h
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$libdir/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
 		${WRKSRC}/configure
 # fix weird types, except a few headers which have compat code for these types.
 	@${FIND} ${WRKDIR} -type f \( -iname "*.h" ! -iname "input.h" ! -iname "videodev2.h" \) | \
 		${XARGS} -n 10 ${REINPLACE_CMD} \
 		-e 's|linux/types.h|sys/types.h|g; s|__user||g; \
 		s|__u8|uint8_t|g; s|__s8|int8_t|g; \
 		s|__u16|uint16_t|g; s|__s16|int16_t|g; \
 		s|__u32|uint32_t|g; s|__s32|int32_t|g; \
 		s|__u64|uint64_t|g; s|__s64|int64_t|g'
-.if ${LIBV4L_SLAVE} == compat
+.if ${PORTNAME} == v4l_compat
 .for patch in ${HEADER_PATCHES}
 	@cd ${WRKDIR}/linux && ${PATCH} -p2 < ${FILESDIR}/${patch}
 .endfor
 .endif
 
 .include <bsd.port.mk>
Index: head/multimedia/v4l-utils/Makefile
===================================================================
--- head/multimedia/v4l-utils/Makefile	(revision 531198)
+++ head/multimedia/v4l-utils/Makefile	(revision 531199)
@@ -1,20 +1,19 @@
 # Created by: Juergen Lock <nox@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME?=	v4l-utils
 PORTREVISION=	0
 
 COMMENT=	Video4Linux utilities
 
 MASTERDIR=	${.CURDIR}/../libv4l
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
-LIBV4L_SLAVE=   utils
 
 INSTALL_WRKSRC=	${WRKSRC}/utils
 
 # no need for udev rules
 post-install:
 	@${RM} -r ${STAGEDIR}/lib/udev
 
 .include "${MASTERDIR}/Makefile"
Index: head/multimedia/v4l_compat/Makefile
===================================================================
--- head/multimedia/v4l_compat/Makefile	(revision 531198)
+++ head/multimedia/v4l_compat/Makefile	(revision 531199)
@@ -1,42 +1,41 @@
 # $FreeBSD$
 
 PORTNAME=	v4l_compat
 PORTREVISION=	3
 
 COMMENT=	Video4Linux IOCTL header files
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 MASTERDIR=	${.CURDIR}/../libv4l
 EXTRADIR=	${WRKSRC}/../linux
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
-LIBV4L_SLAVE=	compat
 
 BASE_HEADERS=	ivtv.h v4l2-controls.h \
 		v4l2-common.h videodev2.h
 DVB_HEADERS=	audio.h dmx.h frontend.h video.h
 EXTRA_HEADERS=	ca.h net.h osd.h version.h
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/linux/dvb/
 .for i in ${BASE_HEADERS}
 	${INSTALL_DATA} ${WRKSRC}/contrib/freebsd/include/linux/${i} \
 		${STAGEDIR}${PREFIX}/include/linux/
 .endfor
 .for i in ${DVB_HEADERS}
 	${INSTALL_DATA} ${WRKSRC}/include/linux/dvb/${i} \
 		${STAGEDIR}${PREFIX}/include/linux/dvb
 .endfor
 # V4L1 is dead in linux, however webcamd still supports it.
 	${INSTALL_DATA} ${FILESDIR}/videodev.h \
 		${STAGEDIR}${PREFIX}/include/linux/
 # Extra dvb headers supplied taken from the linux kernel distfile.
 # vdr and the gst dvb plugin need them at least
 .for i in ${EXTRA_HEADERS}
 	${INSTALL_DATA} ${EXTRADIR}/dvb/${i} \
 		${STAGEDIR}${PREFIX}/include/linux/dvb/
 .endfor
 
 .include "${MASTERDIR}/Makefile"