Add DragonFly support. Fix a GCC 3.4+ issue: #ifdef 0 doesn't work.

7 files changed, 96 insertions, 26 deletions

diff --git a/multimedia/fxtv/distinfo b/multimedia/fxtv/distinfo
index 219653b9c06..68e81027f68 100644
--- a/multimedia/fxtv/distinfo
+++ b/multimedia/fxtv/distinfo
@@ -1,21 +1,25 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 11:24:02 agc Exp $
+$NetBSD: distinfo,v 1.6 2006/01/03 15:03:02 joerg Exp $
 
 SHA1 (fxtv-1.03.tgz) = 2ed9f2bee879a931c7f963a4ad7d07ef9cd297f9
 RMD160 (fxtv-1.03.tgz) = 740ddbb4e3b58028a6b8f17483bc27b82420f280
 Size (fxtv-1.03.tgz) = 198669 bytes
-SHA1 (patch-aa) = 19f9625dbfbacf06fdd7bb45b72a1806dc822568
-SHA1 (patch-ab) = a62c497255063a88b7d240e902a45c85f59f84b0
+SHA1 (patch-aa) = 8adc4eca8b0d7b85137241693eb8436a37713149
+SHA1 (patch-ab) = 80523d5cb2fcc06c2486f3be2556f5f9b1362472
 SHA1 (patch-ac) = 27a825287c17d1cc957fb89ba2f665c01f998c15
 SHA1 (patch-ad) = daea79659e2b7af142ca101601887d58239f35d7
 SHA1 (patch-ae) = aa7689ff62388d4d50f89501f2c3084bc04409d8
-SHA1 (patch-af) = 50ab2d960955a8e97b6b56265195ec325b206cf9
+SHA1 (patch-af) = 48a07b3407f40be23594b4957bb8a590cd9ef585
 SHA1 (patch-ag) = 13655a94cd6200d12e25d406d7c1923f89000c80
 SHA1 (patch-ah) = 896d5164b176154b398f52d5c9887210da3d1e77
 SHA1 (patch-ai) = 85baa4b457dede91bf74ce0d8e4655fae9da2d96
 SHA1 (patch-aj) = d614a3b8813b07eaf4c17ae20b492b008df1f5d6
 SHA1 (patch-ak) = 87e4f9636aa798f9f0f5a4e27a936f800461667a
 SHA1 (patch-al) = d60ac498f40cd9ec833ca436708cb140856826f1
-SHA1 (patch-ba) = 20efae40631bdb5be57e12445bf2135a47952763
+SHA1 (patch-am) = f88d368bc6f1adb41b7e4160d8e9138d230e8cd8
+SHA1 (patch-an) = 8e26f893efd97fbdb6f42a7a7f67347bfedb9abe
+SHA1 (patch-ao) = 4cc7962af8a466a91d60fb751a369388e917548e
+SHA1 (patch-aq) = 86efd9f0d17b2e4b4270250aa5df9e05147fc824
+SHA1 (patch-ba) = dc5276e31c2331f036e33b3e0fa321777c72eb1d
 SHA1 (patch-bb) = 1a6cc73078ac7587e6df9de6c3ec9930e498484e
 SHA1 (patch-bc) = d5ddc97b1ba5a1660d622f20d89a3a680596f024
 SHA1 (patch-bd) = c24ef4e00d800368a843d0972d66080ddc2b07eb
diff --git a/multimedia/fxtv/patches/patch-aa b/multimedia/fxtv/patches/patch-aa
index 8c04f7a070a..735387bbc60 100644
--- a/multimedia/fxtv/patches/patch-aa
+++ b/multimedia/fxtv/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2005/02/23 01:11:47 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2006/01/03 15:03:02 joerg Exp $
 
---- Makefile.orig	2001-02-12 23:08:59.000000000 +0100
-+++ Makefile	2005-02-23 02:00:43.000000000 +0100
+--- Makefile.orig	2001-02-12 22:08:59.000000000 +0000
++++ Makefile
 @@ -4,13 +4,10 @@
  
  HAVE_XFREE86 = YES
@@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.3 2005/02/23 01:11:47 wiz Exp $
  LOCALBASE    ?= /usr/local
  DEBUG        = NO
  OS           = $(shell uname -s)
-@@ -24,15 +21,6 @@
+@@ -24,15 +21,6 @@ override LIBDIRS           = $(X11BASE)/
  override SHELL             = /bin/sh
  
  #
@@ -34,9 +34,13 @@ $NetBSD: patch-aa,v 1.3 2005/02/23 01:11:47 wiz Exp $
  # OpenBSD stuff
  #
  ifeq ($(OS),OpenBSD)
