Update to 20111212. Patches in up0310 and up0345 have been merged.

6 files changed, 6 insertions, 59 deletions

diff --git a/multimedia/ptx-kmod/Makefile b/multimedia/ptx-kmod/Makefile
index 02fe442fa38c..b7d8882afc4b 100644
--- a/multimedia/ptx-kmod/Makefile
+++ b/multimedia/ptx-kmod/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ptx
-PORTVERSION=	0.0.20110326
+PORTVERSION=	0.0.20111212
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	hrs
@@ -20,7 +20,7 @@ LICENSE=	GPLv3
 ONLY_FOR_ARCHS=	amd64 i386
 BUILD_WRKSRC=	${WRKSRC}/dev/ptx
 MAKE_ENV=	KMODDIR=${PREFIX}/${KMODDIR} SYSDIR=${SYSDIR}
-PLIST_FILES=	${KMODDIR}/ptx.ko
+PLIST_FILES=	${KMODDIR}/ptx.ko bin/recptx.pl
 PLIST_DIRS=	${KMODDIR}
 SUB_LIST=	KMODDIR=${KMODDIR}
 USE_RC_SUBR=	ptx.sh
@@ -44,6 +44,7 @@ IGNORE=		requires kernel source to be installed
 do-install:
 	@${MKDIR} ${PREFIX}/${KMODDIR}
 	${INSTALL_KLD} ${BUILD_WRKSRC}/ptx.ko ${PREFIX}/${KMODDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/recptx.pl ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
diff --git a/multimedia/ptx-kmod/distinfo b/multimedia/ptx-kmod/distinfo
index 61180c4e76c9..2aa42b71b9b4 100644
--- a/multimedia/ptx-kmod/distinfo
+++ b/multimedia/ptx-kmod/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ptx-20110326.tar.gz) = bf85973e77dd4c30a981f75c5d11f0da37a782d8784900bee1078132cb939178
-SIZE (ptx-20110326.tar.gz) = 22589
+SHA256 (ptx-20111212.tar.gz) = 7bc257724e0b45131a029cdd56f2956bc6839971312ba1e08049a088df439380
+SIZE (ptx-20111212.tar.gz) = 23319
diff --git a/multimedia/ptx-kmod/files/patch-dev-ptx-Makefile b/multimedia/ptx-kmod/files/patch-dev-ptx-Makefile
deleted file mode 100644
index fb3d456b133b..000000000000
--- a/multimedia/ptx-kmod/files/patch-dev-ptx-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- dev/ptx/Makefile.orig	2011-07-03 14:54:06.000000000 +0900
-+++ dev/ptx/Makefile	2011-07-03 14:54:14.000000000 +0900
-@@ -7,7 +7,7 @@
- SRCS    = ptx.c ptx_iic.c ptx_tuner.c ptx_dma.c ptx_proc.c ptx_sysctl.c
- SRCS    += bus_if.h device_if.h pci_if.h
- 
--KMODDIR = /boot/modules
-+KMODDIR?=	/boot/modules
- 
- #DEBUG_FLAGS = -g
- 
diff --git a/multimedia/ptx-kmod/files/patch-dev-ptx-ptx.h b/multimedia/ptx-kmod/files/patch-dev-ptx-ptx.h
deleted file mode 100644
index 55e682ec04c8..000000000000
--- a/multimedia/ptx-kmod/files/patch-dev-ptx-ptx.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- dev/ptx/ptx.h.orig	2011-07-18 06:50:50.000000000 +0900
-+++ dev/ptx/ptx.h	2011-07-18 06:51:26.000000000 +0900
-@@ -218,7 +218,11 @@
- 	struct cdev *dev[MAX_STREAM];
- 	struct ptx_stream stream[MAX_STREAM];
- 
-+#if (__FreeBSD_version < 800000)
-+	struct proc *ptxdaemon;
-+#else
- 	struct thread *ptxdaemon;
-+#endif
- 	int ring_pos;
- 	int data_pos;
- 
diff --git a/multimedia/ptx-kmod/files/patch-dev-ptx-ptx_proc.c b/multimedia/ptx-kmod/files/patch-dev-ptx-ptx_proc.c
deleted file mode 100644
index e25056cab5d1..000000000000
--- a/multimedia/ptx-kmod/files/patch-dev-ptx-ptx_proc.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- dev/ptx/ptx_proc.c.orig	2011-07-18 06:48:32.000000000 +0900
-+++ dev/ptx/ptx_proc.c	2011-07-18 06:53:27.000000000 +0900
-@@ -23,8 +23,13 @@
- int
- ptx_proc_start(struct ptx_softc *scp)
- {
-+#if (__FreeBSD_version < 800000)
-+	int err = kthread_create(ptx_daemon, scp, &scp->ptxdaemon,
-+	    RFTHREAD, 0, "ptxdaemon");
-+#else
- 	int err = kthread_add(ptx_daemon, scp, NULL,
- 	    &scp->ptxdaemon, RFTHREAD, 0, "ptxdaemon");
-+#endif
- 	if (err) {
- 		device_printf(scp->device, "ptx_proc_start: kthread_add retured %d\n", err);
- 		return ENXIO;
-@@ -81,7 +86,11 @@
- 		ptx_pause("ptxdmn", MSTOTICK(1));
- 	}
- 
-+#if (__FreeBSD_version < 800000)
-+	kthread_exit(0);
-+#else
- 	kthread_exit();
-+#endif
- }
- 
- static void
diff --git a/multimedia/ptx-kmod/files/ptx.sh.in b/multimedia/ptx-kmod/files/ptx.sh.in
index 37fbb6979b62..38232601639d 100644
--- a/multimedia/ptx-kmod/files/ptx.sh.in
+++ b/multimedia/ptx-kmod/files/ptx.sh.in
@@ -18,8 +18,7 @@ ptx_start()
 }
 ptx_stop()
 {
-# XXX: unloading is still unstable
-#	/sbin/kldunload ptx
+	/sbin/kldunload ptx
 }
 
 : ${ptx_enable="YES"}