4 files changed, 15 insertions, 16 deletions

diff --git a/multimedia/cx88/Makefile b/multimedia/cx88/Makefile
index fd9eb4751d9a..848e77e2e9cb 100644
--- a/multimedia/cx88/Makefile
+++ b/multimedia/cx88/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	cx88
-PORTVERSION=	1.1.0
+PORTVERSION=	1.2.0
 CATEGORIES=	multimedia kld
 MASTER_SITES=	ftp://corona.homeunix.net/ports/cx88/
 
 MAINTAINER=	jason.harmening@gmail.com
-COMMENT=	Drivers for Conexant CX23880/1/2/3-based TV/radio capture cards
+COMMENT=	Drivers for Conexant CX23880/1/2/3/5/7/8-based TV/radio capture cards
 
 LIB_DEPENDS=	tuner:${PORTSDIR}/multimedia/libtuner
 BUILD_DEPENDS=	${LOCALBASE}/lib/libezxml.a:${PORTSDIR}/textproc/ezxml
@@ -19,13 +19,12 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libezxml.a:${PORTSDIR}/textproc/ezxml
 KMODDIR=	/boot/modules
 PLIST_SUB+=	KMODDIR=${KMODDIR}
 MAKE_ARGS+=	LIBTUNER_LIB=${LOCALBASE}/lib/libtuner LIBTUNER_HEADER=${LOCALBASE}/include/libtuner KMODDIR=${KMODDIR}
+MAKE_JOBS_UNSAFE=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 700055
 IGNORE=		requires FreeBSD 7.0-RELEASE or later
-.elif ${OSVERSION} >= 800000
-BROKEN=		does not build
 .endif
 
 .if !exists(/usr/src/sys/Makefile)
diff --git a/multimedia/cx88/distinfo b/multimedia/cx88/distinfo
index eb7c0113e849..08025f20f8bf 100644
--- a/multimedia/cx88/distinfo
+++ b/multimedia/cx88/distinfo
@@ -1,3 +1,3 @@
-MD5 (cx88-1.1.0.tar.gz) = 450d6d989d6ea3203f6175aa25c6a62d
-SHA256 (cx88-1.1.0.tar.gz) = 1bf37ef1e940513926fcf40dd3573b3bc82ba9116d54249c3e19c1b2ed20805d
-SIZE (cx88-1.1.0.tar.gz) = 134386
+MD5 (cx88-1.2.0.tar.gz) = 3146890105b709e7a484fbbf2e291e29
+SHA256 (cx88-1.2.0.tar.gz) = b00eedd03002a945867d02fe770d39ab5f04315c10b6e0a6f5dc578644605445
+SIZE (cx88-1.2.0.tar.gz) = 143665
diff --git a/multimedia/cx88/pkg-descr b/multimedia/cx88/pkg-descr
index 4aca6eca45de..df61362e6370 100644
--- a/multimedia/cx88/pkg-descr
+++ b/multimedia/cx88/pkg-descr
@@ -1,7 +1,8 @@
-cx88 provides drivers for TV/radio capture cards based on
-the Conexant CX23880/1/2/3 series of chips.  This port
-includes the cx88 kernel drivers as well as a simple app
-for HDTV capture.  It requires multimedia/libtuner for 
-channel selection and peripheral configuration.
+cx88 provides drivers for PCI and PCI-e TV/radio capture
+cards based on the Conexant CX23880/1/2/3 and CX23885/7/8 
+chip families.  This port includes the cx88 kernel drivers
+as well as a simple app for TV capture. It requires 
+multimedia/libtuner for channel selection and peripheral
+configuration.
 
 WWW: http://corona.homeunix.net/cx88wiki
diff --git a/multimedia/cx88/pkg-plist b/multimedia/cx88/pkg-plist
index 2eaf11fbcd26..c9749124ac5e 100644
--- a/multimedia/cx88/pkg-plist
+++ b/multimedia/cx88/pkg-plist
@@ -4,13 +4,10 @@ bin/cx88
 %%DATADIR%%/or51132_qam.fw
 %%EXAMPLESDIR%%/cx88_audio_enable.cpp
 %%EXAMPLESDIR%%/remote.cpp
+%%EXAMPLESDIR%%/cx88_mpeg_client.cpp
 %%EXAMPLESDIR%%/hd3k_analog_kbuf.cpp
 %%EXAMPLESDIR%%/tuner_config
-%%EXAMPLESDIR%%/hd3k_mpeg_ubuf.cpp
-%%EXAMPLESDIR%%/hd5k_mpeg_ubuf.cpp
-%%EXAMPLESDIR%%/hd3k_mpeg_kbuf.cpp
 %%EXAMPLESDIR%%/cx88_audio_client.cpp
-%%EXAMPLESDIR%%/hd5k_mpeg_kbuf.cpp
 %%EXAMPLESDIR%%/hd3k_analog_ubuf.cpp
 %%EXAMPLESDIR%%/hd5k_analog_ubuf.cpp
 include/iicdev/iicdev_ioctl.h
@@ -27,8 +24,10 @@ cx88.ko
 cx88i2c.ko
 iicdev.ko
 cx88ir.ko
+cx88mpegcore.ko
 cx88mpeg.ko
 cx88video.ko
 cx88audio.ko
+cx23885.ko
 @exec kldxref %D
 @unexec kldxref %D