-@@ -51,9 +39,9 @@
+@@ -50,10 +38,13 @@ endif
+ ifeq ($(OS),NetBSD)
    override RPATH_FLAG      = -R
  endif
++ifeq ($(OS),DragonFly)
++  override RPATH_FLAG      = -R
++endif
  
 -override LD_INC            = $(foreach dir,$(LIBDIRS),-Wl,-L,$(dir))
 +override LD_INC            = $(foreach dir,$(LIBDIRS),-Wl,-L$(dir))
@@ -46,7 +50,7 @@ $NetBSD: patch-aa,v 1.3 2005/02/23 01:11:47 wiz Exp $
  endif
  
  #
-@@ -62,7 +50,7 @@
+@@ -62,7 +53,7 @@ endif
  ifneq ($(DEBUG),NO)
    override CFLAGS          = -DDEBUG -g
  else
@@ -55,7 +59,7 @@ $NetBSD: patch-aa,v 1.3 2005/02/23 01:11:47 wiz Exp $
  endif
  C_WARN_FLAG                = -Wall
  override CFLAGS           += $(C_WARN_FLAG) $(INC) $(CF_VERS)
-@@ -72,6 +60,15 @@
+@@ -72,6 +63,15 @@ endif
  
  override CFLAGS           += $(C_WARN_FLAG) -DX11BASE=\"$(X11BASEINST)\"
  
@@ -71,7 +75,7 @@ $NetBSD: patch-aa,v 1.3 2005/02/23 01:11:47 wiz Exp $
  ifeq ($(OS), linux)
  override CFLAGS            = $(CFLAGS) -DOLD_TUNER_IFACE
  endif
-@@ -81,7 +78,7 @@
+@@ -81,7 +81,7 @@ endif
  #
  override LDFLAGS           = $(LD_INC) 
  override VIDEOLIB_LIB      = $(VIDEOLIB_DIR)/libvideo.a
diff --git a/multimedia/fxtv/patches/patch-ab b/multimedia/fxtv/patches/patch-ab
index 2aa8d8cf18e..17f2d4f22b5 100644
--- a/multimedia/fxtv/patches/patch-ab
+++ b/multimedia/fxtv/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/01/26 11:36:35 jmmv Exp $
+$NetBSD: patch-ab,v 1.2 2006/01/03 15:03:02 joerg Exp $
 
---- pixelview_remote.c.orig	Sun May 21 17:10:09 2000
-+++ pixelview_remote.c	Tue Feb 13 22:39:48 2001
+--- pixelview_remote.c.orig	2000-05-21 15:10:09.000000000 +0000
++++ pixelview_remote.c
 @@ -32,6 +32,7 @@
   *
   */
@@ -10,3 +10,13 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/01/26 11:36:35 jmmv Exp $
  #include <string.h>
  #include <stdlib.h>
  #include <stdio.h>
+@@ -39,6 +40,9 @@
+ #include <sys/fcntl.h>
+ #ifdef __NetBSD__
+ # include <dev/ic/bt8xx.h>
++#elif defined(__DragonFly__)
++# include <dev/video/meteor/ioctl_meteor.h>
++# include <dev/video/bktr/ioctl_bt848.h>
+ #else
+ # include <machine/ioctl_meteor.h>
+ # include <machine/ioctl_bt848.h>
diff --git a/multimedia/fxtv/patches/patch-af b/multimedia/fxtv/patches/patch-af
index c462d278fdd..85d821a4363 100644
--- a/multimedia/fxtv/patches/patch-af
+++ b/multimedia/fxtv/patches/patch-af
@@ -1,8 +1,25 @@
-$NetBSD: patch-af,v 1.1.1.1 2004/01/26 11:36:38 jmmv Exp $
+$NetBSD: patch-af,v 1.2 2006/01/03 15:03:02 joerg Exp $
 
