Upgrade to 0.48. Bug fixes, support for more cards in brooktree driver.

12 files changed, 10 insertions, 114 deletions

diff --git a/graphics/fxtv/Makefile b/graphics/fxtv/Makefile
index d4040500ecc5..aba0514cf3be 100644
--- a/graphics/fxtv/Makefile
+++ b/graphics/fxtv/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for:	fxtv
-# Version required:	0.47
+# Version required:	0.48
 # Date created:		Sun Sep  7 17:55:07 EDT 1997
 # Whom:			Randall Hopper <rhh@ct.picker.com>
 #
-# $Id: Makefile,v 1.13 1998/11/25 05:06:21 jseger Exp $
+# $Id: Makefile,v 1.14 1998/11/25 09:01:17 asami Exp $
 #
 
-DISTNAME=	fxtv-0.47
+DISTNAME=	fxtv-0.48
 CATEGORIES=	graphics
-MASTER_SITES=	http://multiverse.com/~rhh/fxtv/
+MASTER_SITES=	http://www.pagesz.net/~aa8vb/fxtv/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	rhh@ct.picker.com
diff --git a/graphics/fxtv/distinfo b/graphics/fxtv/distinfo
index e33d737c7159..a54e4fdf9b66 100644
--- a/graphics/fxtv/distinfo
+++ b/graphics/fxtv/distinfo
@@ -1 +1 @@
-MD5 (fxtv-0.47.tgz) = 335503228230b41af0898b8412c9b642
+MD5 (fxtv-0.48.tgz) = 1ac61e99cd7ec67ff5beb1099b5468cb
diff --git a/graphics/fxtv/files/patch-aa b/graphics/fxtv/files/patch-aa
deleted file mode 100644
index dcb78760ac83..000000000000
--- a/graphics/fxtv/files/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.ORIG	Sat Sep 12 19:17:22 1998
-+++ Makefile	Mon Jun  1 08:06:40 1998
-@@ -19,8 +19,8 @@
- endif
- 
- override LDFLAGS           = $(LD_INC) 
--override LIBS              = -ltiff34 -lXaw3d -lXmu -lXt -lXpm -lSM -lICE \
--                             -lXext -lX11 
-+override LIBS              = -ltiff -ljpeg -lXaw3d -lXmu -lXt -lXpm -lSM \
-+			     -lICE -lXext -lX11 -lm
- ifeq ($(HAVE_XFREE86),YES)
-   override LIBS           += -lXxf86dga -lXxf86vm
- endif
diff --git a/graphics/fxtv/files/patch-ab b/graphics/fxtv/files/patch-ab
deleted file mode 100644
index 5b15cb8c7c2d..000000000000
--- a/graphics/fxtv/files/patch-ab
+++ /dev/null
@@ -1,27 +0,0 @@
---- 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 )
--            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/graphics/fxtv/files/patch-ac b/graphics/fxtv/files/patch-ac
deleted file mode 100644
index f09baaccb5c6..000000000000
--- a/graphics/fxtv/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/graphics/fxtv/pkg-plist b/graphics/fxtv/pkg-plist
index a9662dcf0f21..22e59c47f156 100644
--- a/graphics/fxtv/pkg-plist
+++ b/graphics/fxtv/pkg-plist
@@ -9,6 +9,5 @@ lib/X11/fxtv/bitmaps/mini-up.xbm
 lib/X11/fxtv/bitmaps/radio_off.xbm
 lib/X11/fxtv/bitmaps/radio_on.xbm
 lib/X11/fxtv/fxtv_cnvt.sh
-lib/X11/fxtv/moused.x10remote.patch
 @dirrm lib/X11/fxtv/bitmaps
 @dirrm lib/X11/fxtv
diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile
index d4040500ecc5..aba0514cf3be 100644
--- a/multimedia/fxtv/Makefile
+++ b/multimedia/fxtv/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for:	fxtv
-# Version required:	0.47
+# Version required:	0.48
 # Date created:		Sun Sep  7 17:55:07 EDT 1997
 # Whom:			Randall Hopper <rhh@ct.picker.com>
 #
-# $Id: Makefile,v 1.13 1998/11/25 05:06:21 jseger Exp $
+# $Id: Makefile,v 1.14 1998/11/25 09:01:17 asami Exp $
 #
 
-DISTNAME=	fxtv-0.47
+DISTNAME=	fxtv-0.48
 CATEGORIES=	graphics
-MASTER_SITES=	http://multiverse.com/~rhh/fxtv/
+MASTER_SITES=	http://www.pagesz.net/~aa8vb/fxtv/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	rhh@ct.picker.com
diff --git a/multimedia/fxtv/distinfo b/multimedia/fxtv/distinfo
index e33d737c7159..a54e4fdf9b66 100644
--- a/multimedia/fxtv/distinfo
+++ b/multimedia/fxtv/distinfo
@@ -1 +1 @@
-MD5 (fxtv-0.47.tgz) = 335503228230b41af0898b8412c9b642
+MD5 (fxtv-0.48.tgz) = 1ac61e99cd7ec67ff5beb1099b5468cb
diff --git a/multimedia/fxtv/files/patch-aa b/multimedia/fxtv/files/patch-aa
deleted file mode 100644
index dcb78760ac83..000000000000
--- a/multimedia/fxtv/files/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.ORIG	Sat Sep 12 19:17:22 1998
-+++ Makefile	Mon Jun  1 08:06:40 1998
-@@ -19,8 +19,8 @@
- endif
- 
- override LDFLAGS           = $(LD_INC) 
--override LIBS              = -ltiff34 -lXaw3d -lXmu -lXt -lXpm -lSM -lICE \
--                             -lXext -lX11 
-+override LIBS              = -ltiff -ljpeg -lXaw3d -lXmu -lXt -lXpm -lSM \
-+			     -lICE -lXext -lX11 -lm
- ifeq ($(HAVE_XFREE86),YES)
-   override LIBS           += -lXxf86dga -lXxf86vm
- endif
diff --git a/multimedia/fxtv/files/patch-ab b/multimedia/fxtv/files/patch-ab
deleted file mode 100644
index 5b15cb8c7c2d..000000000000
--- a/multimedia/fxtv/files/patch-ab
+++ /dev/null
@@ -1,27 +0,0 @@
---- 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 )
--            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
deleted file mode 100644
index f09baaccb5c6..000000000000
--- a/multimedia/fxtv/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 a9662dcf0f21..22e59c47f156 100644
--- a/multimedia/fxtv/pkg-plist
+++ b/multimedia/fxtv/pkg-plist
@@ -9,6 +9,5 @@ lib/X11/fxtv/bitmaps/mini-up.xbm
 lib/X11/fxtv/bitmaps/radio_off.xbm
 lib/X11/fxtv/bitmaps/radio_on.xbm
 lib/X11/fxtv/fxtv_cnvt.sh
-lib/X11/fxtv/moused.x10remote.patch
 @dirrm lib/X11/fxtv/bitmaps
 @dirrm lib/X11/fxtv