Upgrade fxtv to 0.47.

* change checksum and filename/version number in Makefile.
* change patch-ab to patch cleanly against new version.
* remove patch-aa -- it is no longer needed.
* add patch-ac to fix a small tiffio.h bogon in the source.
* add some new files to PLIST.

6 files changed, 41 insertions, 42 deletions

diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile
index 5e127cc37440..abd27f68f14c 100644
--- a/multimedia/fxtv/Makefile
+++ b/multimedia/fxtv/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	fxtv
-# Version required:	0.46
+# Version required:	0.47
 # Date created:		Sun Sep  7 17:55:07 EDT 1997
 # Whom:			Randall Hopper <rhh@ct.picker.com>
 #
-# $Id: Makefile,v 1.3 1997/12/01 08:10:46 tg Exp $
+# $Id: Makefile,v 1.4 1997/12/18 16:58:25 markm Exp $
 #
 
-DISTNAME=	fxtv-0.46
+DISTNAME=	fxtv-0.47
 CATEGORIES=	graphics x11
 MASTER_SITES=	http://multiverse.com/~rhh/fxtv/
 EXTRACT_SUFX=	.tgz
diff --git a/multimedia/fxtv/distinfo b/multimedia/fxtv/distinfo
index d6b405e0b95d..e33d737c7159 100644
--- a/multimedia/fxtv/distinfo
+++ b/multimedia/fxtv/distinfo
@@ -1 +1 @@
-MD5 (fxtv-0.46.tgz) = d3d3dead4897dd1757c44272b9c8f3af
+MD5 (fxtv-0.47.tgz) = 335503228230b41af0898b8412c9b642
diff --git a/multimedia/fxtv/files/patch-aa b/multimedia/fxtv/files/patch-aa
deleted file mode 100644
index 35877d4b5bde..000000000000
--- a/multimedia/fxtv/files/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.orig	Wed Nov  5 03:14:25 1997
-+++ Makefile	Thu Dec 18 17:53:26 1997
-@@ -5,13 +5,14 @@
- X11BASE                    = /usr/X11R6
- 
- override CF_VERS           = -DVERS_STR=\"0.46\"
--override INC               = -I$(X11BASE)/include -I/usr/local/include
-+override INC               = -I$(X11BASE)/include -I/usr/local/include \
-+				-I/usr/local/include/tiff34
- override LD_INC            = -L$(X11BASE)/lib -L/usr/local/lib
- override CFLAGS            = -O2 -m486 $(INC) $(CF_VERS)
- #override CFLAGS            = -g $(INC) $(CF_VERS)
- override LDFLAGS           = $(LD_INC) 
- #override LDFLAGS           = -g $(LD_INC) 
--override LIBS              = -ltiff -lXaw3d -lXmu -lXt -lXpm -lXxf86dga \
-+override LIBS              = -ltiff34 -lXaw3d -lXmu -lXt -lXpm -lXxf86dga \
- 	                     -lXxf86vm -lSM -lICE -lXext -lX11 
- 
- override FXTV_LIBDIR       = $(X11BASE)/lib/X11/fxtv
diff --git a/multimedia/fxtv/files/patch-ab b/multimedia/fxtv/files/patch-ab
index 58c6a1fec039..5b15cb8c7c2d 100644
--- a/multimedia/fxtv/files/patch-ab
+++ b/multimedia/fxtv/files/patch-ab
@@ -1,23 +1,27 @@
---- ../fxtv-0.46.ORIG/tvcapture.c	Tue Oct 28 01:59:41 1997
-+++ tvcapture.c	Sun Mar 22 16:43:45 1998
-@@ -1126,7 +1126,7 @@
-     /*  Just mmap the biggest buffer we'll need and be done with it.  */
-     /*    (Buffer used for non-directvideo captures)                  */
-     c->drv_buf = (TV_UINT8 *) mmap( (caddr_t)0, MAX_MMAP_BUF_SIZE,
--                                 PROT_READ|PROT_WRITE, 0, c->fd, (off_t)0 );
-+                                 PROT_READ, MAP_SHARED, c->fd, (off_t)0 );
-     if ( c->drv_buf == (TV_UINT8 *) -1 ) {
-         fprintf( stderr, "mmap of driver buffer failed: %s\n", 
-                  strerror(errno) );
-@@ -1537,9 +1537,9 @@
-         video.ramsize  = 0;
- 
-         /*  If TDEC is on, may be a while before old trash gets written on  */
+--- tvcapture.c.old	Sun Jun  7 01:35:21 1998
++++ tvcapture.c	Sun Jun  7 01:35:59 1998
+@@ -1879,8 +1879,8 @@
+         /*  If TDEC is on, may be a while before old trash gets written on.  */
+         /*    So tell the driver to flush the frame buffer before starting   */
+         /*    capture.                                                       */
 -        if ( c->fps != c->fps_max )
-+/*        if ( c->fps != c->fps_max )
-             memset( c->drv_buf, '\0',
--                    g.w * g.h * c->pix_geom_list[ c->pix_geom_idx ].Bpp );
-+                    g.w * g.h * c->pix_geom_list[ c->pix_geom_idx ].Bpp ); */
+-            flush_buf = TRUE;
++        /* if ( c->fps != c->fps_max )
++            flush_buf = TRUE; */
      }
      memcpy( &pix_geom, &c->pix_geom_list[ c->pix_geom_idx ], 
              sizeof( pix_geom ) );
+@@ -1913,11 +1913,13 @@
+         return;
+     }
+ 
++/*
+     larg = flush_buf;
+     if ( ioctl( c->fd, BT848SCBUF, &larg ) < 0 ) {
+         DO_IOCTL_SERR( "BT848SCBUF", larg );
+         return;
+     }
++*/
+ 
+     /*  If user wants to know whenever a/the frame is complete,            */
+     /*    add in a signal handler for this for single captures, or an Xt   */
diff --git a/multimedia/fxtv/files/patch-ac b/multimedia/fxtv/files/patch-ac
new file mode 100644
index 000000000000..f09baaccb5c6
--- /dev/null
+++ b/multimedia/fxtv/files/patch-ac
@@ -0,0 +1,11 @@
+--- imgsav.c.old	Sun Jun  7 01:26:47 1998
++++ imgsav.c	Sun Jun  7 01:26:56 1998
+@@ -31,7 +31,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <tiffio34.h>
++#include <tiffio.h>
+ #include <assert.h>
+ #include <X11/X.h>
+ #include "tvdefines.h"
diff --git a/multimedia/fxtv/pkg-plist b/multimedia/fxtv/pkg-plist
index 15fc2a8cc7d5..a526a58f842c 100644
--- a/multimedia/fxtv/pkg-plist
+++ b/multimedia/fxtv/pkg-plist
@@ -9,3 +9,6 @@ lib/X11/fxtv/bitmaps/mini-sound.xbm
 lib/X11/fxtv/bitmaps/mini-up.xbm
 lib/X11/fxtv/bitmaps/radio_off.xbm
 lib/X11/fxtv/bitmaps/radio_on.xbm
+lib/X11/fxtv/README
+lib/X11/fxtv/fxtv_cnvt.sh
+lib/X11/fxtv/moused.x10remote.patch