11 files changed, 12 insertions, 168 deletions

diff --git a/multimedia/pvrxxx/Makefile b/multimedia/pvrxxx/Makefile
index 893ab91c2b12..39834c7f9bf7 100644
--- a/multimedia/pvrxxx/Makefile
+++ b/multimedia/pvrxxx/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	pvr250
-PORTVERSION=	20041230
-PORTREVISION=	1
+PORTVERSION=	20050412
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.mavetju.org/download/adopted/
 DISTFILES=	${CXMSHAR} hcwPVRP2.sys ${PVRTOOLS}.tar.gz
@@ -17,7 +16,7 @@ IGNOREFILES=	hcwPVRP2.sys	# Varies from month to month
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	Hauppauge PVR-250/350 TV cards driver for the cxm device
 
-PVRTOOLS=	pvr250-1.1
+PVRTOOLS=	pvr250-1.2
 CXMSHAR=	cxm-${PORTVERSION}.shar
 
 WRKSRC=		${WRKDIR}
@@ -28,46 +27,11 @@ RESTRICTED=	"This port uses a binary driver which is owned by Hauppauge"
 NO_PACKAGE=	${RESTRICTED}
 NO_CDROM=	${RESTRICTED}
 
-OPTIONS=	USBROADCAST	"US Broadcast"	Off \
-		USCABLE		"US Cable" Off \
-		BGBROADCAST	"B/G Broadcast" Off \
-		BGCABLE		"B/G Cable" Off \
-		BGAUSTRALIA	"B/G Australia" Off \
-		IBROADCAST	"I Broadcast" Off \
-		LBROADCAST	"L Broadcast" Off
-
 MAN4=		cxm.4
-
-pre-everything::
-	@${ECHO_CMD} "Some tuners (for example the Philips FQ1216M) supports multiple standards."
-	@${ECHO_CMD} "Use the following configuration screen (or 'make config') to choose your local  TV channel system if you have such a tuner."
-	@${ECHO_CMD} "At this moment only the Philips FQ1216M is known to do this. If you don't have  one, just ignore it. If you have one, select one (1) entry."
-	@sleep 5
+MAN1=		pvr250-setchannel.1
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_USBROADCAST)
-EXTRA_PATCHES=	${FILESDIR}/patchtuner-usbroadcast
-.endif
-.if defined(WITH_USCABLE)
-EXTRA_PATCHES=	${FILESDIR}/patchtuner-uscable
-.endif
-.if defined(WITH_BGBROADCAST)
-EXTRA_PATCHES=	${FILESDIR}/patchtuner-bgbroadcast
-.endif
-.if defined(WITH_BGCABLE)
-EXTRA_PATCHES=	${FILESDIR}/patchtuner-bgcable
-.endif
-.if defined(WITH_BGAUSTRALIA)
-EXTRA_PATCHES=	${FILESDIR}/patchtuner-bgaustralia
-.endif
-.if defined(WITH_IBROADCAST)
-EXTRA_PATCHES=	${FILESDIR}/patchtuner-ibroadcast
-.endif
-.if defined(WITH_LBROADCAST)
-EXTRA_PATCHES=	${FILESDIR}/patchtuner-lbroadcast
-.endif
-
 .if ${OSVERSION} < 500000
 MODULESDIR=	/modules
 .else
@@ -109,8 +73,7 @@ do-extract:
 post-patch:
 .if ${OSVERSION} > 500000
 	${REINPLACE_CMD} -e 's/bktr0/cxm0/' \
-		${WRKDIR}/${PVRTOOLS}/setchannel.c \
-		${WRKDIR}/${PVRTOOLS}/setsize.c
+		${WRKDIR}/${PVRTOOLS}/setchannel.c
 .endif
 
 do-configure:
