- Add man-page

- Add setchannel and setsize tools

Submitted by:	edwin@mavetju.org

6 files changed, 68 insertions, 22 deletions

diff --git a/multimedia/pvr250/Makefile b/multimedia/pvr250/Makefile
index d36db169173..a9b1c75f301 100644
--- a/multimedia/pvr250/Makefile
+++ b/multimedia/pvr250/Makefile
@@ -8,14 +8,19 @@
 
 PORTNAME=	pvr250
 PORTVERSION=	200408
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.mavetju.org/download/adopted/
-DISTFILES=	cxm-200408.shar hcwPVRP2.sys
+DISTFILES=	${CXMSHAR} hcwPVRP2.sys ${PVRTOOLS}.tar.gz
 
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	Hauppauge PVR-250/260 TV cards driver for the cxm device
 
+PVRTOOLS=	pvr250-1
+CXMSHAR=	cxm-200408.shar
+
 WRKSRC=		${WRKDIR}
+USE_REINPLACE=	yes
 
 RESTRICTED_FILES=	hcwPVRP2.sys
 RESTRICTED=	"This port uses a binary driver which is owned by Hauppauge"
@@ -29,6 +34,8 @@ OPTIONS=	USBROADCAST	"US Broadcast"	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."
@@ -57,13 +64,14 @@ EXTRA_PATCHES=	${FILESDIR}/patchtuner-lbroadcast
 .endif
 
 .if ${OSVERSION} < 500000
-PREFIX=		/modules
+MODULESDIR=	/modules
 .else
-PREFIX=		/boot/kernel
+MODULESDIR=	/boot/kernel
 .endif
+PLIST_SUB=	MODULESDIR=${MODULESDIR}
 
 .if !exists(${DISTDIR}/hcwPVRP2.sys)
-BROKEN=		You need the file hcwPVRP2.sys from the CD coming with the PVR-250/350 card. Please place this file in ${DISTDIR} and run make again.
+IGNORE=		You need the file hcwPVRP2.sys from the CD coming with the PVR-250/350 card. Please place this file in ${DISTDIR} and run make again.
 .endif
 
 .if !exists(/usr/src/sys/dev/iicbus/iicbb.c)
@@ -90,7 +98,15 @@ patch-iicbb:
 do-extract:
 	${MKDIR} ${WRKDIR}
 	cd ${WRKDIR}; \
-	${SH} ${DISTDIR}/cxm-200408.shar
+	${SH} ${DISTDIR}/${CXMSHAR}; \
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${PVRTOOLS}.tar.gz ${EXTRACT_AFTER_ARGS};
+
+post-patch:
+.if ${OSVERSION} > 500000
+	${REINPLACE_CMD} -e 's/bktr0/cxm0/' \
+		${WRKDIR}/${PVRTOOLS}/setchannel.c \
+		${WRKDIR}/${PVRTOOLS}/setsize.c
+.endif
 
 do-configure:
 	cd ${WRKDIR}/dev/cxm; \
@@ -98,12 +114,15 @@ do-configure:
 	./cxm_extract_fw ${DISTDIR}/hcwPVRP2.sys
 
 do-build:
-	cd ${WRKDIR}/modules/cxm; \
-	${MAKE}
+	cd ${WRKDIR}/modules/cxm; ${MAKE}
+	cd ${WRKDIR}/${PVRTOOLS}; ${MAKE}
 
 do-install:
