aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMuhammad Moinur Rahman <bofh@FreeBSD.org>2023-12-30 04:15:24 +0000
committerMuhammad Moinur Rahman <bofh@FreeBSD.org>2023-12-31 00:06:27 +0000
commitc0d89bb1c15546c89f3f2be66d59b37612660542 (patch)
treea2713241b0ec59fd88d5913fae5225aea7c76850
parent3de19db219bf0247cec9d31e11932d68be65bd3e (diff)
multimedia/fxtv: Remove expired port
2023-12-31 multimedia/fxtv: Requires defunct bktr
-rw-r--r--MOVED1
-rw-r--r--multimedia/Makefile1
-rw-r--r--multimedia/fxtv/Makefile43
-rw-r--r--multimedia/fxtv/distinfo2
-rw-r--r--multimedia/fxtv/files/patch-Makefile38
-rw-r--r--multimedia/fxtv/files/patch-app_rsrc.h188
-rw-r--r--multimedia/fxtv/files/patch-haup__remote.c21
-rw-r--r--multimedia/fxtv/files/patch-pixelview__remote.c21
-rw-r--r--multimedia/fxtv/files/patch-remote.c11
-rw-r--r--multimedia/fxtv/files/patch-tvcapture.c22
-rw-r--r--multimedia/fxtv/files/patch-tvcapture.h18
-rw-r--r--multimedia/fxtv/files/patch-tvmenu.c20
-rw-r--r--multimedia/fxtv/files/patch-tvscreen.c12
-rw-r--r--multimedia/fxtv/files/patch-videolib_Makefile11
-rw-r--r--multimedia/fxtv/files/patch-videolib_videolib.c38
-rw-r--r--multimedia/fxtv/files/patch-voxware.h13
-rw-r--r--multimedia/fxtv/files/patch-xutil.c15
-rw-r--r--multimedia/fxtv/pkg-descr7
-rw-r--r--multimedia/fxtv/pkg-plist12
19 files changed, 1 insertions, 493 deletions
diff --git a/MOVED b/MOVED
index abd444dbe47b..5234f0a64488 100644
--- a/MOVED
+++ b/MOVED
@@ -8247,3 +8247,4 @@ audio/mp3splt-gtk||2023-12-31|Has expired: BROKEN on all supported versions for
audio/mp3info||2023-12-31|Has expired: Last release in 2006 and lacks support for ID3v2
comms/uartlirc||2023-12-31|Has expired: BROKEN on all supported versions for more than 2 years after the EOL of 12
comms/mlan3||2023-12-31|Has expired: BROKEN on all supported versions for more than 2 years after the EOL of 12
+multimedia/fxtv||2023-12-31|Has expired: Requires defunct bktr
diff --git a/multimedia/Makefile b/multimedia/Makefile
index 0a2e49a2989a..f0fecf2c800f 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -69,7 +69,6 @@
SUBDIR += flvstreamer
SUBDIR += flvtool++
SUBDIR += fswebcam
- SUBDIR += fxtv
SUBDIR += gaupol
SUBDIR += gavl
SUBDIR += gdialog
diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile
deleted file mode 100644
index fcfe69e93b68..000000000000
--- a/multimedia/fxtv/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-PORTNAME= fxtv
-PORTVERSION= 1.03
-PORTREVISION= 14
-CATEGORIES= multimedia
-MASTER_SITES= LOCAL/sanpei
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= X11-based TV display and capture application (for use with bt848 driver)
-WWW= https://people.freebsd.org/~rhh/fxtv/
-
-LICENSE= BSD2CLAUSE
-
-DEPRECATED= Requires defunct bktr
-EXPIRATION_DATE=2023-12-31
-.if !exists(/usr/include/dev/bktr/ioctl_bt848.h)
-IGNORE= needs bktr(4) which is no longer available on your FreeBSD version
-.endif
-ONLY_FOR_ARCHS= amd64 i386
-
-LIB_DEPENDS= libtiff.so:graphics/tiff \
- libXaw3d.so:x11-toolkits/Xaw3d
-
-USES= gmake jpeg tar:tgz xorg
-USE_XORG= ice sm x11 xaw xext xmu xt xpm xxf86vm xxf86dga
-
-MAKE_ENV= X11BASE=${LOCALBASE}
-MAKE_FLAGS= -e
-
-OPTIONS_DEFINE= EXTRA
-
-EXTRA_DESC= Extra programs required to record/playback/save
-
-# This program does not actually require the programs below unless you
-# use audio/video recording and/or playback and save to a non-raw format.
-EXTRA_RUN_DEPENDS= sox:audio/sox \
- mpg123:audio/mpg123 \
- mpeg_encode:multimedia/mpeg_encode \
- mplex:multimedia/mplex
-
-pre-install:
- @${CP} -p ${WRKSRC}/fxtv.1 ${WRKSRC}/fxtv.man
-
-.include <bsd.port.mk>
diff --git a/multimedia/fxtv/distinfo b/multimedia/fxtv/distinfo
deleted file mode 100644
index cda0c1b862cd..000000000000
--- a/multimedia/fxtv/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (fxtv-1.03.tgz) = 17e256afe895b2294cdaeb6fe8461d8869cc458687a4ea8895f8b16b5e85cc82
-SIZE (fxtv-1.03.tgz) = 198669
diff --git a/multimedia/fxtv/files/patch-Makefile b/multimedia/fxtv/files/patch-Makefile
deleted file mode 100644
index 45825a18d110..000000000000
--- a/multimedia/fxtv/files/patch-Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
---- Makefile.orig 2001-02-12 22:08:59 UTC
-+++ Makefile
-@@ -62,7 +62,7 @@ endif
- ifneq ($(DEBUG),NO)
- override CFLAGS = -DDEBUG -g
- else
-- override CFLAGS = -DNDEBUG -O2
-+ override CFLAGS += -DNDEBUG #-O2
- endif
- C_WARN_FLAG = -Wall
- override CFLAGS += $(C_WARN_FLAG) $(INC) $(CF_VERS)
-@@ -116,15 +116,17 @@ $(VIDEOLIB_LIB) :
- tv.o : tv.c app_rsrc.h
-
- install : fxtv
-- mkdir -p $(FXTV_LIBDIR)/bitmaps
-- install -c -m 444 -o root $(PIXMAPS) $(FXTV_LIBDIR)/bitmaps
-- install -c -m 444 -o root README $(FXTV_LIBDIR)
-- mkdir -p $(X11BASEINST)/lib/X11/app-defaults
-- install -c -m 444 -o root Fxtv $(X11BASEINST)/lib/X11/app-defaults
-- mkdir -p $(X11BASEINST)/bin
-- install -c -m 444 -o root fxtv.1 $(X11BASEINST)/man/man1/fxtv.1
-- install -c -m 555 -o root fxtv $(X11BASEINST)/bin
-- install -c -m 555 -o root fxtv_cnvt.sh $(FXTV_LIBDIR)
-+ mkdir -p $(DESTDIR)$(FXTV_LIBDIR)/bitmaps
-+ $(BSD_INSTALL_DATA) $(PIXMAPS) $(DESTDIR)$(FXTV_LIBDIR)/bitmaps
-+ $(BSD_INSTALL_DATA) README $(DESTDIR)$(FXTV_LIBDIR)
-+ mkdir -p $(DESTDIR)$(X11BASEINST)/lib/X11/app-defaults
-+ $(BSD_INSTALL_DATA) Fxtv \
-+ $(DESTDIR)$(X11BASEINST)/lib/X11/app-defaults
-+ mkdir -p $(DESTDIR)$(X11BASEINST)/bin
-+ $(BSD_INSTALL_MAN) fxtv.1 \
-+ $(DESTDIR)$(X11BASEINST)/man/man1/fxtv.1
-+ $(BSD_INSTALL_PROGRAM) fxtv $(DESTDIR)$(X11BASEINST)/bin
-+ $(BSD_INSTALL_SCRIPT) fxtv_cnvt.sh $(DESTDIR)$(FXTV_LIBDIR)
-
- clean:
- rm -f *.o fxtv *.core *~
diff --git a/multimedia/fxtv/files/patch-app_rsrc.h b/multimedia/fxtv/files/patch-app_rsrc.h
deleted file mode 100644
index 5d7f5090820c..000000000000
--- a/multimedia/fxtv/files/patch-app_rsrc.h
+++ /dev/null
@@ -1,188 +0,0 @@
---- app_rsrc.h.orig 2001-02-12 21:17:53 UTC
-+++ app_rsrc.h
-@@ -525,96 +525,95 @@ static XtResource Resources[] = {
- };
-
-
--#define OPTION_HELP_STR "\
-- BSD X TV (fxtv), Version " VERS_STR ".
-- Written by Randall Hopper
--
--Please mail Fxtv and Bt848 driver-related comments and help requests to the
--multimedia@freebsd.org list. Feel free to subscribe and contribute
--(listserv: majordomo@freebsd.org).
--
--Available options:
--
---driverDefaults - Use appearance parms from driver on startup
---colorbars - Turn on colorbar display (for testing)
---hue [-90...90] - Initial Hue ; def=0
---brightness [-50..50] - Initial Brightness (%); def=0
---contrast [0..200] - Initial Contrast (%); def=100
---satU [0..200] - U Saturation (%); def=100
---satV [0..284] - V Saturation (%); def=100
---aspectlock - Enable 4:3 aspect lock on video window
--
---deviceNumber <#> - bktr/tuner device numbers; def=0
---inputFormat <fmt> - Tuner signal input format (ntsc,ntscm,ntscj,
-- palbdghi,pal,palm,paln,secam,palncomb,rsvd)
--
---tunerMode [cable|antenna] - Tuner Mode
---defaultInput <input> - Startup tuner signal input
-- [tuner|video|svideo|csvideo|dev3]
---defaultAudioInput <input> - Startup TV card audio input
-- [tuner|external|internal|auto]
---defaultChannel <#> - Startup Channel Number
---cableStationList <...> - List of cable station presets (see rsrc file)
---antennaStationList <...> - List of antenna station presets
---cableFreqSet <freqset> - Freq set for cable (def = cableirc)
-- [nabcst|cableirc|cablehrc|weurope|jpnbcst|
-- jpncable|xussr|australia|france]
---antennaFreqSet <freqset> - Freq set for antenna (def = nabcst)
--
---noAudio - Suppress playing audio through soundcard
---dspDevice - Override default DSP device (def=/dev/dsp)
---mixerDevice - Override default mixer device (def=/dev/mixer)
---mixerChannel - Audio mixer (line,line1/2/3,cd,mic,video)
--
---stationInWinTitle - Display station text in window title
---stationInWinIcon - Display station text in window icon
--
---stationAnnotFont <fontpat> - Font pattern for station annot (see rsrc file)
---stationAnnotColor <color> - Color for station annot
---stationAnnotDelay <msec> - How long to display (0 = never; -1 = always)
---stationAnnotIDOnly - Display station ID alone (when available)
--
---tunerModeAnnot{Font,Color,Delay}
---inputDevAnnot{Font,Color,Delay}
---volumeDevAnnot{Font,Color,Delay}
---muteDevAnnot{Font,Color,Delay}
-- - Other annotation options (see stationAnnot)
--
---remoteType - Type of attached remote control
-- [None|X10|Hauppauge|PixelView]
--
---recCmdMpeg2 - MPEG-2 Audio record command
---recCmdMpeg3 - MPEG-3 Audio record command
---playCmdMpeg2 - MPEG-2 Audio play command
---playCmdMpeg3 - MPEG-3 Audio play command
--
---videoCnvtScript - Video conversion workhorse script for vid encod.
--
---bswap2Bpp - Byte/word swap options for direct video
---nobswap2Bpp (used to match driver's pixel format with
---bswap3Bpp the video card's)
---nobswap3Bpp
---bswap4Bpp 2Bpp - 15/16-bpp modes
---nobswap4Bpp 3Bpp - packed 24bpp modes
---bwwap4Bpp 4Bpp - unpacked 24bpp modes
---nowswap4Bpp
--
---Bpp24bit [3|4] - Set frame buffer Bytes-per-pixel for 24bpp mode
---Bpp32bit [3|4] - Set frame buffer Bytes-per-pixel for 32bpp mode
--
---videoCapFile[1-4] - Optional paths (0-4) to scratch file paths to
-- use for video capture; spreads load across disks
--
---noafc - Disable AFC
---disableDirectV - Disable DMA transfers straight to video card
---debug <area> - Debug Msgs
-- {startup,driver,subproc,events,video,frame}
---help - Display program options
--
--NOTE: All command line options are accessible as X resources as well.
-- The X resources have the same names as the command-line options.
-- See the sample Fxtv class resource file for details.
--"
-+#define OPTION_HELP_STR \
-+" BSD X TV (fxtv), Version " VERS_STR ".\n" \
-+" Written by Randall Hopper\n" \
-+"\n" \
-+"Please mail Fxtv and Bt848 driver-related comments and help requests to the\n" \
-+"multimedia@freebsd.org list. Feel free to subscribe and contribute\n" \
-+"(listserv: majordomo@freebsd.org).\n" \
-+"\n" \
-+"Available options:\n" \
-+"\n" \
-+"-driverDefaults - Use appearance parms from driver on startup\n" \
-+"-colorbars - Turn on colorbar display (for testing)\n" \
-+"-hue [-90...90] - Initial Hue ; def=0\n" \
-+"-brightness [-50..50] - Initial Brightness (%); def=0\n" \
-+"-contrast [0..200] - Initial Contrast (%); def=100\n" \
-+"-satU [0..200] - U Saturation (%); def=100\n" \
-+"-satV [0..284] - V Saturation (%); def=100\n" \
-+"-aspectlock - Enable 4:3 aspect lock on video window\n" \
-+"\n" \
-+"-deviceNumber <#> - bktr/tuner device numbers; def=0\n" \
-+"-inputFormat <fmt> - Tuner signal input format (ntsc,ntscm,ntscj,\n" \
-+" palbdghi,pal,palm,paln,secam,palncomb,rsvd)\n" \
-+"\n" \
-+"-tunerMode [cable|antenna] - Tuner Mode\n" \
-+"-defaultInput <input> - Startup tuner signal input\n" \
-+" [tuner|video|svideo|csvideo|dev3]\n" \
-+"-defaultAudioInput <input> - Startup TV card audio input\n" \
-+" [tuner|external|internal|auto]\n" \
-+"-defaultChannel <#> - Startup Channel Number\n" \
-+"-cableStationList <...> - List of cable station presets (see rsrc file)\n" \
-+"-antennaStationList <...> - List of antenna station presets\n" \
-+"-cableFreqSet <freqset> - Freq set for cable (def = cableirc)\n" \
-+" [nabcst|cableirc|cablehrc|weurope|jpnbcst|\n" \
-+" jpncable|xussr|australia|france]\n" \
-+"-antennaFreqSet <freqset> - Freq set for antenna (def = nabcst)\n" \
-+"\n" \
-+"-noAudio - Suppress playing audio through soundcard\n" \
-+"-dspDevice - Override default DSP device (def=/dev/dsp)\n" \
-+"-mixerDevice - Override default mixer device (def=/dev/mixer)\n" \
-+"-mixerChannel - Audio mixer (line,line1/2/3,cd,mic,video)\n" \
-+"\n" \
-+"-stationInWinTitle - Display station text in window title\n" \
-+"-stationInWinIcon - Display station text in window icon\n" \
-+"\n" \
-+"-stationAnnotFont <fontpat> - Font pattern for station annot (see rsrc file)\n" \
-+"-stationAnnotColor <color> - Color for station annot\n" \
-+"-stationAnnotDelay <msec> - How long to display (0 = never; -1 = always)\n" \
-+"-stationAnnotIDOnly - Display station ID alone (when available)\n" \
-+"\n" \
-+"-tunerModeAnnot{Font,Color,Delay}\n" \
-+"-inputDevAnnot{Font,Color,Delay}\n" \
-+"-volumeDevAnnot{Font,Color,Delay}\n" \
-+"-muteDevAnnot{Font,Color,Delay}\n" \
-+" - Other annotation options (see stationAnnot)\n" \
-+"\n" \
-+"-remoteType - Type of attached remote control\n" \
-+" [None|X10|Hauppauge|PixelView]\n" \
-+"\n" \
-+"-recCmdMpeg2 - MPEG-2 Audio record command\n" \
-+"-recCmdMpeg3 - MPEG-3 Audio record command\n" \
-+"-playCmdMpeg2 - MPEG-2 Audio play command\n" \
-+"-playCmdMpeg3 - MPEG-3 Audio play command\n" \
-+"\n" \
-+"-videoCnvtScript - Video conversion workhorse script for vid encod.\n" \
-+"\n" \
-+"-bswap2Bpp - Byte/word swap options for direct video\n" \
-+"-nobswap2Bpp (used to match driver's pixel format with\n" \
-+"-bswap3Bpp the video card's)\n" \
-+"-nobswap3Bpp\n" \
-+"-bswap4Bpp 2Bpp - 15/16-bpp modes\n" \
-+"-nobswap4Bpp 3Bpp - packed 24bpp modes\n" \
-+"-bwwap4Bpp 4Bpp - unpacked 24bpp modes\n" \
-+"-nowswap4Bpp\n" \
-+"\n" \
-+"-Bpp24bit [3|4] - Set frame buffer Bytes-per-pixel for 24bpp mode\n" \
-+"-Bpp32bit [3|4] - Set frame buffer Bytes-per-pixel for 32bpp mode\n" \
-+"\n" \
-+"-videoCapFile[1-4] - Optional paths (0-4) to scratch file paths to\n" \
-+" use for video capture; spreads load across disks\n" \
-+"\n" \
-+"-noafc - Disable AFC\n" \
-+"-disableDirectV - Disable DMA transfers straight to video card\n" \
-+"-debug <area> - Debug Msgs\n" \
-+" {startup,driver,subproc,events,video,frame}\n" \
-+"-help - Display program options\n" \
-+"\n" \
-+"NOTE: All command line options are accessible as X resources as well.\n" \
-+" The X resources have the same names as the command-line options.\n" \
-+" See the sample Fxtv class resource file for details.\n"
-
- static String fallback_resources[] = {
- /*"Fxtv.geometry: +10+10",*/
diff --git a/multimedia/fxtv/files/patch-haup__remote.c b/multimedia/fxtv/files/patch-haup__remote.c
deleted file mode 100644
index b70eef2ce64e..000000000000
--- a/multimedia/fxtv/files/patch-haup__remote.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- haup_remote.c.orig 2000-05-21 15:10:04 UTC
-+++ haup_remote.c
-@@ -38,9 +38,16 @@
- #include <sys/fcntl.h>
- #ifdef __NetBSD__
- # include <dev/ic/bt8xx.h>
-+#endif
-+#ifdef __FreeBSD__
-+#include <osreldate.h>
-+#if __FreeBSD_version > 500000
-+#include <dev/bktr/ioctl_meteor.h>
-+#include <dev/bktr/ioctl_bt848.h>
- #else
--# include <machine/ioctl_meteor.h>
--# include <machine/ioctl_bt848.h>
-+#include <machine/ioctl_bt848.h>
-+#include <machine/ioctl_meteor.h>
-+#endif
- #endif
- #include "haup_remote.h"
-
diff --git a/multimedia/fxtv/files/patch-pixelview__remote.c b/multimedia/fxtv/files/patch-pixelview__remote.c
deleted file mode 100644
index a442fe07eab9..000000000000
--- a/multimedia/fxtv/files/patch-pixelview__remote.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- pixelview_remote.c.orig 2000-05-21 15:10:09 UTC
-+++ pixelview_remote.c
-@@ -39,9 +39,16 @@
- #include <sys/fcntl.h>
- #ifdef __NetBSD__
- # include <dev/ic/bt8xx.h>
-+#endif
-+#ifdef __FreeBSD__
-+#include <osreldate.h>
-+#if __FreeBSD_version > 500000
-+#include <dev/bktr/ioctl_bt848.h>
-+#include <dev/bktr/ioctl_meteor.h>
- #else
--# include <machine/ioctl_meteor.h>
--# include <machine/ioctl_bt848.h>
-+#include <machine/ioctl_meteor.h>
-+#include <machine/ioctl_bt848.h>
-+#endif
- #endif
- #include "pixelview_remote.h"
-
diff --git a/multimedia/fxtv/files/patch-remote.c b/multimedia/fxtv/files/patch-remote.c
deleted file mode 100644
index ddf8838bb884..000000000000
--- a/multimedia/fxtv/files/patch-remote.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- remote.c.orig 2001-02-12 21:05:08 UTC
-+++ remote.c
-@@ -65,7 +65,7 @@
- /* ******************** Local defines ************** */
-
- /* FIXME: Remove this old code someday */
--#ifdef 0
-+#if 0
- # define OLD_DEV_SYSMOUSE_STUFF
- #endif
-
diff --git a/multimedia/fxtv/files/patch-tvcapture.c b/multimedia/fxtv/files/patch-tvcapture.c
deleted file mode 100644
index 37a0902a1f69..000000000000
--- a/multimedia/fxtv/files/patch-tvcapture.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- tvcapture.c.orig 2001-02-12 18:59:22 UTC
-+++ tvcapture.c
-@@ -34,11 +34,18 @@
- #include <stdlib.h>
- #include <fcntl.h>
- #include <errno.h>
-+#include <sys/types.h>
- #include <sys/mman.h>
- #ifdef __NetBSD__
- # include <dev/ic/bt8xx.h>
-+#endif
-+#ifdef __FreeBSD__
-+#include <osreldate.h>
-+#if __FreeBSD_version > 500000
-+#include <dev/bktr/ioctl_bt848.h>
- #else
--# include <machine/ioctl_bt848.h>
-+#include <machine/ioctl_bt848.h>
-+#endif
- #endif
- #include <signal.h>
- #include <sys/ioctl.h>
diff --git a/multimedia/fxtv/files/patch-tvcapture.h b/multimedia/fxtv/files/patch-tvcapture.h
deleted file mode 100644
index 1908a31c3fdc..000000000000
--- a/multimedia/fxtv/files/patch-tvcapture.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- tvcapture.h.orig 2001-02-12 18:57:43 UTC
-+++ tvcapture.h
-@@ -34,8 +34,14 @@
- #include <X11/Intrinsic.h>
- #ifdef __NetBSD__
- # include <dev/ic/bt8xx.h>
-+#endif
-+#ifdef __FreeBSD__
-+#include <osreldate.h>
-+#if __FreeBSD_version > 500000
-+#include <dev/bktr/ioctl_meteor.h>
- #else
--# include <machine/ioctl_meteor.h>
-+#include <machine/ioctl_meteor.h>
-+#endif
- #endif
- #include "tvtypes.h"
-
diff --git a/multimedia/fxtv/files/patch-tvmenu.c b/multimedia/fxtv/files/patch-tvmenu.c
deleted file mode 100644
index 3030f018c84e..000000000000
--- a/multimedia/fxtv/files/patch-tvmenu.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- tvmenu.c.orig 2001-02-12 21:19:33 UTC
-+++ tvmenu.c
-@@ -552,7 +552,7 @@ static void TVTOOLSUpdateStationPopup()
- Widget popup_win, new_popup_item = NULL;
- Cardinal num_children, i;
- WidgetList children;
-- String actual_station, temp_station;
-+ String actual_station = NULL, temp_station = NULL;
- #ifdef FIXME
- Pixmap pix;
- #endif
-@@ -589,7 +589,7 @@ static void TVTOOLSUpdateStationPopup()
-
- XtVaSetValues(children[i], XtNleftBitmap, pix, NULL);
- #else
-- if ( strcmp( actual_station, temp_station ) == 0 )
-+ if ( strcmp( actual_station==NULL ? "" : actual_station, temp_station==NULL ? "" : temp_station ) == 0 )
- new_popup_item = children[i];
- #endif
- }
diff --git a/multimedia/fxtv/files/patch-tvscreen.c b/multimedia/fxtv/files/patch-tvscreen.c
deleted file mode 100644
index 1e3d12368400..000000000000
--- a/multimedia/fxtv/files/patch-tvscreen.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- tvscreen.c.orig 2000-05-21 13:49:47 UTC
-+++ tvscreen.c
-@@ -480,6 +480,9 @@ void TVSCREENInit( TV_XSCREEN *s,
- dga_avail = FALSE;
-
- #ifdef HAVE_XFREE86
-+ if ( App_res.disable_direct_v )
-+ SUPRINTF(( "Will not init DGA since -disableDirectV was given.\n" ));
-+ else
- if ( !XUTILXServerIsLocal( TVDISPLAY ) )
- SUPRINTF(( "XF86DGA not available...X Server isn't local.\n" ));
- else {
diff --git a/multimedia/fxtv/files/patch-videolib_Makefile b/multimedia/fxtv/files/patch-videolib_Makefile
deleted file mode 100644
index dfd466bfa46b..000000000000
--- a/multimedia/fxtv/files/patch-videolib_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- videolib/Makefile.orig 2001-02-12 19:04:45 UTC
-+++ videolib/Makefile
-@@ -15,7 +15,7 @@ override INC =
- ifneq ($(DEBUG),NO)
- override CFLAGS = -DDEBUG -g
- else
-- override CFLAGS = -DNDEBUG -O2
-+ override CFLAGS += -DNDEBUG #-O2
- endif
- C_WARN_FLAG = -Wall
- override CFLAGS += $(C_WARN_FLAG) $(INC)
diff --git a/multimedia/fxtv/files/patch-videolib_videolib.c b/multimedia/fxtv/files/patch-videolib_videolib.c
deleted file mode 100644
index 69358e466845..000000000000
--- a/multimedia/fxtv/files/patch-videolib_videolib.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- videolib/videolib.c.orig 1999-11-03 02:22:04 UTC
-+++ videolib/videolib.c
-@@ -479,9 +479,8 @@ static void VIDEOLIBConvertRGBToRGB( VL_
- *(p++) = (*src16 >> 8) | (*src16 << 8);
- src16++;
- }
-- for ( i = dst_line_pad; i > 0; i-- )
-- *(((VL_UINT8 *)p)++) = 0x00;
-- (VL_UINT8 *)dst_line += dst->geom.bytes_per_line;
-+ memset(p, 0, dst_line_pad);
-+ dst_line += dst->geom.bytes_per_line / sizeof(VL_UINT16);
- }
-
- src16 = dst_line = (VL_UINT16 *) dst->buf;
-@@ -513,9 +512,9 @@ static void VIDEOLIBConvertRGBToRGB( VL_
- if ( src_padded )
- src16 = (VL_UINT16 *)( (VL_UINT8 *)src16 + dst_line_pad );
- else
-- for ( i = dst_line_pad; i > 0; i-- )
-- *(((VL_UINT8 *)dst)++) = 0x00;
-- (VL_UINT8 *)dst_line += dst->geom.bytes_per_line;
-+ memset(dst, 0, dst_line_pad);
-+ dst += dst_line_pad / sizeof(VL_IMAGE);
-+ dst_line += dst->geom.bytes_per_line / sizeof(VL_UINT16);
- }
-
- if ( !dst_swap_b ) { /* More ugliness */
-@@ -527,8 +526,8 @@ static void VIDEOLIBConvertRGBToRGB( VL_
- *(p++) = (*src16 >> 8) | (*src16 << 8);
- src16++;
- }
-- (VL_UINT8 *)dst_line += dst->geom.bytes_per_line;
-- (VL_UINT8 *)src16 += dst->geom.bytes_per_line;
-+ dst_line += dst->geom.bytes_per_line / sizeof(VL_UINT16);
-+ src16 += dst->geom.bytes_per_line / sizeof(VL_UINT16);
- }
- }
- }
diff --git a/multimedia/fxtv/files/patch-voxware.h b/multimedia/fxtv/files/patch-voxware.h
deleted file mode 100644
index 4f377f921dd4..000000000000
--- a/multimedia/fxtv/files/patch-voxware.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- voxware.h.orig 2000-10-23 02:44:03 UTC
-+++ voxware.h
-@@ -30,9 +30,7 @@
- #ifndef __VOXWARE_H
- #define __VOXWARE_H
-
--#if defined(__FreeBSD__)
--# include <machine/soundcard.h>
--#elif defined(linux) || defined(__bsdi__)
-+#if defined(linux) || defined(__bsdi__) || defined(__FreeBSD__)
- # include <sys/soundcard.h>
- #elif defined(__NetBSD__) || defined(__OpenBSD__)
- # include <soundcard.h>
diff --git a/multimedia/fxtv/files/patch-xutil.c b/multimedia/fxtv/files/patch-xutil.c
deleted file mode 100644
index 8b685d11b0ac..000000000000
--- a/multimedia/fxtv/files/patch-xutil.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- xutil.c.orig 1999-11-05 00:38:54 UTC
-+++ xutil.c
-@@ -1500,8 +1500,10 @@ void XUTILDetermineFrameBufferVisual( Di
- /**********************************************************************/
-
- vinfo_pref.screen = screen;
-- visual = XGetVisualInfo( display, VisualScreenMask, &vinfo_pref,
-- &num_visuals );
-+ vinfo_pref.depth = DefaultDepth( display, screen );
-+ visual = XGetVisualInfo( display,
-+ VisualScreenMask | VisualDepthMask,
-+ &vinfo_pref, &num_visuals );
- if ( num_visuals == 0 ) {
- fprintf( stderr, "XGetVisualInfo() says no visuals available!\n" );
- exit(1);
diff --git a/multimedia/fxtv/pkg-descr b/multimedia/fxtv/pkg-descr
deleted file mode 100644
index 49e6f7254e73..000000000000
--- a/multimedia/fxtv/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Fxtv is an X11-based FreeBSD app that provides TV-in-a-window and
-image/audio/video capture capabilities for Brooktree Bt848/849/878/879
-and Pinnacle PCTV tuner/capture cards.
-
-To use this app, you need a capture card supported by the bktr(4) driver.
-Examples include the Hauppauge Wincast/TV, the STB TV PCI, and the Intel
-Smart Video Recorder III. See the 'bktr' man page for more information.
diff --git a/multimedia/fxtv/pkg-plist b/multimedia/fxtv/pkg-plist
deleted file mode 100644
index 105ba83e1d43..000000000000
--- a/multimedia/fxtv/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-bin/fxtv
-lib/X11/app-defaults/Fxtv
-lib/X11/fxtv/README
-lib/X11/fxtv/bitmaps/mini-camera.xpm
-lib/X11/fxtv/bitmaps/mini-down.xbm
-lib/X11/fxtv/bitmaps/mini-resize.xpm
-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/fxtv_cnvt.sh
-man/man1/fxtv.1.gz