---- tvutil.c.orig	Mon May 13 13:43:42 2002
-+++ tvutil.c	Mon May 13 13:44:18 2002
-@@ -112,7 +112,7 @@
+--- tvutil.c.orig	2000-10-23 02:43:46.000000000 +0000
++++ tvutil.c
+@@ -35,7 +35,7 @@
+ #include <fcntl.h>
+ #include <signal.h>
+ #include <sys/types.h>
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ #  include <sys/sysctl.h>
+ #elif defined(__bsdi__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ #  include <sys/param.h>
+@@ -105,14 +105,14 @@ void CleanupChildFileDesc()
+ {
+     static int Max_files_per_proc = -1;
+ 
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+     int    mib[2] = { CTL_KERN, KERN_MAXFILESPERPROC };
+ #elif defined(linux)
+     int    mib[2] = { CTL_KERN, FOPEN_MAX };
  #elif defined(__bsdi__)
      int    mib[2] = { CTL_KERN, KERN_MAXFILES };
  #elif defined(__NetBSD__)
diff --git a/multimedia/fxtv/patches/patch-an b/multimedia/fxtv/patches/patch-an
new file mode 100644
index 00000000000..fc75aa110a4
--- /dev/null
+++ b/multimedia/fxtv/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2006/01/03 15:03:02 joerg Exp $
+
+--- voxware.h.orig	2006-01-03 14:46:08.000000000 +0000
++++ voxware.h
+@@ -32,7 +32,7 @@
+ 
+ #if defined(__FreeBSD__)
+ #  include <machine/soundcard.h>
+-#elif defined(linux) || defined(__bsdi__)
++#elif defined(linux) || defined(__bsdi__) || defined(__DragonFly__)
+ #  include <sys/soundcard.h>
+ #elif defined(__NetBSD__) || defined(__OpenBSD__)
+ #  include <soundcard.h>
diff --git a/multimedia/fxtv/patches/patch-aq b/multimedia/fxtv/patches/patch-aq
new file mode 100644
index 00000000000..361b080f2c0
--- /dev/null
+++ b/multimedia/fxtv/patches/patch-aq
@@ -0,0 +1,13 @@
+$NetBSD: patch-aq,v 1.1 2006/01/03 15:03:02 joerg Exp $
+
+--- tvcapture.c.orig	2006-01-03 14:52:51.000000000 +0000
++++ tvcapture.c
+@@ -37,6 +37,8 @@
+ #include <sys/mman.h>
+ #ifdef __NetBSD__
+ # include <dev/ic/bt8xx.h>
++#elif defined(__DragonFly__)
++# include <dev/video/bktr/ioctl_bt848.h>
+ #else
+ # include <machine/ioctl_bt848.h>
+ #endif
diff --git a/multimedia/fxtv/patches/patch-ba b/multimedia/fxtv/patches/patch-ba
index 593b593b2f0..9d27d72646f 100644
--- a/multimedia/fxtv/patches/patch-ba
+++ b/multimedia/fxtv/patches/patch-ba
@@ -1,6 +1,7 @@
-$NetBSD: patch-ba,v 1.1.1.1 2004/01/26 11:36:40 jmmv Exp $
---- remote.c.orig	Fri Jan 10 02:18:28 2003
-+++ remote.c	Fri Jan 10 02:18:32 2003
+$NetBSD: patch-ba,v 1.2 2006/01/03 15:03:02 joerg Exp $
+
+--- remote.c.orig	2001-02-12 21:05:08.000000000 +0000
++++ remote.c
 @@ -33,6 +33,8 @@
  
  /*      ******************** Include Files                ************** */
@@ -10,9 +11,12 @@ $NetBSD: patch-ba,v 1.1.1.1 2004/01/26 11:36:40 jmmv Exp $
  #include <stdio.h>
  #include <stdlib.h>
  #include <errno.h>
-@@ -53,8 +55,10 @@
+@@ -52,9 +54,13 @@
+ # else
  #  include <machine/mouse.h>
  # endif
++#elif defined(__DragonFly__)
++# include <machine/mouse.h>
  #else
 +#if HAVE_MOUSE_H
  # include <machine/mouse.h>
@@ -21,7 +25,7 @@ $NetBSD: patch-ba,v 1.1.1.1 2004/01/26 11:36:40 jmmv Exp $
  #include <X11/Intrinsic.h>
  #include "tvdebug.h"
  #include "tvutil.h"
-@@ -62,6 +66,8 @@
+@@ -62,10 +68,12 @@
  #include "haup_remote.h"
  #include "pixelview_remote.h"
  
@@ -30,7 +34,12 @@ $NetBSD: patch-ba,v 1.1.1.1 2004/01/26 11:36:40 jmmv Exp $
  /*      ******************** Local defines                ************** */
  
  /*  FIXME: Remove this old code someday  */
-@@ -847,3 +853,18 @@
+-#ifdef 0
++#if 0
+ #  define OLD_DEV_SYSMOUSE_STUFF
+ #endif
+ 
+@@ -847,3 +855,18 @@ void TVREMOTEFlush( void )
      case REMOTE_TYPE_PIXELVIEW :  TVPIXELVIEWREMOTEFlush(); break;
    }
  }