-	${INSTALL_DATA} ${WRKDIR}/modules/cxm/cxm/cxm.ko ${PREFIX}
-	${INSTALL_DATA} ${WRKDIR}/modules/cxm/cxm_iic/cxm_iic.ko ${PREFIX}
+	${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_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/pvr250/distinfo b/multimedia/pvr250/distinfo
index 71a60e1a3dc..1db0e94e897 100644
--- a/multimedia/pvr250/distinfo
+++ b/multimedia/pvr250/distinfo
@@ -1,4 +1,6 @@
 MD5 (cxm-200408.shar) = a0a766caafef8f93b9adb58d5034cf1c
 SIZE (cxm-200408.shar) = 181292
+MD5 (pvr250-1.tar.gz) = 2340e05199059745e80551ade27cb196
+SIZE (pvr250-1.tar.gz) = 95901
 MD5 (hcwPVRP2.sys) = aa97703bb05e985418bc29fec5b899b9
 SIZE (hcwPVRP2.sys) = 789824
diff --git a/multimedia/pvr250/pkg-plist b/multimedia/pvr250/pkg-plist
index a1933816cf6..d2d44efd56b 100644
--- a/multimedia/pvr250/pkg-plist
+++ b/multimedia/pvr250/pkg-plist
@@ -1,2 +1,4 @@
-cxm.ko
-cxm_iic.ko
+@unexec rm %%MODULESDIR%%/cxm.ko
+@unexec rm %%MODULESDIR%%/cxm_iic.ko
+bin/pvr250-setchannel
+bin/pvr250-setsize
diff --git a/multimedia/pvrxxx/Makefile b/multimedia/pvrxxx/Makefile
index d36db169173..a9b1c75f301 100644
--- a/multimedia/pvrxxx/Makefile
+++ b/multimedia/pvrxxx/Makefile
@@ -8,14 +8,19 @@
 
 PORTNAME=	pvr250
 PORTVERSION=	200408
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.mavetju.org/download/adopted/
-DISTFILES=	cxm-200408.shar hcwPVRP2.sys
+DISTFILES=	${CXMSHAR} hcwPVRP2.sys ${PVRTOOLS}.tar.gz
 
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	Hauppauge PVR-250/260 TV cards driver for the cxm device
 
+PVRTOOLS=	pvr250-1
+CXMSHAR=	cxm-200408.shar
+
 WRKSRC=		${WRKDIR}
+USE_REINPLACE=	yes
 
 RESTRICTED_FILES=	hcwPVRP2.sys
 RESTRICTED=	"This port uses a binary driver which is owned by Hauppauge"
@@ -29,6 +34,8 @@ OPTIONS=	USBROADCAST	"US Broadcast"	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."
@@ -57,13 +64,14 @@ EXTRA_PATCHES=	${FILESDIR}/patchtuner-lbroadcast
 .endif
 
 .if ${OSVERSION} < 500000
-PREFIX=		/modules
+MODULESDIR=	/modules
 .else
-PREFIX=		/boot/kernel
+MODULESDIR=	/boot/kernel
 .endif
+PLIST_SUB=	MODULESDIR=${MODULESDIR}
 
 .if !exists(${DISTDIR}/hcwPVRP2.sys)
-BROKEN=		You need the file hcwPVRP2.sys from the CD coming with the PVR-250/350 card. Please place this file in ${DISTDIR} and run make again.
+IGNORE=		You need the file hcwPVRP2.sys from the CD coming with the PVR-250/350 card. Please place this file in ${DISTDIR} and run make again.
 .endif
 
 .if !exists(/usr/src/sys/dev/iicbus/iicbb.c)
@@ -90,7 +98,15 @@ patch-iicbb:
 do-extract:
 	${MKDIR} ${WRKDIR}
 	cd ${WRKDIR}; \
-	${SH} ${DISTDIR}/cxm-200408.shar
+	${SH} ${DISTDIR}/${CXMSHAR}; \
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${PVRTOOLS}.tar.gz ${EXTRACT_AFTER_ARGS};
+
+post-patch:
+.if ${OSVERSION} > 500000
+	${REINPLACE_CMD} -e 's/bktr0/cxm0/' \
+		${WRKDIR}/${PVRTOOLS}/setchannel.c \
+		${WRKDIR}/${PVRTOOLS}/setsize.c
+.endif
 
 do-configure:
 	cd ${WRKDIR}/dev/cxm; \
@@ -98,12 +114,15 @@ do-configure:
 	./cxm_extract_fw ${DISTDIR}/hcwPVRP2.sys
 
 do-build:
-	cd ${WRKDIR}/modules/cxm; \
-	${MAKE}
+	cd ${WRKDIR}/modules/cxm; ${MAKE}
+	cd ${WRKDIR}/${PVRTOOLS}; ${MAKE}
 
 do-install:
-	${INSTALL_DATA} ${WRKDIR}/modules/cxm/cxm/cxm.ko ${PREFIX}
-	${INSTALL_DATA} ${WRKDIR}/modules/cxm/cxm_iic/cxm_iic.ko ${PREFIX}
+	${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_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 71a60e1a3dc..1db0e94e897 100644
--- a/multimedia/pvrxxx/distinfo
+++ b/multimedia/pvrxxx/distinfo
@@ -1,4 +1,6 @@
 MD5 (cxm-200408.shar) = a0a766caafef8f93b9adb58d5034cf1c
 SIZE (cxm-200408.shar) = 181292
+MD5 (pvr250-1.tar.gz) = 2340e05199059745e80551ade27cb196
+SIZE (pvr250-1.tar.gz) = 95901
 MD5 (hcwPVRP2.sys) = aa97703bb05e985418bc29fec5b899b9
 SIZE (hcwPVRP2.sys) = 789824
diff --git a/multimedia/pvrxxx/pkg-plist b/multimedia/pvrxxx/pkg-plist
index a1933816cf6..d2d44efd56b 100644
--- a/multimedia/pvrxxx/pkg-plist
+++ b/multimedia/pvrxxx/pkg-plist
@@ -1,2 +1,4 @@
-cxm.ko
-cxm_iic.ko
+@unexec rm %%MODULESDIR%%/cxm.ko
+@unexec rm %%MODULESDIR%%/cxm_iic.ko
+bin/pvr250-setchannel
+bin/pvr250-setsize