Index: multimedia/v4l_compat/Makefile
===================================================================
RCS file: /home/pcvs/ports/multimedia/v4l_compat/Makefile,v
retrieving revision 1.8
diff -a -u -r1.8 Makefile
--- multimedia/v4l_compat/Makefile	7 Jan 2011 13:46:58 -0000	1.8
+++ multimedia/v4l_compat/Makefile	4 Jun 2011 08:14:59 -0000
@@ -7,16 +7,15 @@
 
 PORTNAME=	v4l_compat
 PORTVERSION=	1.0.${DUMMYDATE}
-PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	LOCAL/kwm
-DUMMYDATE=	20101027
+DUMMYDATE=	20110603
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Video4Linux IOCTL header files
 
 NO_BUILD=	yes
-BASE_HEADERS=	videodev.h videodev2.h
+BASE_HEADERS=	input.h uinput.h videodev.h videodev2.h
 DVB_HEADERS=	audio.h ca.h dmx.h frontend.h net.h osd.h version.h video.h
 
 do-install:
Index: multimedia/v4l_compat/distinfo
===================================================================
RCS file: /home/pcvs/ports/multimedia/v4l_compat/distinfo,v
retrieving revision 1.3
diff -a -u -r1.3 distinfo
--- multimedia/v4l_compat/distinfo	4 Nov 2010 20:47:25 -0000	1.3
+++ multimedia/v4l_compat/distinfo	4 Jun 2011 08:14:59 -0000
@@ -1,2 +1,2 @@
-SHA256 (v4l_compat-1.0.20101027.tar.gz) = fe6237bf237e9377b297985358f476a7a476d4b1bf032891a37e39efe3cfbdc0
-SIZE (v4l_compat-1.0.20101027.tar.gz) = 40644
+SHA256 (v4l_compat-1.0.20110603.tar.gz) = eb7a81735ace6b4b5e241e3e072767f51a8882a5bcc075407b9e359fcbe72a39
+SIZE (v4l_compat-1.0.20110603.tar.gz) = 57273
Index: multimedia/v4l_compat/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/multimedia/v4l_compat/pkg-plist,v
retrieving revision 1.3
diff -a -u -r1.3 pkg-plist
--- multimedia/v4l_compat/pkg-plist	25 Mar 2010 13:50:31 -0000	1.3
+++ multimedia/v4l_compat/pkg-plist	4 Jun 2011 08:14:59 -0000
@@ -1,3 +1,5 @@
+include/linux/input.h
+include/linux/uinput.h
 include/linux/videodev.h
 include/linux/videodev2.h
 include/linux/dvb/audio.h
Index: multimedia/v4l_compat/files/patch-videodev2.h
===================================================================
RCS file: multimedia/v4l_compat/files/patch-videodev2.h
diff -N multimedia/v4l_compat/files/patch-videodev2.h
--- multimedia/v4l_compat/files/patch-videodev2.h	7 Jan 2011 13:46:59 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,35 +0,0 @@
---- videodev2.h.orig	2011-01-07 14:10:29.000000000 +0100
-+++ videodev2.h	2011-01-07 14:11:23.000000000 +0100
-@@ -62,16 +62,32 @@
- 
- #ifndef HAVE_LINUX_INTEGER_TYPES
- /* XXX remove when depending software has been updated */
-+#ifndef __u64
- typedef uint64_t __u64;
-+#endif
-+#ifndef __u32
- typedef uint32_t __u32;
-+#endif
-+#ifndef __u16
- typedef uint16_t __u16;
-+#endif
-+#ifndef __u8
- typedef uint8_t __u8;
-+#endif
- 
-+#ifndef __s64
- typedef int64_t __s64;
-+#endif
-+#ifndef __s32
- typedef int32_t __s32;
-+#endif
-+#ifndef __s16
- typedef int16_t __s16;
-+#endif
-+#ifndef __s8
- typedef int8_t __s8;
- #endif
-+#endif
- 
- /*
-  * Common stuff for both V4L1 and V4L2
Index: multimedia/libv4l/Makefile
===================================================================
RCS file: /home/pcvs/ports/multimedia/libv4l/Makefile,v
retrieving revision 1.3
diff -a -u -r1.3 Makefile
--- multimedia/libv4l/Makefile	4 Nov 2010 20:49:04 -0000	1.3
+++ multimedia/libv4l/Makefile	4 Jun 2011 08:14:59 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libv4l
-PORTVERSION=	0.8.1
+PORTVERSION=	0.8.4
 CATEGORIES=	multimedia
 MASTER_SITES=	http://linuxtv.org/downloads/v4l-utils/
 DISTNAME=	v4l-utils-${PORTVERSION}
@@ -14,12 +14,15 @@
 MAINTAINER=	hselasky@FreeBSD.org
 COMMENT=	Video4Linux library
 
-BUILD_DEPENDS=	v4l_compat>=1.0.20101027:${PORTSDIR}/multimedia/v4l_compat
+BUILD_DEPENDS=	v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat
+LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg
 
-MAKE_ARGS=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" LIBDIR="${PREFIX}/lib"
+MAKE_ARGS=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" LIBDIR="${PREFIX}/lib"
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
+MAKE_JOBS_SAFE=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/lib
 
Index: multimedia/libv4l/distinfo
===================================================================
RCS file: /home/pcvs/ports/multimedia/libv4l/distinfo,v
retrieving revision 1.3
diff -a -u -r1.3 distinfo
--- multimedia/libv4l/distinfo	4 Nov 2010 20:49:04 -0000	1.3
+++ multimedia/libv4l/distinfo	4 Jun 2011 08:14:59 -0000
@@ -1,2 +1,2 @@
-SHA256 (v4l-utils-0.8.1.tar.bz2) = 2b03003f1e081c5c98d1fe287c0d88a6c720ca972c4d80a1782146bbde1ac5ea
-SIZE (v4l-utils-0.8.1.tar.bz2) = 287114
+SHA256 (v4l-utils-0.8.4.tar.bz2) = 20bf73b0c2255dfc6ae82806ec8a663e00ab039df9ee6eadae633466841c0dd7
+SIZE (v4l-utils-0.8.4.tar.bz2) = 348601
Index: multimedia/libv4l/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/multimedia/libv4l/pkg-plist,v
retrieving revision 1.1
diff -a -u -r1.1 pkg-plist
--- multimedia/libv4l/pkg-plist	16 Jan 2010 20:46:33 -0000	1.1
+++ multimedia/libv4l/pkg-plist	4 Jun 2011 08:14:59 -0000
@@ -1,17 +1,18 @@
-include/libv4lconvert.h
-include/libv4l2.h
+include/libv4l1-videodev.h
 include/libv4l1.h
+include/libv4l2.h
+include/libv4lconvert.h
 lib/libv4l/ov511-decomp
 lib/libv4l/ov518-decomp
-lib/libv4l/v4l2convert.so
 lib/libv4l/v4l1compat.so
-lib/libv4lconvert.so.0
+lib/libv4l/v4l2convert.so
+lib/libv4l1.so
+lib/libv4l1.so.0
+lib/libv4l2.so
+lib/libv4l2.so.0
 lib/libv4lconvert.so
-libdata/pkgconfig/libv4lconvert.pc
-libdata/pkgconfig/libv4l2.pc
+lib/libv4lconvert.so.0
 libdata/pkgconfig/libv4l1.pc
-lib/libv4l2.so.0
-lib/libv4l2.so
-lib/libv4l1.so.0
-lib/libv4l1.so
+libdata/pkgconfig/libv4l2.pc
+libdata/pkgconfig/libv4lconvert.pc
 @dirrm lib/libv4l