- scantv now scans w/o a failure, but actually doesn't like to find any

  station here
- reattach x11/mtt to the build in case it's FreeBSD 5
- bump PORTREVISION

6 files changed, 186 insertions, 11 deletions

diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile
index 18081b6a262c..2d49f250a474 100644
--- a/multimedia/xawtv/Makefile
+++ b/multimedia/xawtv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xawtv
 PORTVERSION=	3.91
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://bytesex.org/xawtv/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -109,7 +109,7 @@ post-patch:
 
 .if ${OSVERSION} < 500000
 	@${REINPLACE_CMD} -e "s|FOUND_ZVBI|NOT_WORKING_&|g" \
-		${WRKSRC}/vbistuff/Subdir.mk
+		${WRKSRC}/vbistuff/Subdir.mk ${WRKSRC}/x11/Subdir.mk
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/xawtv/files/patch-common::vbi-data.c b/multimedia/xawtv/files/patch-common::vbi-data.c
new file mode 100644
index 000000000000..33471b7fde5e
--- /dev/null
+++ b/multimedia/xawtv/files/patch-common::vbi-data.c
@@ -0,0 +1,16 @@
+--- common/vbi-data.c.orig	Tue Feb 10 22:07:49 2004
++++ common/vbi-data.c	Tue Feb 10 22:09:03 2004
+@@ -71,8 +71,11 @@
+ 	vbi->cap = vbi_capture_v4l2_new(dev,16,&services,-1,&vbi->err,debug);
+ 	if (NULL == vbi->cap) {
+ 	    vbi->cap = vbi_capture_v4l_new(dev,16,&services,-1,&vbi->err,debug);
+-	    if (NULL == vbi->cap)
+-		goto oops;
++	    if (NULL == vbi->cap) {
++		vbi->cap = vbi_capture_bktr_new(dev,16,&services,-1,&vbi->err,debug);
++		if (NULL == vbi->cap)
++		    goto oops;
++	    }
+ 	}
+ 	vbi->par = vbi_capture_parameters(vbi->cap);
+ 	vbi->fd = vbi_capture_fd(vbi->cap);
diff --git a/multimedia/xawtv/files/patch-console::fbtools.c b/multimedia/xawtv/files/patch-console::fbtools.c
new file mode 100644
index 000000000000..478e5e96008b
--- /dev/null
+++ b/multimedia/xawtv/files/patch-console::fbtools.c
@@ -0,0 +1,15 @@
+--- console/fbtools.c.orig	Tue Feb 10 22:40:55 2004
++++ console/fbtools.c	Tue Feb 10 22:42:03 2004
+@@ -2,6 +2,7 @@
+  * some generic framebuffer device stuff
+  *
+  */
++#ifdef WITH_LINUX_FB_H
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -521,3 +522,4 @@
+     fprintf(stderr,"Oops: %s\n",sys_siglist[termsig]);
+     exit(42);
+ }
++#endif
diff --git a/multimedia/xawtv/files/patch-console::vbi-tty.c b/multimedia/xawtv/files/patch-console::vbi-tty.c
new file mode 100644
index 000000000000..1265408050b0
--- /dev/null
+++ b/multimedia/xawtv/files/patch-console::vbi-tty.c
@@ -0,0 +1,152 @@
+--- console/vbi-tty.c.orig	Tue Feb 10 22:41:06 2004
++++ console/vbi-tty.c	Tue Feb 10 22:42:03 2004
+@@ -19,7 +19,7 @@
+ #include <sys/types.h>
+ #include <sys/ioctl.h>
+ 
+-#include <linux/fb.h>
++/*#include <linux/fb.h>*/
+ 
+ #include "vbi-data.h"
+ #include "vbi-tty.h"
+@@ -65,7 +65,7 @@
+ }
+ 
+ /* --------------------------------------------------------------------- */
+-
++#ifdef WITH_LINUX_FB_H
+ static int have_fb = 0;
+ static int fb_fmt  = VBI_PIXFMT_RGBA32_LE;
+ static int switch_last;
+@@ -74,7 +74,7 @@
+ {
+     fb_memset(fb_mem+fb_mem_offset,0,fb_fix.smem_len);
+ }
+-
++#endif
+ /* --------------------------------------------------------------------- */
+ 
+ struct vbi_tty {
+@@ -133,6 +133,7 @@
+     vbi_fetch_vt_page(tty->vbi->dec,&tty->pg,tty->pgno,tty->subno,
+ 		      VBI_WST_LEVEL_1p5,25,1);
+     vbi_fix_head(tty,tty->pg.text);
++#ifdef WITH_LINUX_FB_H
+     if (have_fb) {
+ 	vbi_draw_vt_page_region(&tty->pg, fb_fmt,
+ 				fb_mem + fb_mem_offset,
+@@ -142,13 +143,16 @@
+ 				0,1);
+ 	
+     } else {
++#endif
+ 	len = vbi_export_txt(data,nl_langinfo(CODESET),25*41*8,
+ 			     &tty->pg,&vbi_fullrect,VBI_ANSICOLOR);
+ 	tty_goto(0,0);
+ 	fwrite(data,len,1,stderr);
+ 	tty_goto(42,0);
+ 	free(data);
++#ifdef WITH_LINUX_FB_H
+     }
++#endif
+ }
+ 
+ static void
+@@ -166,6 +170,7 @@
+     vbi_fetch_vt_page(tty->vbi->dec,&pg,pgno,subno,
+ 		      VBI_WST_LEVEL_1p5,1,1);
+     vbi_fix_head(tty,pg.text);
++#ifdef WITH_LINUX_FB_H
+     if (have_fb) {
+ 	vbi_draw_vt_page_region(&pg, fb_fmt,
+ 				fb_mem + fb_mem_offset,
+@@ -175,13 +180,16 @@
+ 				0,1);
+ 	
+     } else {
++#endif
+ 	len = vbi_export_txt(data,nl_langinfo(CODESET),41*8,
+ 			     &pg,&head,VBI_ANSICOLOR);
+ 	tty_goto(0,0);
+ 	fwrite(data,len,1,stderr);
+ 	tty_goto(42,0);
+ 	free(data);
++#ifdef WITH_LINUX_FB_H
+     }
++#endif
+ }
+ 
+ static void
+@@ -232,7 +240,7 @@
+     vbi = vbi_open(device,debug,sim);
+     if (NULL == vbi)
+ 	exit(1);
+-
++#ifdef WITH_LINUX_FB_H
+     if (0 /* 0 == fb_probe() */ ) {
+ 	have_fb = 1;
+ 	fb_init(NULL,NULL,0);
+@@ -240,14 +248,21 @@
+ 	fb_switch_init();
+ 	switch_last = fb_switch_state;
+     } else {
++#endif
+ 	if (-1 != ioctl(0,TIOCGWINSZ,&win) && win.ws_row < 26) {
+ 	    fprintf(stderr,"Terminal too small (need 26 rows, have %d)\n",
+ 		    win.ws_row);
+ 	    exit(1);
+ 	}
++#ifdef WITH_LINUX_FB_H
+     }
++#endif
+     tty_raw();
++#ifdef WITH_LINUX_FB_H
+     have_fb ? fb_clear() : tty_clear();
++#else
++    tty_clear();
++#endif
+ 
+     tty = malloc(sizeof(*tty));
+     memset(tty,0,sizeof(*tty));
+@@ -264,14 +279,18 @@
+ 	rc = select(vbi->fd+1,&set,NULL,NULL,&tv);
+ 	if (-1 == rc) {
+ 	    tty_restore();
++#ifdef WITH_LINUX_FB_H
+ 	    if (have_fb)
+ 		fb_cleanup();
++#endif
+ 	    perror("select");
+ 	    exit(1);
+ 	}
+ 	if (0 == rc) {
++#ifdef WITH_LINUX_FB_H
+ 	    if (have_fb)
+ 		fb_cleanup();
++#endif
+ 	    tty_restore();
+ 	    fprintf(stderr,"oops: timeout\n");
+ 	    exit(1);
+@@ -289,7 +308,11 @@
+ 		    break;
+ 		case 'L' & 0x1f:
+ 		    /* refresh */
++#ifdef WITH_LINUX_FB_H
+ 		    have_fb ? fb_clear() : tty_clear();
++#else
++		    tty_clear();
++#endif
+ 		    vbi_render_page(tty);
+ 		    break;
+ 		case 'i':
+@@ -339,8 +362,10 @@
+ 	    vbi_hasdata(vbi);
+ 	}
+     }
++#ifdef WITH_LINUX_FB_H
+     if (have_fb)
+ 	fb_cleanup();
++#endif
+     tty_goto(0,0);
+     tty_restore();
+ }
diff --git a/multimedia/xawtv/files/patch-x11::Subdir.mk b/multimedia/xawtv/files/patch-x11::Subdir.mk
index 1ae44876e2e1..3b528cedfef5 100644
--- a/multimedia/xawtv/files/patch-x11::Subdir.mk
+++ b/multimedia/xawtv/files/patch-x11::Subdir.mk
@@ -1,14 +1,5 @@
 --- x11/Subdir.mk.orig	Mon Jan 12 18:56:17 2004
 +++ x11/Subdir.mk	Mon Feb  9 18:49:10 2004
-@@ -15,7 +15,7 @@
- TARGETS-x11 += \
- 	x11/motv
- endif
--ifeq ($(FOUND_MOTIF)$(FOUND_ZVBI),yesyes)
-+ifeq ($(FOUND_MOTIF)$(NOT_WORKINGFOUND_ZVBI),yesyes)
- TARGETS-x11 += \
- 	x11/mtt
- endif
 @@ -116,8 +116,8 @@
  x11/pia          : LDFLAGS := $(DLFLAGS)
  
diff --git a/multimedia/xawtv/pkg-plist b/multimedia/xawtv/pkg-plist
index 85e3dbf46995..8432950df2bf 100644
--- a/multimedia/xawtv/pkg-plist
+++ b/multimedia/xawtv/pkg-plist
@@ -1,6 +1,7 @@
 %%ZVBI5%%bin/alevtd
 bin/dump-mixers
 bin/motv
+%%ZVBI5%%bin/mtt
 bin/ntsc-cc
 bin/pia
 bin/propwatch