@@ -126,8 +89,8 @@ do-install:
 	${INSTALL_DATA} ${WRKDIR}/modules/cxm/cxm/cxm.ko ${MODULESDIR}
 	${INSTALL_DATA} ${WRKDIR}/modules/cxm/cxm_iic/cxm_iic.ko ${MODULESDIR}
 	${INSTALL_MAN} ${WRKDIR}/${PVRTOOLS}/cxm.4 ${PREFIX}/man/man4/cxm.4
+	${INSTALL_MAN} ${WRKDIR}/${PVRTOOLS}/pvr250-setchannel.1 ${PREFIX}/man/man1/pvr250-setchannel.1
 	${INSTALL_PROGRAM} ${WRKDIR}/${PVRTOOLS}/setchannel ${PREFIX}/bin/pvr250-setchannel
-	${INSTALL_PROGRAM} ${WRKDIR}/${PVRTOOLS}/setsize ${PREFIX}/bin/pvr250-setsize
 .if ${OSVERSION} < 500000
 	cd /dev; \
 	./MAKEDEV bktr0
diff --git a/multimedia/pvrxxx/distinfo b/multimedia/pvrxxx/distinfo
index 81cbb5cca4a0..d8708a9248c8 100644
--- a/multimedia/pvrxxx/distinfo
+++ b/multimedia/pvrxxx/distinfo
@@ -1,5 +1,5 @@
-MD5 (cxm-20041230.shar) = bf799b3559cb6fdb2dd8a81c88a19e78
-SIZE (cxm-20041230.shar) = 184990
-MD5 (pvr250-1.1.tar.gz) = 85fe46157fafead2ad7f4dd76bf192cc
-SIZE (pvr250-1.1.tar.gz) = 2372
+MD5 (cxm-20050412.shar) = 60f9db9f23ea2efdad5e6d1bbbd5d390
+SIZE (cxm-20050412.shar) = 195369
+MD5 (pvr250-1.2.tar.gz) = ab6bd568158db4c45789777babe672c1
+SIZE (pvr250-1.2.tar.gz) = 3946
 MD5 (hcwPVRP2.sys) = IGNORE
