4 files changed, 38 insertions, 42 deletions

diff --git a/multimedia/v4l_compat/Makefile b/multimedia/v4l_compat/Makefile
index defd3a3cc36f..1d98d2c024ee 100644
--- a/multimedia/v4l_compat/Makefile
+++ b/multimedia/v4l_compat/Makefile
@@ -1,26 +1,42 @@
 # $FreeBSD$
 
 PORTNAME=	v4l_compat
-PORTVERSION=	1.0.${DUMMYDATE}
-PORTREVISION=	1
-CATEGORIES=	multimedia
-MASTER_SITES=	LOCAL/kwm
+PORTREVISION=	0
 
-MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Video4Linux IOCTL header files
 
-LICENSE=	GPLv2
-
-DUMMYDATE=	20120501
-
 NO_BUILD=	yes
 NO_ARCH=	yes
-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
+
+MASTERDIR=	${.CURDIR}/../../multimedia/libv4l
+EXTRADIR=	${WRKSRC}/../linux
+DESCR=		${.CURDIR}/pkg-descr
+PLIST=		${.CURDIR}/pkg-plist
+LIBV4L_SLAVE=	compat
+
+BASE_HEADERS=	input.h uinput.h ivtv.h v4l2-controls.h \
+		v4l2-common.h videodev2.h
+DVB_HEADERS=	audio.h dmx.h frontend.h video.h
+EXTRA_HEADERS=	ca.h osd.h version.h
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/include/linux/dvb
-	cd ${WRKSRC}; ${INSTALL_DATA} ${BASE_HEADERS} ${STAGEDIR}${PREFIX}/include/linux/
-	cd ${WRKSRC}/dvb; ${INSTALL_DATA} ${DVB_HEADERS} ${STAGEDIR}${PREFIX}/include/linux/dvb/
+	@${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 <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/v4l_compat/distinfo b/multimedia/v4l_compat/distinfo
deleted file mode 100644
index dff720a6f766..000000000000
--- a/multimedia/v4l_compat/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (v4l_compat-1.0.20120501.tar.gz) = 0bc375a36f450ad7f665996ca3d9efcffa63d9befcdf3214412f0a1e82d68b30
-SIZE (v4l_compat-1.0.20120501.tar.gz) = 63578
diff --git a/multimedia/v4l_compat/files/patch-dvb-ca.h b/multimedia/v4l_compat/files/patch-dvb-ca.h
deleted file mode 100644
index bc42f2e9cdca..000000000000
--- a/multimedia/v4l_compat/files/patch-dvb-ca.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- dvb/ca.h.orig
-+++ dvb/ca.h
-@@ -80,9 +80,17 @@ typedef struct ca_pid {
- 
- #define CA_RESET          _IO('o', 128)
- #define CA_GET_CAP        _IOR('o', 129, ca_caps_t)
-+
-+/* At least CA_GET_SLOT_INFO and CA_GET_MSG need to be _IOWR not _IOR.
-+ * This is wrong on Linux too but there the driver doesn't care.
-+ *
- #define CA_GET_SLOT_INFO  _IOR('o', 130, ca_slot_info_t)
- #define CA_GET_DESCR_INFO _IOR('o', 131, ca_descr_info_t)
- #define CA_GET_MSG        _IOR('o', 132, ca_msg_t)
-+ */
-+#define CA_GET_SLOT_INFO  _IOWR('o', 130, ca_slot_info_t)
-+#define CA_GET_DESCR_INFO _IOR('o', 131, ca_descr_info_t)
-+#define CA_GET_MSG        _IOWR('o', 132, ca_msg_t)
- #define CA_SEND_MSG       _IOW('o', 133, ca_msg_t)
- #define CA_SET_DESCR      _IOW('o', 134, ca_descr_t)
- #define CA_SET_PID        _IOW('o', 135, ca_pid_t)
diff --git a/multimedia/v4l_compat/pkg-plist b/multimedia/v4l_compat/pkg-plist
index a04fd2869d18..3296ca9c5e1f 100644
--- a/multimedia/v4l_compat/pkg-plist
+++ b/multimedia/v4l_compat/pkg-plist
@@ -1,12 +1,14 @@
-include/linux/input.h
-include/linux/uinput.h
-include/linux/videodev.h
-include/linux/videodev2.h
 include/linux/dvb/audio.h
 include/linux/dvb/ca.h
 include/linux/dvb/dmx.h
 include/linux/dvb/frontend.h
-include/linux/dvb/net.h
 include/linux/dvb/osd.h
 include/linux/dvb/version.h
 include/linux/dvb/video.h
+include/linux/input.h
+include/linux/ivtv.h
+include/linux/uinput.h
+include/linux/v4l2-common.h
+include/linux/v4l2-controls.h
+include/linux/videodev.h
+include/linux/videodev2.h