Patch LP64 problems, add patch comments, fix some pkglint.

This may or may not fully run on LP64 platforms but it's much more
likely to now than previously.

33 files changed, 950 insertions, 66 deletions

diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile
index 5a3113f3611..a72b5688850 100644
--- a/multimedia/fxtv/Makefile
+++ b/multimedia/fxtv/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2011/07/05 01:59:46 dholland Exp $
+# $NetBSD: Makefile,v 1.27 2011/07/05 03:27:22 dholland Exp $
 
 DISTNAME=	fxtv-1.03
 PKGREVISION=	17
 CATEGORIES=	multimedia
-MASTER_SITES=	${HOMEPAGE}
+MASTER_SITES=	${HOMEPAGE:Q}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -28,10 +28,10 @@ SUBST_FILES.root=	Makefile
 SUBST_SED.root=		-e 's,-o root,-o ${ROOT_USER},'
 
 post-extract:
-	@${RM} -f ${WRKSRC}/videolib/videolib.o
+	${RM} -f ${WRKSRC}/videolib/videolib.o
 
 pre-configure:
-	if [ -r /usr/include/machine/mouse.h ] ; then \
+	set -e; if [ -r /usr/include/machine/mouse.h ] ; then \
 		${ECHO} '#define HAVE_MOUSE_H 1' > ${WRKSRC}/netbsdconf.h; \
 	else \
 		${ECHO} '#define HAVE_MOUSE_H 0' > ${WRKSRC}/netbsdconf.h; \
diff --git a/multimedia/fxtv/distinfo b/multimedia/fxtv/distinfo
index d64d5b5bbdd..16b2044e9e1 100644
--- a/multimedia/fxtv/distinfo
+++ b/multimedia/fxtv/distinfo
@@ -1,30 +1,37 @@
-$NetBSD: distinfo,v 1.14 2011/01/14 10:55:42 wiz Exp $
+$NetBSD: distinfo,v 1.15 2011/07/05 03:27:22 dholland Exp $
 
 SHA1 (fxtv-1.03.tgz) = 2ed9f2bee879a931c7f963a4ad7d07ef9cd297f9
 RMD160 (fxtv-1.03.tgz) = 740ddbb4e3b58028a6b8f17483bc27b82420f280
 Size (fxtv-1.03.tgz) = 198669 bytes
-SHA1 (patch-aa) = 5073dd51a7c2a35344f71e53456a311c79818dbb
-SHA1 (patch-ab) = 80523d5cb2fcc06c2486f3be2556f5f9b1362472
+SHA1 (patch-aa) = 1dcf7033dd1b48d49de56d3d814f506741fd38f9
+SHA1 (patch-ab) = 803ef888b8894617b4f3516fc6822784aba314ee
 SHA1 (patch-ac) = 27a825287c17d1cc957fb89ba2f665c01f998c15
-SHA1 (patch-ad) = daea79659e2b7af142ca101601887d58239f35d7
-SHA1 (patch-ae) = 356ca0b0973dcc18e066e485a0330b3d3b7d6dc6
-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-am) = f88d368bc6f1adb41b7e4160d8e9138d230e8cd8
-SHA1 (patch-an) = 8e26f893efd97fbdb6f42a7a7f67347bfedb9abe
-SHA1 (patch-ao) = 4cc7962af8a466a91d60fb751a369388e917548e
-SHA1 (patch-ap) = 944d5f9db72ac6db41ed8be66cbdd151064ffbae
-SHA1 (patch-aq) = 86efd9f0d17b2e4b4270250aa5df9e05147fc824
-SHA1 (patch-ba) = dc5276e31c2331f036e33b3e0fa321777c72eb1d
-SHA1 (patch-bb) = 1a6cc73078ac7587e6df9de6c3ec9930e498484e
-SHA1 (patch-bc) = d5ddc97b1ba5a1660d622f20d89a3a680596f024
-SHA1 (patch-bd) = c24ef4e00d800368a843d0972d66080ddc2b07eb
-SHA1 (patch-be) = ff86cb36c3379727de59632ac29efdbbc6baa1ec
-SHA1 (patch-bf) = e3ce002d342ae508262f21e9eaa4af20d1d56f77
-SHA1 (patch-bg) = fa2895e34aea2be7fccfb912276a5fbfb6c9d1be
-SHA1 (patch-ca) = ef57a39c78b0120e19671faa84101b6fe783a8e8
+SHA1 (patch-actions_c) = 3b1c75de416c66a9f502d9096a31192363da4ac9
+SHA1 (patch-ad) = 1560755a8e504a80e89d66278517959e7bdea34d
+SHA1 (patch-ae) = 2a05aa4abb593a54aafb7122f76907c12c40e6a5
+SHA1 (patch-af) = 1ada82aa78cf357df1c697a64c4e4f20ebd36859
+SHA1 (patch-ag) = 6833a48904ac01f053d991de0fb96cb65aa33d52
+SHA1 (patch-ah) = eee3ac0314c45f392b3cc64c934d9191a9f172ba
+SHA1 (patch-ai) = 2ee8bdae28f8ad0a9a42c73c6a20a9433e65a2f3
+SHA1 (patch-aj) = fc4d08c6ddbd141227677e68377bb563b6eff2db
+SHA1 (patch-ak) = e57eacc2fe2a0c7e1ab56ae1867ed7275777b2a3
+SHA1 (patch-al) = 08dfc0ad859086ab758df349510fc27cc2c9b971
+SHA1 (patch-am) = 2166c83b8e5ef74c716fc22b70fa9b266968c30c
+SHA1 (patch-an) = 2b09f6e3e1ccd24a68e98881faa57d7b9ecc5e04
+SHA1 (patch-annot_c) = 9caaa139138a6a53edd294cb2a5d3ef47bec45f6
+SHA1 (patch-ao) = bf602e6ac5f4fd213cf135a466fd29a765573ef9
+SHA1 (patch-ap) = 16cfb290089e30e63fde8e5f3a9e6d51efa0a9f0
+SHA1 (patch-appear_dlg_c) = c55bb9882633454e147811381a6cc0e3f3932df4
+SHA1 (patch-aq) = e673486847f35b037870fba089b5d72eac5945f5
+SHA1 (patch-audiocnvt_c) = 1c2748c4d1499fb3083748df017935984d5c710e
+SHA1 (patch-audsav_dlg_c) = aebba653b89e06562e04381fec6c9fac5e122a0e
+SHA1 (patch-ba) = c41c45bafdfd6a5790ce29b57fe7917aa939bebc
+SHA1 (patch-bb) = 861d7e52e7a1bbf3433b8b35dc0737e12ca2d82a
+SHA1 (patch-bc) = 97d02b5f725f15a9eb31aff9a93872315247da75
+SHA1 (patch-bd) = c11c09060d3f2b9512682078b035e93195e0e16e
+SHA1 (patch-be) = f93df2ce14cb83641d29031d541b5c822d5d1e63
+SHA1 (patch-bf) = a2c7b93ef9fb5eb28c2ac867d84d9b8e6f06dab8
+SHA1 (patch-bg) = 8078acbccbb34bb30251187f56cb2a28db579bf4
+SHA1 (patch-ca) = f80c76b57cd6b4be91a432d506141896d6630be5
+SHA1 (patch-remotetrans_c) = 87e8cc3ad428c082f89d76c018bcca76298d62cf
+SHA1 (patch-tvscreen_c) = 4e9d49674610e827a42ea02fc350698c435162cf
diff --git a/multimedia/fxtv/patches/patch-aa b/multimedia/fxtv/patches/patch-aa
index 958e99910cc..3ea6dfbe041 100644
--- a/multimedia/fxtv/patches/patch-aa
+++ b/multimedia/fxtv/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.8 2009/10/31 19:40:33 tnn Exp $
+$NetBSD: patch-aa,v 1.9 2011/07/05 03:27:22 dholland Exp $
+
+Config for pkgsrc.
 
 --- Makefile.orig	2001-02-12 23:08:59.000000000 +0100
 +++ Makefile
diff --git a/multimedia/fxtv/patches/patch-ab b/multimedia/fxtv/patches/patch-ab
index 17f2d4f22b5..23048473752 100644
--- a/multimedia/fxtv/patches/patch-ab
+++ b/multimedia/fxtv/patches/patch-ab
@@ -1,4 +1,7 @@
-$NetBSD: patch-ab,v 1.2 2006/01/03 15:03:02 joerg Exp $
+$NetBSD: patch-ab,v 1.3 2011/07/05 03:27:22 dholland Exp $
+
+Needs sys/ioctl.h.
+Dragonfly support.
 
 --- pixelview_remote.c.orig	2000-05-21 15:10:09.000000000 +0000
 +++ pixelview_remote.c