diff --git a/multimedia/pvrxxx/files/patchtuner-bgaustralia b/multimedia/pvrxxx/files/patchtuner-bgaustralia
deleted file mode 100644
index ced226ac7e7d..000000000000
--- a/multimedia/pvrxxx/files/patchtuner-bgaustralia
+++ /dev/null
@@ -1,11 +0,0 @@
---- dev/cxm/cxm_tuner.c.org	Fri Oct 15 21:31:06 2004
-+++ dev/cxm/cxm_tuner.c	Fri Oct 15 21:31:24 2004
-@@ -227,7 +227,7 @@
- 		  { 48250, { 0x8e, 0xa0 } } },
- 		0, 0,
- 		{ 0 },
--		{ &l_air_channels, NULL } },
-+		{ &bg_australia_channels, NULL } },
- 	{ "Philips FI1236 MK2",
- 		CXM_TUNER_TV_SYSTEM_MN,
- 		{ { 0 }, { 0 }, { 0 }, { 0 }, { 0 } },
diff --git a/multimedia/pvrxxx/files/patchtuner-bgbroadcast b/multimedia/pvrxxx/files/patchtuner-bgbroadcast
deleted file mode 100644
index fe56272487bd..000000000000
--- a/multimedia/pvrxxx/files/patchtuner-bgbroadcast
+++ /dev/null
@@ -1,11 +0,0 @@
---- dev/cxm/cxm_tuner.c.org	Fri Oct 15 21:31:06 2004
-+++ dev/cxm/cxm_tuner.c	Fri Oct 15 21:31:24 2004
-@@ -227,7 +227,7 @@
- 		  { 48250, { 0x8e, 0xa0 } } },
- 		0, 0,
- 		{ 0 },
--		{ &l_air_channels, NULL } },
-+		{ &bg_air_channels, NULL } },
- 	{ "Philips FI1236 MK2",
- 		CXM_TUNER_TV_SYSTEM_MN,
- 		{ { 0 }, { 0 }, { 0 }, { 0 }, { 0 } },
diff --git a/multimedia/pvrxxx/files/patchtuner-bgcable b/multimedia/pvrxxx/files/patchtuner-bgcable
deleted file mode 100644
index 5bf66d8cc90f..000000000000
--- a/multimedia/pvrxxx/files/patchtuner-bgcable
+++ /dev/null
@@ -1,48 +0,0 @@
---- dev/cxm/cxm_tuner.c.org	Wed Jan 19 00:36:54 2005
-+++ dev/cxm/cxm_tuner.c	Wed Jan 19 00:39:46 2005
-@@ -128,6 +128,27 @@
- };
- 
- static const struct cxm_tuner_channels
-+bg_cable_channels = {
-+	"B/G Cable",
-+	CXM_TUNER_TV_SYSTEM_BG,
-+	1,
-+	120,
-+	38900,
-+	{ { 121, 38900, 0},
-+	  { 100, 303250, 8000 },
-+	  { 90, 231250, 7000 },
-+	  { 80, 105250, 7000 },
-+	  { 74, 69250, 7000 },
-+	  { 21, 471250, 8000 },
-+	  { 17, 183250, 9000 },
-+	  { 16, 175250, 9000 },
-+	  { 15, 82250, 8500 },
-+	  { 13, 53750, 8500 },
-+	  { 5, 175250, 7000 },
-+	  { 2, 48250, 7000 } }
-+};
-+
-+static const struct cxm_tuner_channels
- bg_australia_channels = {
- 	"B/G Australia",
- 	CXM_TUNER_TV_SYSTEM_BG,
-@@ -316,7 +337,7 @@
- 		  { 48250, { 0x8e, 0xa0 } } },
- 		0, 0,
- 		{ 0 },
--		{ &bg_air_channels, NULL } },
-+		{ &bg_cable_channels, NULL } },
- 	{ "LG Innotek TPI8PSB01N",
- 		{ CXM_TUNER_TV_SYSTEM_BG, cxm_none_system_code_style },
- 		48250, 855250,
-@@ -325,7 +346,7 @@
- 		  { 48250, { 0x8e, 0xa0 } } },
- 		87500, 108000,
- 		{ 87500, { 0x88, 0xa5 } },
--		{ &bg_air_channels, NULL } },
-+		{ &bg_cable_channels, NULL } },
- 	{ "LG Innotek TAPC-H701F",
- 		{ CXM_TUNER_TV_SYSTEM_MN, cxm_none_system_code_style },
- 		55250, 801250,
diff --git a/multimedia/pvrxxx/files/patchtuner-ibroadcast b/multimedia/pvrxxx/files/patchtuner-ibroadcast
deleted file mode 100644
index a849446ea525..000000000000
--- a/multimedia/pvrxxx/files/patchtuner-ibroadcast
+++ /dev/null
@@ -1,11 +0,0 @@
---- dev/cxm/cxm_tuner.c.org	Fri Oct 15 21:31:06 2004
-+++ dev/cxm/cxm_tuner.c	Fri Oct 15 21:31:24 2004
-@@ -227,7 +227,7 @@
- 		  { 48250, { 0x8e, 0xa0 } } },
- 		0, 0,
- 		{ 0 },
--		{ &l_air_channels, NULL } },
-+		{ &i_air_channels, NULL } },
- 	{ "Philips FI1236 MK2",
- 		CXM_TUNER_TV_SYSTEM_MN,
- 		{ { 0 }, { 0 }, { 0 }, { 0 }, { 0 } },
diff --git a/multimedia/pvrxxx/files/patchtuner-lbroadcast b/multimedia/pvrxxx/files/patchtuner-lbroadcast
deleted file mode 100644
index 62481031b8ca..000000000000
--- a/multimedia/pvrxxx/files/patchtuner-lbroadcast
+++ /dev/null
@@ -1,11 +0,0 @@
---- dev/cxm/cxm_tuner.c.org	Fri Oct 15 21:31:06 2004
-+++ dev/cxm/cxm_tuner.c	Fri Oct 15 21:31:24 2004
-@@ -227,7 +227,7 @@
- 		  { 48250, { 0x8e, 0xa0 } } },
- 		0, 0,
- 		{ 0 },
--		{ &l_air_channels, NULL } },
-+		{ &l_air_channels, NULL } },
- 	{ "Philips FI1236 MK2",
- 		CXM_TUNER_TV_SYSTEM_MN,
- 		{ { 0 }, { 0 }, { 0 }, { 0 }, { 0 } },
diff --git a/multimedia/pvrxxx/files/patchtuner-usbroadcast b/multimedia/pvrxxx/files/patchtuner-usbroadcast
deleted file mode 100644
index 6ed81cd14d43..000000000000
--- a/multimedia/pvrxxx/files/patchtuner-usbroadcast
+++ /dev/null
@@ -1,11 +0,0 @@
---- dev/cxm/cxm_tuner.c.org	Fri Oct 15 21:31:06 2004
-+++ dev/cxm/cxm_tuner.c	Fri Oct 15 21:31:24 2004
-@@ -227,7 +227,7 @@
- 		  { 48250, { 0x8e, 0xa0 } } },
- 		0, 0,
- 		{ 0 },
--		{ &l_air_channels, NULL } },
-+		{ &us_air_channels, NULL } },
- 	{ "Philips FI1236 MK2",
- 		CXM_TUNER_TV_SYSTEM_MN,
- 		{ { 0 }, { 0 }, { 0 }, { 0 }, { 0 } },
diff --git a/multimedia/pvrxxx/files/patchtuner-uscable b/multimedia/pvrxxx/files/patchtuner-uscable
deleted file mode 100644
index 7efe23a85125..000000000000
--- a/multimedia/pvrxxx/files/patchtuner-uscable
+++ /dev/null
@@ -1,11 +0,0 @@
---- dev/cxm/cxm_tuner.c.org	Fri Oct 15 21:31:06 2004
-+++ dev/cxm/cxm_tuner.c	Fri Oct 15 21:31:24 2004
-@@ -227,7 +227,7 @@
- 		  { 48250, { 0x8e, 0xa0 } } },
- 		0, 0,
- 		{ 0 },
--		{ &l_air_channels, NULL } },
-+		{ &us_cable_channels, NULL } },
- 	{ "Philips FI1236 MK2",
- 		CXM_TUNER_TV_SYSTEM_MN,
- 		{ { 0 }, { 0 }, { 0 }, { 0 }, { 0 } },
diff --git a/multimedia/pvrxxx/pkg-descr b/multimedia/pvrxxx/pkg-descr
index 1ef392fc4994..2a74beea7605 100644
--- a/multimedia/pvrxxx/pkg-descr
+++ b/multimedia/pvrxxx/pkg-descr
@@ -9,17 +9,13 @@ This port contains:
 
   This driver has been successfully tested on:
   - FreeBSD 4.10
-  - FreeBSD 5.2.1
+  - FreeBSD 5.3
 
-- Two simple programs to modify some ioctls on the card: set the
-  channel and set the window size.
+- One program to modify some ioctls on the card: set the channel
+  and set the window size.
 
 Note:
 
-- The configuration screen is only applicable for the the Philips
-  FQ1216M tuner. For other tuners ignore this section. Select just
-  one entry.
-
 - Note: the maintainer of this port has no inside knowledge of the
   workings of this software. Please don't contact me about cards
   which don't work. Please contact me about problems with the port,
diff --git a/multimedia/pvrxxx/pkg-plist b/multimedia/pvrxxx/pkg-plist
index d2d44efd56b2..b54e49d1e69b 100644
--- a/multimedia/pvrxxx/pkg-plist
+++ b/multimedia/pvrxxx/pkg-plist
@@ -1,4 +1,3 @@
 @unexec rm %%MODULESDIR%%/cxm.ko
 @unexec rm %%MODULESDIR%%/cxm_iic.ko
 bin/pvr250-setchannel
-bin/pvr250-setsize