Index: head/multimedia/webcamd/Makefile
===================================================================
--- head/multimedia/webcamd/Makefile	(revision 487417)
+++ head/multimedia/webcamd/Makefile	(revision 487418)
@@ -1,91 +1,91 @@
 # Created by: Andrew Thompson <thompsa@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	webcamd
 PORTVERSION=	4.20.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.selasky.org/hans_petter/distfiles/ \
 		http://home.selasky.org/distfiles/
 
 MAINTAINER=	hselasky@FreeBSD.org
 COMMENT=	Port of Linux USB webcam and DVB drivers into userspace
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	v4l_compat>=1.0.20100321:multimedia/v4l_compat
 LIB_DEPENDS=	libv4l1.so:multimedia/libv4l
 
 USES=		pkgconfig tar:bzip2 uidfix
 MAKE_ARGS=	LIBDIR="${LOCALBASE}/lib"
 USE_RC_SUBR=	webcamd
 SUB_FILES=	webcamd.conf
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	CUSE DEBUG HAL VT_CLIENT VT_SERVER DVB INPUT KEYBOARD MOUSE RADIO WEBCAM
 OPTIONS_DEFAULT=DVB HAL INPUT RADIO WEBCAM
 
 .if exists(/usr/lib/libcuse.so)
 OPTIONS_DEFAULT+=	CUSE
 .else
 OPTIONS_EXCLUDE+=	CUSE
 .endif
 
 CUSE_DESC=	Use cuse(3) over multimedia/cuse4bsd-kmod
 CUSE_MAKE_ARGS=		HAVE_CUSE="YES"
 CUSE_SUB_LIST=		LIBCUSE=""
 CUSE_BUILD_DEPENDS_OFF=	cuse4bsd-kmod>=0.1.24:multimedia/cuse4bsd-kmod
 CUSE_LIB_DEPENDS_OFF=	libcuse4bsd.so:multimedia/cuse4bsd-kmod
 CUSE_SUB_LIST_OFF=	LIBCUSE="${LOCALBASE}/lib/libcuse4bsd.so"
 
 HAL_DESC=	Build with HAL and DBUS support
 HAL_LIB_DEPENDS+=	libhal.so:sysutils/hal
 HAL_LIB_DEPENDS+=	libdbus-1.so:devel/dbus
 HAL_MAKE_ARGS=		HAVE_HAL="YES"
 HAL_SUB_LIST=		LIBHAL="${LOCALBASE}/lib/libhal.so:${LOCALBASE}/lib/libdbus-1.so:"
 HAL_SUB_LIST_OFF=	LIBHAL=""
 
 DEBUG_MAKE_ARGS=	HAVE_DEBUG="YES"
 
 VT_CLIENT_DESC=	Build with vTuner client support
 VT_CLIENT_MAKE_ARGS=	HAVE_VTUNER_CLIENT="YES"
 
 VT_SERVER_DESC=	Build with vTuner server support
 VT_SERVER_MAKE_ARGS=	HAVE_VTUNER_SERVER="YES"
 
 DVB_DESC=	Build with USB DVB support (DVB-X, analog TV, ...)
 DVB_MAKE_ARGS=		HAVE_DVB_DRV="YES"
 
 INPUT_DESC=	Build with USB input support (tablet, joystick, HID, IR, ...)
 INPUT_MAKE_ARGS=	HAVE_INPUT_DRV="YES"
 
 KEYBOARD_DESC=	Build with USB keyboard support
 KEYBOARD_MAKE_ARGS=	HAVE_KEYBOARD_DRV="YES"
 
 MOUSE_DESC=	Build with USB mouse support
 MOUSE_MAKE_ARGS=	HAVE_MOUSE_DRV="YES"
 
 RADIO_DESC=	Build with USB radio support
 RADIO_MAKE_ARGS=	HAVE_RADIO_DRV="YES"
 
 WEBCAM_DESC=	Build with USB webcam support (UVC, gspca, ...)
 WEBCAM_MAKE_ARGS=	HAVE_WEBCAM_DRV="YES"
 
 USERS=		webcamd
 GROUPS=		webcamd
 
 MAKE_ARGS+=	HAVE_MAN="YES"
 MAKE_ARGS+=	PTHREAD_LIBS="-lpthread"
 
 do-configure:
 	${MAKE} -C${WRKSRC}/tools/linux_make
 	${MAKE} ${MAKE_ARGS} configure -C${WRKSRC}
 
 post-patch:
 	@(cd ${WRKSRC}/patches && ${SH} ./do_patch.sh)
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/devd
 	${INSTALL_DATA} "${WRKDIR}/webcamd.conf" ${STAGEDIR}${PREFIX}/etc/devd
 
 .include <bsd.port.mk>
Index: head/multimedia/webcamd/files/webcamd.conf.in
===================================================================
--- head/multimedia/webcamd/files/webcamd.conf.in	(revision 487417)
+++ head/multimedia/webcamd/files/webcamd.conf.in	(revision 487418)
@@ -1,70 +1,66 @@
 # Generic USB video devices.
 notify 100 {
 	match "system"		"USB";
 	match "subsystem"	"INTERFACE";
 	match "type"		"ATTACH";
 	match "intclass"	"0x0e";
 	action "%%PREFIX%%/etc/rc.d/webcamd start $cdev";
 };
 
 # Vendor specific USB webcams and DVB devices.
 notify 100 {
 	match "system"		"USB";
 	match "subsystem"	"INTERFACE";
 	match "type"		"ATTACH";
 	match "intclass"	"0xff";
 	action "%%PREFIX%%/etc/rc.d/webcamd start $cdev";
 };
 
 # Unspecified USB webcams and DVB devices.
 notify 100 {
 	match "system"		"USB";
 	match "subsystem"	"INTERFACE";
 	match "type"		"ATTACH";
 	match "intclass"	"0x00";
 	action "%%PREFIX%%/etc/rc.d/webcamd start $cdev";
 };
 
 # Generic USB input devices.
 notify 100 {
 	match "system"		"USB";
 	match "subsystem"	"INTERFACE";
 	match "type"		"ATTACH";
 	match "intclass"	"0x03";
 #
 # Limit HID device attach to Wacom Devices
 # else webcamd might attach to your keyboard
 # and mouse
 #
 	match "vendor"		"0x056a";
 	action "%%PREFIX%%/etc/rc.d/webcamd start $cdev $interface";
 };
 
 # Elantech touchscreen
 notify 100 {
 	match "system"		"USB";
 	match "subsystem"	"INTERFACE";
 	match "type"		"ATTACH";
 
 	match "vendor"		"0x04f3";
 	match "product"		"0x2071";
 
 	action "%%PREFIX%%/etc/rc.d/webcamd start $cdev $interface";
 };
 
 # Logitech gamepad 
 notify 100 {
 	match "system"		"USB";
 	match "subsystem"	"INTERFACE";
 	match "type"		"ATTACH";
 
 	match "vendor"		"0x046d";
-	match "product"		"0xc216";
-
-	match "intclass"	"0x03";
-	match "intsubclass"	"0x00";
-	match "intprotocol"	"0x00";
+	match "product"		"0xc216|0xc219";
 
 	action "%%PREFIX%%/etc/rc.d/webcamd start $cdev $interface";
 };