diff --git a/multimedia/fxtv/patches/patch-actions_c b/multimedia/fxtv/patches/patch-actions_c
new file mode 100644
index 00000000000..2ab58a7face
--- /dev/null
+++ b/multimedia/fxtv/patches/patch-actions_c
@@ -0,0 +1,127 @@
+$NetBSD: patch-actions_c,v 1.1 2011/07/05 03:27:22 dholland Exp $
+
+Fix LP64 problems.
+Fix illegal C.
+
+--- actions.c~	2001-02-12 19:26:23.000000000 +0000
++++ actions.c
+@@ -238,7 +238,7 @@ static void TVACTIONKeyStationEntryHdlr(
+         S_chan_entry_active = TRUE;
+         S_entry_freq   = do_freq;
+         if ( isa_digit )
+-            sprintf( S_chan_str, "%ld", digit );
++            sprintf( S_chan_str, "%d", digit );
+         else if ( do_freq )
+             strcpy( S_chan_str, "f" );
+         else 
+@@ -549,7 +549,7 @@ static void TVActionSetStationAction(
+ 
+         /*  Are we incrementally changing the channel or frequency?  */
+         if (( str[0] == '+' ) || ( str[0] == '-' )) {
+-            if ( toupper( str[1] ) == 'F' )
++            if ( toupper( (unsigned char)str[1] ) == 'F' )
+                 freq_inc = ( str[0] == '-' ? -1 : +1 );
+             else {
+                 chan_inc = atoi( str );
+@@ -609,7 +609,7 @@ static void TVActionSetStationAction(
+             if (( sscanf( str, "f%f", &chan_freq ) == 1 ) ||
+                 ( sscanf( str, "F%f", &chan_freq ) == 1 )) 
+                 chan_num  = -1;
+-            else if (( sscanf( str, "%ld", &chan_num ) == 1 ) &&
++            else if (( sscanf( str, "%d", &chan_num ) == 1 ) &&
+                      ( chan_num >= TV_CHAN_MIN ))
+                 chan_freq = 0.0;
+             else {
+@@ -729,8 +729,10 @@ static void TVActionToggleZoomAction(
+ 
+         arg[0] = '\0';
+         strncat( arg, params[0], sizeof(arg)-1 );
+-        while ( *p != '\0' )
+-            *(p++) = tolower( *p );
++        while ( *p != '\0' ) {
++            *p = tolower( (unsigned char)*p );
++	    p++;
++	}
+         if ( strncmp( arg, "win", strlen("win") ) == 0 )
+             fullscreen = False;
+         else if ( strncmp( arg, "full", strlen("full") ) == 0 )
+@@ -925,8 +927,10 @@ static void TVActionSetCaptureInputActio
+ 
+             arg[0] = '\0';
+             strncat( arg, str, sizeof(arg)-1 );
+-            while ( *p != '\0' )
+-                *(p++) = tolower( *p );
++            while ( *p != '\0' ) {
++                *p = tolower( (unsigned char)*p );
++		p++;
++	    }
+ 
+             if ( strncmp( str, "tuner", strlen("tuner") ) == 0 )
+                 dev = TV_DEVICE_TUNER;
+@@ -1032,8 +1036,10 @@ static void TVActionSetTunerModeAction(
+ 
+             arg[0] = '\0';
+             strncat( arg, str, sizeof(arg)-1 );
+-            while ( *p != '\0' )
+-                *(p++) = tolower( *p );
++            while ( *p != '\0' ) {
++                *p = tolower( (unsigned char)*p );
++		p++;
++	    }
+ 
+             if ( strncmp( str, "ant", strlen("ant") ) == 0 )
+                 mode = TV_TUNER_MODE_ANTENNA;
+@@ -1151,7 +1157,7 @@ static void TVActionSaveImageAction(
+         else
+             len = p - dsk->fn_freeze_base;
+ 
+-        sprintf( fname, "%.*s%.3ld%s", (int)len, dsk->fn_freeze_base, 
++        sprintf( fname, "%.*s%.3d%s", (int)len, dsk->fn_freeze_base, 
+                         dsk->freeze_next_suffix, (p ? p : "") );
+     }
+     else
+@@ -1306,7 +1312,7 @@ static void TVActionVideoRecordStartActi
+     }
+ 
+     if (( *num_params == 1 ) && params[0] ) {
+-        if (( sscanf( params[0], "%ldx%ld", &w, &h ) != 2 ) ||
++        if (( sscanf( params[0], "%dx%d", &w, &h ) != 2 ) ||
+             ( w <= 0 ) || ( h <= 0 )) {
+             fprintf( stderr, 
+                 "TVActionVideoRecordStartAction:  Bad resolution.\n" );
+@@ -1426,7 +1432,7 @@ void TVActionSetVolume( TV_INT32 vol )
+     String   param[1] = { str };
+     Cardinal num_param = 1;
+ 
+-    sprintf( str, "%ld", vol );
++    sprintf( str, "%d", vol );
+     TVActionSetVolumeAction( NULL, NULL, param, &num_param );
+ }
+ 
+@@ -1436,7 +1442,7 @@ void TVActionSetVolumeRel( TV_INT32 vol_
+     String   param[1] = { str };
+     Cardinal num_param = 1;
+ 
+-    sprintf( str, "%+ld", vol_delta );
++    sprintf( str, "%+d", vol_delta );
+     TVActionSetVolumeAction( NULL, NULL, param, &num_param );
+ }
+ 
+@@ -1467,7 +1473,7 @@ void TVActionSetCaptureInputRel( TV_INT3
+     String   param[1] = { str };
+     Cardinal num_param = 1;
+ 
+-    sprintf( str, "%+ld", dev_delta );
++    sprintf( str, "%+d", dev_delta );
+     TVActionSetCaptureInputAction( NULL, NULL, param, &num_param );
+ }
+ 
+@@ -1528,7 +1534,7 @@ static void TVActionFlipStationAction(
+     }
+ 
+     if ( p->last_chan >= TV_CHAN_MIN )
+-      sprintf( chan_str, "%ld" , p->last_chan );
++      sprintf( chan_str, "%d" , p->last_chan );
+     else
+       sprintf( chan_str, "f%f", p->last_freq );
+     TVActionSetStation( chan_str );
diff --git a/multimedia/fxtv/patches/patch-ad b/multimedia/fxtv/patches/patch-ad
index 222b1314f87..d7a66ec46da 100644
--- a/multimedia/fxtv/patches/patch-ad
+++ b/multimedia/fxtv/patches/patch-ad
@@ -1,4 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2004/02/22 10:00:31 jmmv Exp $
+$NetBSD: patch-ad,v 1.3 2011/07/05 03:27:22 dholland Exp $
+
+Handle always-on-top.
+Handle png.
+Fix illegal C.
 
 --- app_rsrc.h.orig	2001-02-12 22:17:53.000000000 +0100
 +++ app_rsrc.h
diff --git a/multimedia/fxtv/patches/patch-ae b/multimedia/fxtv/patches/patch-ae
index 469023416a4..24b95fdf599 100644
--- a/multimedia/fxtv/patches/patch-ae
+++ b/multimedia/fxtv/patches/patch-ae
@@ -1,6 +1,7 @@
-$NetBSD: patch-ae,v 1.2 2011/01/14 10:55:42 wiz Exp $
+$NetBSD: patch-ae,v 1.3 2011/07/05 03:27:22 dholland Exp $
 
 Support png screenshots.
+Fix LP64 problems.
 
 --- imgsav.c.orig	1999-09-26 14:35:06.000000000 +0000
 +++ imgsav.c
@@ -13,7 +14,42 @@ Support png screenshots.
  #include <stdio.h>
  #include <stdlib.h>
  #include <unistd.h>
-@@ -254,6 +256,96 @@ void TVIMGSAVDoSaveTIFF( char filename[]
+@@ -137,7 +139,7 @@ static void TVIMGSAVFmtScanline24bpp( 
+                      break;
+             default:
+                 fprintf( stderr, 
+-                         "TVIMGSAVFmtScanline24bpp: Unsupported Bpp %ld\n",
++                         "TVIMGSAVFmtScanline24bpp: Unsupported Bpp %d\n",
+                          img->pix_geom.Bpp );
+                 exit(1);
+         }
+@@ -146,7 +148,7 @@ static void TVIMGSAVFmtScanline24bpp( 
+         if (( !img->pix_geom.swap_shorts ) &&
+             ( img->pix_geom.Bpp == 4 ))
+             pix = (pix >> 16) | (pix << 16);
+-        if ( !img->pix_geom.swap_bytes ) 
++        if ( !img->pix_geom.swap_bytes ) {
+             if ( img->pix_geom.Bpp == 3 )
+                 pix = ((pix & 0x00FF0000) >> 16) |
+                       ((pix & 0x000000FF) << 16);
+@@ -155,6 +157,7 @@ static void TVIMGSAVFmtScanline24bpp( 
+                       ((pix & 0x00FF0000) << 8) |
+                       ((pix & 0x0000FF00) >> 8) |
+                       ((pix & 0x000000FF) << 8);
++	}
+ 
+         pix       = SHIFT_AND_MASK( pix, shf[0], msk[0] ) |
+                     SHIFT_AND_MASK( pix, shf[1], msk[1] ) |
+@@ -216,7 +219,7 @@ void TVIMGSAVDoSaveTIFF( char filename[]
+ #endif
+ 
+     if ( TIFFScanlineSize(out) != linebytes ) {
+-        fprintf( stderr, "Linebytes mismatch: TIFF says %ld, we say %ld\n",
++        fprintf( stderr, "Linebytes mismatch: TIFF says %d, we say %d\n",
+                  TIFFScanlineSize(out), linebytes );
+         exit(1);
+     }
+@@ -254,6 +257,96 @@ void TVIMGSAVDoSaveTIFF( char filename[]
  }
  
  
@@ -110,7 +146,16 @@ Support png screenshots.
  void TVIMGSAVDoSavePPM( char filename[], TV_IMAGE *img )
  {
      static char     *S_fp_buf   = NULL;
-@@ -408,6 +500,9 @@ void TVIMGSAVDoSave( char filename[], TV
+@@ -288,7 +381,7 @@ void TVIMGSAVDoSavePPM( char filename[],
+         out = stdout;
+ 
+     /*  Write binary PPM header  */
+-    fprintf( out, "P6\n%ld %ld\n%d\n", img->geom.w, img->geom.h, 
++    fprintf( out, "P6\n%d %d\n%d\n", img->geom.w, img->geom.h, 
+                                      (1 << TV_BITS_PER_COMP) - 1 );
+ 
+     linebytes = img->geom.w * TV_BYTES_PER_PIX;
+@@ -408,6 +501,9 @@ void TVIMGSAVDoSave( char filename[], TV
              }
              TVIMGSAVDoSaveTIFF( filename, img );  break;
  
diff --git a/multimedia/fxtv/patches/patch-af b/multimedia/fxtv/patches/patch-af
index 85d821a4363..5f05539055e 100644
--- a/multimedia/fxtv/patches/patch-af
+++ b/multimedia/fxtv/patches/patch-af
@@ -1,4 +1,9 @@
-$NetBSD: patch-af,v 1.2 2006/01/03 15:03:02 joerg Exp $
+$NetBSD: patch-af,v 1.3 2011/07/05 03:27:22 dholland Exp $
+
+Dragonfly support.
+Use correct sysctl mibs on NetBSD.
+Fix LP64 problems.
+Fix illegal C.
 
 --- tvutil.c.orig	2000-10-23 02:43:46.000000000 +0000
 +++ tvutil.c
@@ -28,3 +33,53 @@ $NetBSD: patch-af,v 1.2 2006/01/03 15:03:02 joerg Exp $
  #elif defined(__OpenBSD__)
      int    mib[2] = { CTL_KERN, OPEN_MAX };
  #endif
+@@ -184,14 +184,14 @@ void TVUTILCmdStrToArgList(
+     *argbuf = NULL;
+ 
+     while ( *s != '\0' ) {                      /*  For all args    */
+-        while ( isspace( *s ) )                 /*    Skip spaces   */
++        while ( isspace( (unsigned char)*s ) )                 /*    Skip spaces   */
+             s++;
+         if ( *s == '\0' )
+             continue;
+ 
+         in_quote = FALSE;                       /*    Extract an arg  */
+         p        = arg;
+-        while ( (in_quote || !isspace(*s)) && (*s != '\0') ) {
++        while ( (in_quote || !isspace((unsigned char)*s)) && (*s != '\0') ) {
+             ignore = FALSE;
+ 
+             if (( *s == '\'' ) || ( *s == '\"' ))
+@@ -450,7 +450,7 @@ void TVUTILPipeCleanup( pid_t           
+          (( end[2].fd >= 0 ) && end[2].is_pipe &&
+           ( close( end[2].fd ) < 0 )) ||
+ 
+-         ( waitpid( child_pid, &status, NULL ) < 0 )  ||
++         ( waitpid( child_pid, &status, 0 ) < 0 )  ||
+ 
+          (( end[0].fd >= 0 ) && end[1].is_pipe &&
+           ((  dup2( end[0].fd_saved, end[0].fd ) < 0 )   ||
+@@ -475,15 +475,19 @@ void TVUTILPipeCleanup( pid_t           
+ /*  TVUTILstrupr - Convert a string to upper case  */
+ void TVUTILstrupr( char *str )
+ {
+-    while ( *str != '\0' )
+-        *(str++) = toupper( *str );
++    while ( *str != '\0' ) {
++        *str = toupper( (unsigned char)*str );
++	str++;
++    }
+ }
+ 
+ /*  TVUTILstrlwr - Convert a string to lower case  */
+ void TVUTILstrlwr( char *str )
+ {
+-    while ( *str != '\0' )
+-        *(str++) = tolower( *str );
++    while ( *str != '\0' ) {
++        *str = tolower( (unsigned char)*str );
++	str++;
++    }
+ }
+ 
+ /*  TVUTILStrStrip - Strip selected characters out of a string  */
diff --git a/multimedia/fxtv/patches/patch-ag b/multimedia/fxtv/patches/patch-ag
index dfdef768194..f5e0daa7794 100644
--- a/multimedia/fxtv/patches/patch-ag
+++ b/multimedia/fxtv/patches/patch-ag
@@ -1,4 +1,7 @@
-$NetBSD: patch-ag,v 1.1.1.1 2004/01/26 11:36:38 jmmv Exp $
+$NetBSD: patch-ag,v 1.2 2011/07/05 03:27:22 dholland Exp $
+
+Handle png.
+Use raw instead of AIFF for ... (unclear what) ...
 
 --- fxtv_cnvt.sh.orig	Mon Feb 12 22:18:40 2001
 +++ fxtv_cnvt.sh
diff --git a/multimedia/fxtv/patches/patch-ah b/multimedia/fxtv/patches/patch-ah
index e835f0ffc2a..9075955b640 100644
--- a/multimedia/fxtv/patches/patch-ah
+++ b/multimedia/fxtv/patches/patch-ah
@@ -1,4 +1,6 @@
-$NetBSD: patch-ah,v 1.1.1.1 2004/01/26 11:36:38 jmmv Exp $
+$NetBSD: patch-ah,v 1.2 2011/07/05 03:27:22 dholland Exp $
+
+Handle png.
 
 --- imgsav_dlg.c.orig	Mon Sep  6 15:07:29 1999
 +++ imgsav_dlg.c
diff --git a/multimedia/fxtv/patches/patch-ai b/multimedia/fxtv/patches/patch-ai
index e18ccbaaff7..95feb908c0b 100644
--- a/multimedia/fxtv/patches/patch-ai
+++ b/multimedia/fxtv/patches/patch-ai
@@ -1,6 +1,9 @@
-$NetBSD: patch-ai,v 1.1.1.1 2004/01/26 11:36:38 jmmv Exp $
+$NetBSD: patch-ai,v 1.2 2011/07/05 03:27:22 dholland Exp $
 
---- batch_mode.c.orig	Sat Oct 23 15:50:35 1999
+Support png.
+Fix LP64 problems.
+
+--- batch_mode.c.orig	1999-10-23 13:50:35.000000000 +0000
 +++ batch_mode.c
 @@ -154,6 +154,8 @@ static void DoStreamVideo( TV_BATCH_PARM
  
@@ -19,7 +22,24 @@ $NetBSD: patch-ai,v 1.1.1.1 2004/01/26 11:36:38 jmmv Exp $
              case TV_STILL_FMT_PPM  : frame_ext = "ppm";  break;
              case TV_STILL_FMT_YUV  : frame_ext = "yuv";  break;
              default: abort();
-@@ -209,7 +212,8 @@ static void DoStreamVideo( TV_BATCH_PARM
+@@ -187,7 +190,7 @@ static void DoStreamVideo( TV_BATCH_PARM
+     }
+ 
+     /*  Prepare the audio output filedesc  */
+-    if ( parm->audio_target )
++    if ( parm->audio_target ) {
+         if ( audio2stdout )
+             aud_fd = 1;
+         else
+@@ -197,6 +200,7 @@ static void DoStreamVideo( TV_BATCH_PARM
+                          parm->audio_target );
+                 exit(1);
+             }
++    }
+ 
+     /*  Read header  */
+     if ( !TVRAWVIDEOHeaderRead( rf, &img, &snd, &eof ) ) {
+@@ -209,7 +213,8 @@ static void DoStreamVideo( TV_BATCH_PARM
          return;
  
      /*  Sanity check raw data with save type  */
@@ -29,3 +49,12 @@ $NetBSD: patch-ai,v 1.1.1.1 2004/01/26 11:36:38 jmmv Exp $
            ( img.pix_geom.type != TV_PIXELTYPE_RGB )) ||
           (( fmt == TV_STILL_FMT_YUV ) &&
            ( img.pix_geom.type != TV_PIXELTYPE_YUV )) ) {
+@@ -288,7 +293,7 @@ static void DoStreamVideo( TV_BATCH_PARM
+                 else {
+                     char suffix[80];
+ 
+-                    sprintf( suffix, ".%.5ld.%s", frame_no++, frame_ext );
++                    sprintf( suffix, ".%.5d.%s", frame_no++, frame_ext );
+ 
+                     sprintf( img_fname, parm->video_target, suffix );
+                     if ( i == 0 ) {
diff --git a/multimedia/fxtv/patches/patch-aj b/multimedia/fxtv/patches/patch-aj
index 1eb4a5e69a8..ab8d0433e0b 100644
--- a/multimedia/fxtv/patches/patch-aj
+++ b/multimedia/fxtv/patches/patch-aj
@@ -1,4 +1,7 @@
-$NetBSD: patch-aj,v 1.2 2004/02/22 10:00:31 jmmv Exp $
+$NetBSD: patch-aj,v 1.3 2011/07/05 03:27:22 dholland Exp $
+
+Handle always-on-top.
+Handle png.
 
 --- Fxtv.orig	2003-09-28 17:38:29.000000000 +0200
 +++ Fxtv	2003-09-28 17:38:29.000000000 +0200
diff --git a/multimedia/fxtv/patches/patch-ak b/multimedia/fxtv/patches/patch-ak
index 82ada6b8419..f27b0b00a9f 100644
--- a/multimedia/fxtv/patches/patch-ak
+++ b/multimedia/fxtv/patches/patch-ak
@@ -1,4 +1,7 @@
-$NetBSD: patch-ak,v 1.1.1.1 2004/01/26 11:36:40 jmmv Exp $
+$NetBSD: patch-ak,v 1.2 2011/07/05 03:27:22 dholland Exp $
+
+Handle always-on-top.
+Handle png.
 
 --- glob.h.orig	2001-02-12 20:24:44.000000000 +0100
 +++ glob.h
diff --git a/multimedia/fxtv/patches/patch-al b/multimedia/fxtv/patches/patch-al
index 673575ccb23..12df38d39a3 100644
--- a/multimedia/fxtv/patches/patch-al
+++ b/multimedia/fxtv/patches/patch-al
@@ -1,6 +1,9 @@
-$NetBSD: patch-al,v 1.1.1.1 2004/01/26 11:36:40 jmmv Exp $
+$NetBSD: patch-al,v 1.2 2011/07/05 03:27:22 dholland Exp $
 
---- vidsav_dlg.c.orig	Mon Feb 12 22:20:10 2001
+Support png.
+Fix LP64 problems.
+
+--- vidsav_dlg.c.orig	2001-02-12 21:20:10.000000000 +0000
 +++ vidsav_dlg.c
 @@ -235,6 +235,7 @@ static TV_ICAPFMT_ITEM_DEF     Icap_fmt_
  
@@ -10,7 +13,114 @@ $NetBSD: patch-al,v 1.1.1.1 2004/01/26 11:36:40 jmmv Exp $
      { TV_STILL_FMT_PPM    ,  "ppm" , "ppmCmd"  },
      { TV_STILL_FMT_YUV    ,  "yuv" , "yuvCmd"  }
  };
-@@ -872,6 +873,7 @@ static TV_BOOL WriteVidConvertShScript( 
+@@ -270,7 +271,7 @@ static void SetMenuSelection( Widget men
+             }
+         if ( i >= Icap_fmt_item_def_size ) {
+             fprintf( stderr, 
+-                     "TVVIDSAVDIALOGSetSel: Unsupported filefmt %lu\n", 
++                     "TVVIDSAVDIALOGSetSel: Unsupported filefmt %u\n", 
+                      choice );
+             exit(1);
+         }
+@@ -287,7 +288,7 @@ static void SetMenuSelection( Widget men
+             }
+         if ( i >= Ifile_fmt_item_def_size ) {
+             fprintf( stderr, 
+-                     "TVVIDSAVDIALOGSetSel: Unsupported filefmt %lu\n", 
++                     "TVVIDSAVDIALOGSetSel: Unsupported filefmt %u\n", 
+                      choice );
+             exit(1);
+         }
+@@ -304,7 +305,7 @@ static void SetMenuSelection( Widget men
+             }
+         if ( i >= Ffmt_item_def_size ) {
+             fprintf( stderr, 
+-                     "TVVIDSAVDIALOGSetSel: Unsupported filefmt %lu\n", 
++                     "TVVIDSAVDIALOGSetSel: Unsupported filefmt %u\n", 
+                      choice );
+             exit(1);
+         }
+@@ -321,7 +322,7 @@ static void SetMenuSelection( Widget men
+             }
+         if ( i >= Sfmt_item_def_size ) {
+             fprintf( stderr, 
+-                     "TVVIDSAVDIALOGSetSel: Unsupported sampfmt %lu\n", 
++                     "TVVIDSAVDIALOGSetSel: Unsupported sampfmt %u\n", 
+                      choice );
+             exit(1);
+         }
+@@ -338,7 +339,7 @@ static void SetMenuSelection( Widget men
+             }
+         if ( i >= Chan_item_def_size ) {
+             fprintf( stderr, 
+-                     "TVVIDSAVDIALOGSetSel: Unsupported #chan %lu\n", 
++                     "TVVIDSAVDIALOGSetSel: Unsupported #chan %u\n", 
+                      choice );
+             exit(1);
+         }
+@@ -355,7 +356,7 @@ static void SetMenuSelection( Widget men
+             }
+         if ( i >= Rate_item_def_size ) {
+             fprintf( stderr, 
+-                     "TVVIDSAVDIALOGSetSel: Unsupported rate %lu\n", 
++                     "TVVIDSAVDIALOGSetSel: Unsupported rate %u\n", 
+                      choice );
+             exit(1);
+         }
+@@ -372,7 +373,7 @@ static void SetMenuSelection( Widget men
+             }
+         if ( i >= XtNumber( Vtrg_item_def ) ) {
+             fprintf( stderr, 
+-                     "TVVIDSAVDIALOGSetSel: Unsupported filefmt %lu\n", 
++                     "TVVIDSAVDIALOGSetSel: Unsupported filefmt %u\n", 
+                      choice );
+             exit(1);
+         }
+@@ -507,7 +508,7 @@ static TV_BOOL PrepareForVideo( TV_BOOL 
+                              NULL );
+     if ( str == NULL )
+         str = "";
+-    if (( sscanf( str, "%ldx%ld", &g.w, &g.h ) != 2 ) ||
++    if (( sscanf( str, "%dx%d", &g.w, &g.h ) != 2 ) ||
+         !TVCAPTUREValidRegionGeom( c, &g )) {
+         XUTILDialogPause( TVTOPLEVEL, "Error", "Invalid size.",
+                           TV_DIALOG_TYPE_OK );
+@@ -521,7 +522,7 @@ static TV_BOOL PrepareForVideo( TV_BOOL 
+                                  NULL );
+         if ( str == NULL )
+             str = "";
+-        if (( sscanf( str, "%ld", &fps ) != 1 ) ||
++        if (( sscanf( str, "%d", &fps ) != 1 ) ||
+             ( fps < 1 ) || ( fps > c->fps_max )) {
+             XUTILDialogPause( TVTOPLEVEL, "Error", "Invalid speed.",
+                               TV_DIALOG_TYPE_OK );
+@@ -840,7 +841,7 @@ static TV_BOOL WriteVidConvertShScript( 
+     }
+     fprintf( fp, "AUDIO_CAP_FMT_SAMPLE='%s'\n", str );
+     fprintf( fp, "AUDIO_CAP_FMT_CHAN='%d'\n", p->snd_fmt.stereo ? 2 : 1 );
+-    fprintf( fp, "AUDIO_CAP_FMT_FREQ='%ld'\n", p->snd_fmt.samp_rate );
++    fprintf( fp, "AUDIO_CAP_FMT_FREQ='%d'\n", p->snd_fmt.samp_rate );
+ 
+     switch ( p->snd_fmt.file_fmt ) {
+         case TV_AUDIO_FILE_FMT_RAW    : str = "RAW"  ;  break;
+@@ -855,8 +856,8 @@ static TV_BOOL WriteVidConvertShScript( 
+         
+     fprintf( fp, "AUDIO_TARGET_FMT='%s'\n\n", str );
+ 
+-    fprintf( fp, "VIDEO_RES_X='%ld'\n", p->geom.w );
+-    fprintf( fp, "VIDEO_RES_Y='%ld'\n", p->geom.h );
++    fprintf( fp, "VIDEO_RES_X='%d'\n", p->geom.w );
++    fprintf( fp, "VIDEO_RES_Y='%d'\n", p->geom.h );
+    
+     switch ( p->img_cap_fmt ) {
+         case TV_ICAP_FMT_RGB16 : str = "RGB16";  break;
+@@ -867,11 +868,12 @@ static TV_BOOL WriteVidConvertShScript( 
+     }
+ 
+     fprintf( fp, "VIDEO_CAP_FMT='%s'\n", str );
+-    fprintf( fp, "VIDEO_TARGET_FPS='%ld'\n", p->fps );
++    fprintf( fp, "VIDEO_TARGET_FPS='%d'\n", p->fps );
+     fprintf( fp, "VIDEO_STREAM='%s'\n\n", ( p->streaming ? "YES" : "NO" ) );
  
      switch ( p->img_sav_fmt ) {
          case TV_STILL_FMT_TIFF : str = "TIFF";  break;
@@ -18,3 +128,43 @@ $NetBSD: patch-al,v 1.1.1.1 2004/01/26 11:36:40 jmmv Exp $
          case TV_STILL_FMT_PPM  : str = "PPM" ;  break;
          case TV_STILL_FMT_YUV  : str = "YUV" ;  break;
          default                : str = ""    ;  break;
+@@ -1202,7 +1204,7 @@ static void RecordCmdCB( Widget w, XtPoi
+ 
+         /*  This is a cheesy first-cut  */
+         fps = Vid_stats.frames*1000000L/Vid_stats.time_us;
+-        sprintf( str, "%ld", fps );
++        sprintf( str, "%d", fps );
+         TextValUpdate( FPS_text, str );
+     }
+ 
+@@ -1926,10 +1928,10 @@ void TVVIDSAVDIALOGResync()
+     /*  Set text fields to current settings  */
+     TextValUpdate( Fname_text, d->fn_video_base );
+ 
+-    sprintf( str, "%ldx%ld", d->video.geom.w, d->video.geom.h );
++    sprintf( str, "%dx%d", d->video.geom.w, d->video.geom.h );
+     TextValUpdate( Res_text, str );
+ 
+-    sprintf( str, "%ld", d->video.fps );
++    sprintf( str, "%d", d->video.fps );
+     TextValUpdate( FPS_text, str );
+ 
+     /*  Set selections based on active format  */
+@@ -2048,7 +2050,7 @@ void TVVIDSAVDIALOGNewFrameHdlr( TV_IMAG
+             else
+                 in_a_row = 0;
+ 
+-            VDPRINTF(("%4ld: Delay = %7ld us (Avg = %7ld ms, FPS = %2ld)%s\n", 
++            VDPRINTF(("%4d: Delay = %7ld us (Avg = %7d ms, FPS = %2ld)%s\n", 
+                        Vid_stats.frames, diff, 
+                        Vid_stats.time_us/Vid_stats.frames/1000, 
+                        Vid_stats.frames*1000000L/Vid_stats.time_us,
+@@ -2158,7 +2160,7 @@ void TVVIDSAVDIALOGRecordStart( TV_INT32
+         d->video.geom.w = w;
+         d->video.geom.h = h;
+         if ( Res_text ) {
+-            sprintf( res_str, "%ldx%ld", w,h );
++            sprintf( res_str, "%dx%d", w,h );
+             TextValUpdate( Res_text, res_str );
+         }
+     }
diff --git a/multimedia/fxtv/patches/patch-am b/multimedia/fxtv/patches/patch-am
index 087dd16296b..40ff468abab 100644
--- a/multimedia/fxtv/patches/patch-am
+++ b/multimedia/fxtv/patches/patch-am
@@ -1,4 +1,6 @@
-$NetBSD: patch-am,v 1.1 2006/01/05 19:07:44 joerg Exp $
+$NetBSD: patch-am,v 1.2 2011/07/05 03:27:22 dholland Exp $
+
+Dragonfly support.
 
 --- tvcapture.h.orig	2006-01-03 14:45:01.000000000 +0000
 +++ tvcapture.h
diff --git a/multimedia/fxtv/patches/patch-an b/multimedia/fxtv/patches/patch-an
index fc75aa110a4..095be132394 100644
--- a/multimedia/fxtv/patches/patch-an
+++ b/multimedia/fxtv/patches/patch-an
@@ -1,4 +1,6 @@
-$NetBSD: patch-an,v 1.1 2006/01/03 15:03:02 joerg Exp $
+$NetBSD: patch-an,v 1.2 2011/07/05 03:27:22 dholland Exp $
+
+Dragonfly support.
 
 --- voxware.h.orig	2006-01-03 14:46:08.000000000 +0000
 +++ voxware.h
diff --git a/multimedia/fxtv/patches/patch-annot_c b/multimedia/fxtv/patches/patch-annot_c
new file mode 100644
index 00000000000..85992b163bf
--- /dev/null
+++ b/multimedia/fxtv/patches/patch-annot_c
@@ -0,0 +1,33 @@
+$NetBSD: patch-annot_c,v 1.1 2011/07/05 03:27:22 dholland Exp $
+
+Fix LP64 problems.
+
+--- annot.c~	1999-09-05 18:42:16.000000000 +0000
++++ annot.c
+@@ -57,7 +57,7 @@
+ 
+ #define AUTOMODE_TIMER_MS 8
+ 
+-#define VOLUME_FMT "Volume: %ld%%"
++#define VOLUME_FMT "Volume: %d%%"
+ #define MUTE_STR   "MUTE"
+ 
+ /*#define FNPRINTF(x) printf x*/
+@@ -444,7 +444,7 @@ static void TVANNOTVolumePropSetDrawable
+     }
+ 
+     /*  Determine new location  */
+-    sprintf( str, VOLUME_FMT, 100L );
++    sprintf( str, VOLUME_FMT, 100 );
+     str_width = XmbTextEscapement( p->fontset, str, strlen(str) );
+     extents    = XExtentsOfFontSet( p->fontset );
+ 
+@@ -607,7 +607,7 @@ static TV_BOOL TVANNOTStationPropUpdate(
+                                                     station->freq );
+     }
+     else if ( state.tuner_chan_active )
+-        sprintf( chan_str, "%ld", state.tuner_chan );
++        sprintf( chan_str, "%d", state.tuner_chan );
+     else
+         sprintf( chan_str, "%.2f MHz", state.tuner_freq );
+ 
diff --git a/multimedia/fxtv/patches/patch-ao b/multimedia/fxtv/patches/patch-ao
index e477b2f236b..83e25a07327 100644
--- a/multimedia/fxtv/patches/patch-ao
+++ b/multimedia/fxtv/patches/patch-ao
@@ -1,8 +1,19 @@
-$NetBSD: patch-ao,v 1.1 2006/01/05 19:07:44 joerg Exp $
+$NetBSD: patch-ao,v 1.2 2011/07/05 03:27:22 dholland Exp $
 
---- haup_remote.c.orig	2006-01-03 14:47:24.000000000 +0000
+Needs sys/ioctl.h.
+Dragonfly support.
+
+--- haup_remote.c.orig	2000-05-21 15:10:04.000000000 +0000
 +++ haup_remote.c
-@@ -38,6 +38,9 @@
+@@ -31,6 +31,7 @@
+  *
+  */
+ 
++#include <sys/ioctl.h>
+ #include <string.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+@@ -38,6 +39,9 @@
  #include <sys/fcntl.h>
  #ifdef __NetBSD__
  # include <dev/ic/bt8xx.h>
diff --git a/multimedia/fxtv/patches/patch-ap b/multimedia/fxtv/patches/patch-ap
index 668a9dbca74..6439e82118e 100644
--- a/multimedia/fxtv/patches/patch-ap
+++ b/multimedia/fxtv/patches/patch-ap
@@ -1,4 +1,6 @@
-$NetBSD: patch-ap,v 1.1 2006/06/30 18:11:39 tron Exp $
+$NetBSD: patch-ap,v 1.2 2011/07/05 03:27:22 dholland Exp $
+
+Fix illegal C.
 
 --- videolib/videolib.c.orig	1999-11-03 02:22:04.000000000 +0000
 +++ videolib/videolib.c	2006-06-30 19:10:23.000000000 +0100
diff --git a/multimedia/fxtv/patches/patch-appear_dlg_c b/multimedia/fxtv/patches/patch-appear_dlg_c
new file mode 100644
index 00000000000..4b453eb3f3d
--- /dev/null
+++ b/multimedia/fxtv/patches/patch-appear_dlg_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-appear_dlg_c,v 1.1 2011/07/05 03:27:22 dholland Exp $
+
+Fix LP64 warning.
+
+--- appear_dlg.c~	1999-09-04 18:10:26.000000000 +0000
++++ appear_dlg.c
+@@ -159,7 +159,7 @@ static void ControlSliderScrollCB( Widge
+     TV_CAPTURE        *c       = &G_glob.capture;
+     TV_APPEAR_CTL_DEF *r       = (TV_APPEAR_CTL_DEF *) cl_data;
+     float              percent;
+-    int                pos     = (int)cb_data;
++    int                pos     = (intptr_t)cb_data;
+     Dimension          length;
+     double             lim[2],
+                        val;
diff --git a/multimedia/fxtv/patches/patch-aq b/multimedia/fxtv/patches/patch-aq
index 361b080f2c0..ca24c4eced7 100644
--- a/multimedia/fxtv/patches/patch-aq
+++ b/multimedia/fxtv/patches/patch-aq
@@ -1,6 +1,9 @@
-$NetBSD: patch-aq,v 1.1 2006/01/03 15:03:02 joerg Exp $
+$NetBSD: patch-aq,v 1.2 2011/07/05 03:27:22 dholland Exp $
 
---- tvcapture.c.orig	2006-01-03 14:52:51.000000000 +0000
+Support Dragonfly.
+Fix LP64 problems.
+
+--- tvcapture.c.orig	2001-02-12 18:59:22.000000000 +0000
 +++ tvcapture.c
 @@ -37,6 +37,8 @@
  #include <sys/mman.h>
@@ -11,3 +14,92 @@ $NetBSD: patch-aq,v 1.1 2006/01/03 15:03:02 joerg Exp $
  #else
  # include <machine/ioctl_bt848.h>
  #endif
+@@ -238,7 +240,7 @@ TV_BOOL TVCAPTUREGetPendingFrame( TV_IMA
+             return FALSE;
+ 
+         if ( S_frame_done_count-- > 0 )
+-            DRVPRINTF(( "%ld frames behind\n", S_frame_done_count ));
++            DRVPRINTF(( "%d frames behind\n", S_frame_done_count ));
+ 
+         image.buf = c->drv_buf;
+         memcpy( &image.geom, &c->geom, sizeof( image.geom ) );
+@@ -815,7 +817,7 @@ TV_BOOL TVCAPTUREQueryDriverState( TV_CA
+         case METEOR_INPUT_DEV3       : s->input_dev = TV_DEVICE_DEV3   ; break;
+ #endif
+         default :
+-             fprintf( stderr, "TVCAPTUREQueryDriverState(): Bad INPUT %ld\n",
++             fprintf( stderr, "TVCAPTUREQueryDriverState(): Bad INPUT %d\n",
+                       larg );
+              return False;
+     }
+@@ -835,7 +837,7 @@ TV_BOOL TVCAPTUREQueryDriverState( TV_CA
+         case BT848_IFORM_F_SECAM   : s->input_fmt = TV_INPUT_SECAM   ;  break;
+         case BT848_IFORM_F_RSVD    : s->input_fmt = TV_INPUT_PALNCOMB;  break;
+         default :
+-             fprintf( stderr, "TVCAPTUREQueryDriverState(): Bad FMT %ld\n",
++             fprintf( stderr, "TVCAPTUREQueryDriverState(): Bad FMT %d\n",
+                       larg );
+              return False;
+     }
+@@ -1289,7 +1291,7 @@ void TVCAPTUREPrintPixelFormats( TV_CAPT
+         }
+ 
+         SUPRINTF(( 
+-            "    %2ld  %2ld   %.8lx, %.8lx, %.8lx  %s\n",
++            "    %2d  %2d   %.8x, %.8x, %.8x  %s\n",
+             bpp, pg->Bpp, pg->mask[0], pg->mask[1], pg->mask[2], 
+             swap_chars ));
+     }
+@@ -1306,7 +1308,7 @@ void TVCAPTUREPrintPixelFormats( TV_CAPT
+             continue;
+         
+         SUPRINTF(( 
+-          "    %ld,%ld,%ld   %ld,%ld,%ld  %ld,%ld,%ld  %-7s %-10s  "
++          "    %d,%d,%d   %d,%d,%d  %d,%d,%d  %-7s %-10s  "
+           "%-5s %-6s %s\n",
+           pg->samp_size [0], pg->samp_size [1], pg->samp_size [2],
+           pg->samp_int_h[0], pg->samp_int_h[1], pg->samp_int_h[2],
+@@ -1535,7 +1537,7 @@ void TVCAPTUREInit( TV_CAPTURE *c )
+     c->contrast      =  70.0; /* % */
+     c->sat_u         =  100.0; /* % */
+     c->sat_v         =  100.0; /* % */
+-    c->addr          = NULL;
++    c->addr          = 0;
+     /*  geom -- see below */
+ 
+     c->frame_done_cb    = NULL;
+@@ -1565,7 +1567,7 @@ void TVCAPTUREInit( TV_CAPTURE *c )
+         default                :
+         case TV_INPUT_AUTO     :
+             fprintf( stderr, 
+-             "TVCAPTUREInit: Unsupported input format %ld\n", 
++             "TVCAPTUREInit: Unsupported input format %d\n", 
+              c->input_format );
+             exit(1);
+     }
+@@ -1729,7 +1731,7 @@ TV_BOOL TVCAPTUREConfigure( TV_CAPTURE  
+         goto RETURN;
+     }
+ 
+-    if ( c->xfer_mode == TV_TRANSFER_DIRECT )
++    if ( c->xfer_mode == TV_TRANSFER_DIRECT ) {
+         if ( !( x->visual_modes[ x->active_visual ] & TV_TRANSFER_DIRECT )) {
+             strcpy( S_err_msg, "Active visual does not support direct video");
+             goto RETURN;
+@@ -1738,6 +1740,7 @@ TV_BOOL TVCAPTUREConfigure( TV_CAPTURE  
+             strcpy( S_err_msg, "Direct transfer only supported for video" );
+             goto RETURN;
+         }
++    }
+ 
+     /*  Get capture geometry  */
+     if ( c->xfer_mode == TV_TRANSFER_DIRECT ) {
+@@ -1752,7 +1755,7 @@ TV_BOOL TVCAPTUREConfigure( TV_CAPTURE  
+     /*  Verify res limits and precision (all modes)  */
+     if (( g.w != g.w / c->width_res  * c->width_res  ) ||
+         ( g.h != g.h / c->height_res * c->height_res )) {
+-        sprintf( S_err_msg, "Capture geometry must be a multiple of %ldx%ld",
++        sprintf( S_err_msg, "Capture geometry must be a multiple of %dx%d",
+                  c->width_res, c->height_res );
+         goto RETURN;
+     }
diff --git a/multimedia/fxtv/patches/patch-audiocnvt_c b/multimedia/fxtv/patches/patch-audiocnvt_c
new file mode 100644
index 00000000000..d207ec97d35
--- /dev/null
+++ b/multimedia/fxtv/patches/patch-audiocnvt_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-audiocnvt_c,v 1.1 2011/07/05 03:27:22 dholland Exp $
+
+Fix LP64 problems.
+
+--- audiocnvt.c~	1999-09-04 18:27:13.000000000 +0000
++++ audiocnvt.c
+@@ -166,7 +166,7 @@ void TVAUDIOCNVTBuildSoundFmtSoxArgs(
+ 
+     if ( fmt->file_fmt == TV_AUDIO_FILE_FMT_RAW ) {
+         srec = GetSampleFmtDef( fmt->samp_fmt );
+-        sprintf( args, "%s -c %d -r %ld",
++        sprintf( args, "%s -c %d -r %d",
+                  srec->sox_opt, fmt->stereo ? 2 : 1, fmt->samp_rate );
+     }
+     else {
diff --git a/multimedia/fxtv/patches/patch-audsav_dlg_c b/multimedia/fxtv/patches/patch-audsav_dlg_c
new file mode 100644
index 00000000000..453778306ea
--- /dev/null
+++ b/multimedia/fxtv/patches/patch-audsav_dlg_c
@@ -0,0 +1,51 @@
+$NetBSD: patch-audsav_dlg_c,v 1.1 2011/07/05 03:27:22 dholland Exp $
+
+Fix LP64 problems.
+
+--- audsav_dlg.c~	1999-09-04 18:09:01.000000000 +0000
++++ audsav_dlg.c
+@@ -154,7 +154,7 @@ static void SetMenuSelection( Widget men
+             }
+         if ( i >= XtNumber( Ffmt_item_def ) ) {
+             fprintf( stderr, 
+-                     "TVAUDSAVDIALOGSetSel: Unsupported filefmt %ld\n", 
++                     "TVAUDSAVDIALOGSetSel: Unsupported filefmt %d\n", 
+                      choice );
+             exit(1);
+         }
+@@ -171,7 +171,7 @@ static void SetMenuSelection( Widget men
+             }
+         if ( i >= XtNumber( Sfmt_item_def ) ) {
+             fprintf( stderr, 
+-                     "TVAUDSAVDIALOGSetSel: Unsupported sampfmt %ld\n", 
++                     "TVAUDSAVDIALOGSetSel: Unsupported sampfmt %d\n", 
+                      choice );
+             exit(1);
+         }
+@@ -187,7 +187,7 @@ static void SetMenuSelection( Widget men
+                 break;
+             }
+         if ( i >= XtNumber( Chan_item_def ) ) {
+-            fprintf( stderr, "TVAUDSAVDIALOGSetSel: Unsupported #chan %ld\n", 
++            fprintf( stderr, "TVAUDSAVDIALOGSetSel: Unsupported #chan %d\n", 
+                              choice );
+             exit(1);
+         }
+@@ -203,7 +203,7 @@ static void SetMenuSelection( Widget men
+                 break;
+             }
+         if ( i >= XtNumber( Rate_item_def ) ) {
+-            fprintf( stderr, "TVAUDSAVDIALOGSetSel: Unsupported rate %ld\n", 
++            fprintf( stderr, "TVAUDSAVDIALOGSetSel: Unsupported rate %d\n", 
+                              choice );
+             exit(1);
+         }
+@@ -698,7 +698,7 @@ static void PlaybackCmdCB( Widget w, XtP
+                 break;
+ 
+         /*  Build Cmd: "sox %s - %s -c %d -r %d -"  */
+-        sprintf( shell_cmd, "sox %s - %s -c %d -r %ld -",
++        sprintf( shell_cmd, "sox %s - %s -c %d -r %d -",
+                  Ffmt_item_def[j].sox_opt, Sfmt_item_def[i].sox_opt,
+                  Sel_stereo ? 2 : 1, Sel_rate );
+     }
diff --git a/multimedia/fxtv/patches/patch-ba b/multimedia/fxtv/patches/patch-ba
index 9d27d72646f..ca247639d5f 100644
--- a/multimedia/fxtv/patches/patch-ba
+++ b/multimedia/fxtv/patches/patch-ba
@@ -1,4 +1,8 @@
-$NetBSD: patch-ba,v 1.2 2006/01/03 15:03:02 joerg Exp $
+$NetBSD: patch-ba,v 1.3 2011/07/05 03:27:22 dholland Exp $
+
+Deal with mouse headers.
+Fix illegal C.
+Dragonfly support.
 
 --- remote.c.orig	2001-02-12 21:05:08.000000000 +0000
 +++ remote.c
diff --git a/multimedia/fxtv/patches/patch-bb b/multimedia/fxtv/patches/patch-bb
index 61c3669d0e8..b3045961d32 100644
--- a/multimedia/fxtv/patches/patch-bb
+++ b/multimedia/fxtv/patches/patch-bb
@@ -1,4 +1,6 @@
-$NetBSD: patch-bb,v 1.1.1.1 2004/01/26 11:36:40 jmmv Exp $
+$NetBSD: patch-bb,v 1.2 2011/07/05 03:27:22 dholland Exp $
+
+Handle always-on-top.
 
 --- glob.c.orig	2001-02-12 19:26:16.000000000 +0100
 +++ glob.c
diff --git a/multimedia/fxtv/patches/patch-bc b/multimedia/fxtv/patches/patch-bc
index 561fbd488c2..89d402b68c6 100644
--- a/multimedia/fxtv/patches/patch-bc
+++ b/multimedia/fxtv/patches/patch-bc
@@ -1,6 +1,9 @@
-$NetBSD: patch-bc,v 1.1.1.1 2004/01/26 11:36:40 jmmv Exp $
+$NetBSD: patch-bc,v 1.2 2011/07/05 03:27:22 dholland Exp $
 
---- tvmenu.c.orig	2001-02-12 22:19:33.000000000 +0100
+Handle always-on-top.
+Fix LP64 problems.
+
+--- tvmenu.c.orig	2001-02-12 21:19:33.000000000 +0000
 +++ tvmenu.c
 @@ -103,7 +103,7 @@ typedef void XT_CB( Widget w, XtPointer 
  
@@ -36,6 +39,15 @@ $NetBSD: patch-bc,v 1.1.1.1 2004/01/26 11:36:40 jmmv Exp $
  void TVMENUSetSelectedInputFormat( TV_INPUT_FORMAT fmt )
  {
      TV_MENUITEM_DEF *mi;
+@@ -896,7 +907,7 @@ void TVTOOLSSetToggleState( TV_TOOLITEM_
+             break;
+ 
+     if ( i >= XtNumber( Toolitem_def ) ) {
+-        fprintf( stderr, "TVTOOLSETSetToggleState: Bad key %ld\n", i );
++        fprintf( stderr, "TVTOOLSETSetToggleState: Bad key %d\n", i );
+         exit(1);
+     }
+ 
 @@ -1008,6 +1019,19 @@ void TVMENUSetSelectedAfcMode( TV_BOOL a
                                  NULL);
  }
@@ -64,3 +76,12 @@ $NetBSD: patch-bc,v 1.1.1.1 2004/01/26 11:36:40 jmmv Exp $
  }
  
  /*  TVTOOLSSetStationText  -  Sets the channel text to the specified      */
+@@ -1134,7 +1159,7 @@ void TVTOOLSResync()
+         strncat( chan_str, station->id, sizeof(chan_str)-1 );
+     }
+     else if ( s.tuner_chan_active )
+-        sprintf( chan_str, "%ld", s.tuner_chan );
++        sprintf( chan_str, "%d", s.tuner_chan );
+     else
+         sprintf( chan_str, "f%.2f", s.tuner_freq );
+ 
diff --git a/multimedia/fxtv/patches/patch-bd b/multimedia/fxtv/patches/patch-bd
index 4935b444f95..1e9b0cd7fe6 100644
--- a/multimedia/fxtv/patches/patch-bd
+++ b/multimedia/fxtv/patches/patch-bd
@@ -1,4 +1,6 @@
-$NetBSD: patch-bd,v 1.1.1.1 2004/01/26 11:36:40 jmmv Exp $
+$NetBSD: patch-bd,v 1.2 2011/07/05 03:27:22 dholland Exp $
+
+Handle always-on-top.
 
 --- tvmenu.h.orig	2001-02-12 20:00:59.000000000 +0100
 +++ tvmenu.h
diff --git a/multimedia/fxtv/patches/patch-be b/multimedia/fxtv/patches/patch-be
index 41a65baa7a3..5521b233ea6 100644
--- a/multimedia/fxtv/patches/patch-be
+++ b/multimedia/fxtv/patches/patch-be
@@ -1,4 +1,6 @@
-$NetBSD: patch-be,v 1.1.1.1 2004/01/26 11:36:40 jmmv Exp $
+$NetBSD: patch-be,v 1.2 2011/07/05 03:27:22 dholland Exp $
+
+Handle always-on-top.
 
 --- xutil.h.orig	2003-09-28 17:18:28.000000000 +0200
 +++ xutil.h	2003-09-28 17:18:28.000000000 +0200
diff --git a/multimedia/fxtv/patches/patch-bf b/multimedia/fxtv/patches/patch-bf
index 8d11067d163..d8d8564b0b4 100644
--- a/multimedia/fxtv/patches/patch-bf
+++ b/multimedia/fxtv/patches/patch-bf
@@ -1,6 +1,9 @@
-$NetBSD: patch-bf,v 1.1.1.1 2004/01/26 11:36:40 jmmv Exp $
+$NetBSD: patch-bf,v 1.2 2011/07/05 03:27:22 dholland Exp $
 
---- xutil.c.orig	1999-11-05 01:38:54.000000000 +0100
+Handle always-on-top.
+Fix LP64 problems.
+
+--- xutil.c.orig	1999-11-05 00:38:54.000000000 +0000
 +++ xutil.c
 @@ -44,6 +44,7 @@
  #include <X11/Shell.h>
@@ -21,7 +24,30 @@ $NetBSD: patch-bf,v 1.1.1.1 2004/01/26 11:36:40 jmmv Exp $
  typedef struct {
      pid_t                  cmd_pid;
      TVUTIL_PIPE_END        end[3];
-@@ -1543,3 +1548,46 @@ void XUTILDetermineFrameBufferVisual( Di
+@@ -371,7 +376,7 @@ TV_BOOL XUTILPixmapLoad( char    *pixmap
+         XFreePixmap( XtDisplay( wgt ), pixmap_depth1 );
+         XFreeGC    ( XtDisplay( wgt ), gc );
+         if ( pixmap_mask != NULL )
+-            *pixmap_mask = NULL;
++            *pixmap_mask = 0;
+     }
+     else {
+ 
+@@ -406,11 +411,12 @@ TV_BOOL XUTILPixmapLoad( char    *pixmap
+         }
+ 
+         *pixmap = pix_returned;
+-        if ( pix_mask_returned )
++        if ( pix_mask_returned ) {
+             if ( pixmap_mask != NULL )
+                 *pixmap_mask = pix_mask_returned;
+             else
+                 XFreePixmap( XtDisplay( wgt ), pix_mask_returned );
++	}
+     }
+ 
+     if ( pixmap_path != NULL )
+@@ -1543,3 +1549,46 @@ void XUTILDetermineFrameBufferVisual( Di
          }
      }
  }
diff --git a/multimedia/fxtv/patches/patch-bg b/multimedia/fxtv/patches/patch-bg
index 77a937c3dcb..513c8628d01 100644
--- a/multimedia/fxtv/patches/patch-bg
+++ b/multimedia/fxtv/patches/patch-bg
@@ -1,7 +1,45 @@
-$NetBSD: patch-bg,v 1.1.1.1 2004/01/26 11:36:40 jmmv Exp $
+$NetBSD: patch-bg,v 1.2 2011/07/05 03:27:22 dholland Exp $
 
---- tv.c.orig	2001-02-12 20:03:09.000000000 +0100
+Handle always-on-top.
+Fix LP64 problems.
+
+--- tv.c.orig	2001-02-12 19:03:09.000000000 +0000
 +++ tv.c
+@@ -285,7 +285,7 @@ static void TVStationListStrToList(
+             TVUTILOutOfMemory();
+ 
+         for ( i = 0; i < TV_MAX_CHANNELS; i++ ) {
+-            sprintf( (*station)[i].id, "%ld", i+TV_CHAN_MIN );
++            sprintf( (*station)[i].id, "%d", i+TV_CHAN_MIN );
+             (*station)[i].set_via_channel = TRUE;
+             (*station)[i].channel         = i+TV_CHAN_MIN;
+         }
+@@ -328,13 +328,13 @@ static void TVStationListStrToList(
+             if (( sscanf( tok, "%[^()](f%f)", new.id, &new.freq ) == 2 ) ||
+                 ( sscanf( tok, "%[^()](F%f)", new.id, &new.freq ) == 2 ))
+                 new.set_via_channel = FALSE;
+-            else if ( sscanf( tok, "%[^()](%ld)", new.id, &tmp_int ) == 2 ) {
++            else if ( sscanf( tok, "%[^()](%d)", new.id, &tmp_int ) == 2 ) {
+                 new.set_via_channel = TRUE;
+                 new.channel         = tmp_int;
+             }
+-            else if ( sscanf( tok, "%ld-%ld", &chan1, &chan2 ) == 2 )
++            else if ( sscanf( tok, "%d-%d", &chan1, &chan2 ) == 2 )
+                 chan_range = TRUE;
+-            else if ( sscanf( tok, "%ld", &tmp_int ) == 1 ) {
++            else if ( sscanf( tok, "%d", &tmp_int ) == 1 ) {
+                 new.set_via_channel = TRUE;
+                 new.channel         = tmp_int;
+                 sprintf( new.id, "%d", new.channel );
+@@ -371,7 +371,7 @@ static void TVStationListStrToList(
+                 memcpy( &(*station)[i++], &new, sizeof(new) );
+             else 
+                 for ( ; chan1 <= chan2; chan1++ ) {
+-                    sprintf( new.id, "%ld", chan1 );
++                    sprintf( new.id, "%d", chan1 );
+                     new.set_via_channel = TRUE;
+                     new.channel         = chan1;
+                     new.freq            = 0.0;
 @@ -873,6 +873,9 @@ int main( int argc, char *argv[] )
      S_wm_delete_window = XInternAtom( TVDISPLAY, "WM_DELETE_WINDOW", False );
      XSetWMProtocols( TVDISPLAY, XtWindow( top_level ), &S_wm_delete_window, 1);
diff --git a/multimedia/fxtv/patches/patch-ca b/multimedia/fxtv/patches/patch-ca
index 37ea51298ff..e0d5365610d 100644
--- a/multimedia/fxtv/patches/patch-ca
+++ b/multimedia/fxtv/patches/patch-ca
@@ -1,4 +1,6 @@
-$NetBSD: patch-ca,v 1.1 2008/01/16 13:53:55 jmcneill Exp $
+$NetBSD: patch-ca,v 1.2 2011/07/05 03:27:22 dholland Exp $
+
+Use correct sized types.
 
 --- tvtypes.h.orig	2008-01-15 18:31:30.000000000 -0500
 +++ tvtypes.h	2008-01-15 18:32:33.000000000 -0500
diff --git a/multimedia/fxtv/patches/patch-remotetrans_c b/multimedia/fxtv/patches/patch-remotetrans_c
new file mode 100644
index 00000000000..4494694e048
--- /dev/null
+++ b/multimedia/fxtv/patches/patch-remotetrans_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-remotetrans_c,v 1.1 2011/07/05 03:27:22 dholland Exp $
+
+Fix LP64 problems.
+
+--- remotetrans.c~	1999-09-05 16:36:35.000000000 +0000
++++ remotetrans.c
+@@ -152,7 +152,7 @@ void TVREMOTETRANSParse( Display *displa
+     }
+     Rem_trans_len = i;
+ 
+-    RMPRINTF(( "\nTVREMOTE:  Parsed %ld user translations:\n",
++    RMPRINTF(( "\nTVREMOTE:  Parsed %d user translations:\n",
+                Rem_trans_len ));
+     for ( i = 0; i < Rem_trans_len; i++ ) {
+         RMPRINTF(( "   <Remote>%-10s : %s(",
diff --git a/multimedia/fxtv/patches/patch-tvscreen_c b/multimedia/fxtv/patches/patch-tvscreen_c
new file mode 100644
index 00000000000..90e29e5a593
--- /dev/null
+++ b/multimedia/fxtv/patches/patch-tvscreen_c
@@ -0,0 +1,116 @@
+$NetBSD: patch-tvscreen_c,v 1.1 2011/07/05 03:27:22 dholland Exp $
+
+Fix LP64 problems.
+
+--- tvscreen.c~	2000-05-21 13:49:47.000000000 +0000
++++ tvscreen.c
+@@ -517,8 +517,8 @@ void TVSCREENInit( TV_XSCREEN *s,
+                                (int *) &s->ram_size );
+             s->ram_size *= 1024;
+             
+-            SUPRINTF(( "   BaseAddr = 0x%lx, Pitch = %ld, "
+-                          "BankSize/RamSize = %ld/%ld\n",
++            SUPRINTF(( "   BaseAddr = 0x%x, Pitch = %d, "
++                          "BankSize/RamSize = %d/%d\n",
+                        s->base_addr, s->pitch, s->bank_size, s->ram_size ));
+         }
+     }
+@@ -611,7 +611,7 @@ void TVSCREENInit( TV_XSCREEN *s,
+ 
+         /*  FIXME:  Handle byte swapping  */
+         SUPRINTF(( 
+-           "   %3ld     %-11s   %2d  %1ld,%1ld  %.8lx, %.8lx, %.8lx   "
++           "   %3d     %-11s   %2d  %1d,%1d  %.8lx, %.8lx, %.8lx   "
+            "--      %-3s\n",
+            rank, visual_classes[ v->class ], v->depth, Bpp_pixmap, Bpp_fbuffer,
+            v->red_mask, v->green_mask, v->blue_mask, 
+@@ -1003,11 +1003,12 @@ static void TVSCREENGetCapturePixGeom( T
+ 
+             /*  Prefer 2Bpp byte swapped over the rest (since its the  */
+             /*    thing NewFrameHdlr currently byte swaps well).       */
+-            else if (( best_pg.Bpp != 2 ) || !best_pg.swap_bytes )
++            else if (( best_pg.Bpp != 2 ) || !best_pg.swap_bytes ) {
+                 if  (( pg.Bpp      == 2 ) &&  pg.swap_bytes      )
+                     take_it = True;
+                 else if ( pg.Bpp == 2 )
+                     take_it = True;
++	    }
+ 
+             if ( take_it ) {
+                 best_i          = i;
+@@ -1628,7 +1629,7 @@ void TVSCREENVideoWinEventHdlr(
+     }
+ 
+     S_call_level++;
+-    EVPRINTF(( "%2ld: VideoWin EVENT: %s\n", S_call_level, 
++    EVPRINTF(( "%2d: VideoWin EVENT: %s\n", S_call_level, 
+                                          event_names[ ev->type ] ));
+ 
+     /*  Always keep recorded visibility state current  */
+@@ -1939,7 +1940,7 @@ void TVSCREENSetVideoWinGeom(
+                                  XtNy, g.y,
+                                  NULL );
+ #endif
+-    EVPRINTF(( "Resetting video widget geometry: %ldx%ld\n", g.w, g.h ));
++    EVPRINTF(( "Resetting video widget geometry: %dx%d\n", g.w, g.h ));
+ #ifdef OLD
+     XawPanedSetRefigureMode( XtParent( d->video_wgt ), False );
+     XtVaSetValues( d->video_wgt, XtNwidth , g.w,
+@@ -2390,8 +2391,8 @@ void TVSCREENSetScreenUpdateEnabled( 
+     char              *cfg_fail_msg;
+ 
+     if ( enabled == d->enabled ) {
+-        fprintf( stderr, "TVSCREENSetScreenUpdateEnabled: new/was=%ld\n",
+-                 enabled );
++        fprintf( stderr, "TVSCREENSetScreenUpdateEnabled: new/was=%d\n",
++                 (int)enabled );
+         return;
+     }
+ 
+@@ -2479,7 +2480,7 @@ static void TVSCREENPrepXImage( TV_DISPL
+         d->ximage_use_for_expose = FALSE;
+ 
+         /*  Free the old  */
+-        if ( image->ximg )
++        if ( image->ximg ) {
+             if ( image->is_shm ) {
+                 if ( !XShmDetach   ( TVDISPLAY, &image->shm_info ) ) {
+                     fprintf( stderr, "XShmDetach() failed\n" );
+@@ -2503,6 +2504,7 @@ static void TVSCREENPrepXImage( TV_DISPL
+                 XDestroyImage( image->ximg );
+                 image->ximg = NULL;
+             }
++	}
+ 
+         /*  Create desired new  */
+         if ( c->xfer_mode == TV_TRANSFER_SHMEM_IMAGE ) {
+@@ -2587,7 +2589,7 @@ static void TVSCREENPrepXImage( TV_DISPL
+ static void TVSCREENAllocColorCube( TV_DISPLAY   *d,
+                                     VL_COLORMAP **cmap )
+ {
+-    static Color_cubes[][3] = 
++    static int Color_cubes[][3] = 
+       { {7,7,5},{6,6,6},{6,6,5},{6,6,4},{5,5,5},{5,5,4},{5,5,3},
+         {4,4,4},{3,3,3},{2,2,2} };
+ 
+@@ -2646,17 +2648,17 @@ static void TVSCREENAllocColorCube( TV_D
+         if ( i >= num_col ) 
+             break;
+ 
+-        SUPRINTF(( "Failed to alloc %ldx%ldx%ld color cube\n", 
++        SUPRINTF(( "Failed to alloc %dx%dx%d color cube\n", 
+                    r_dim, g_dim, b_dim ));
+         for ( i--; i >= 0; i-- )
+             XFreeColors( TVDISPLAY, colormap, &col[i].pixel, 1, 0 );
+     }
+     if ( r_dim < 2 ) {
+-        fprintf( stderr, "Can't even get a %ldx%ldx%ld colormap..."
++        fprintf( stderr, "Can't even get a %dx%dx%d colormap..."
+                  "bailing out\n", r_dim, g_dim, b_dim );
+         exit(1);
+     }
+-    SUPRINTF(( "%ldx%ldx%ld Color Cube Allocated\n",r_dim,g_dim,b_dim ));
++    SUPRINTF(( "%dx%dx%d Color Cube Allocated\n",r_dim,g_dim,b_dim ));
+ 
+     /*  Done.  Now allocate and fill in the VideoLib colormap definition  */
+     *cmap = VIDEOLIBNewColormap( num_col );