Update nxtvepg from 2.4.2 to 2.5.0

From 2.4.2 to 2.5.0 (March/22/2003)

Main change:

* An alternate TV schedule presentation layout with separate columns
  for each TV network, similar to the layout principles used by paper
  based TV magazines. See a comparison of screenshots of the alternate
  and regular layouts.

In detail (Windows-changes omitted):

* Added an alternate layout for GUI: programmes are still sorted
  by start time, but presented in separate columns for each
  network. Schedules of different networks are aligned, so that
  programmes which run at the same time are approximately at the same
  height. The new layout also supports user-defined presentation,
  i.e. free selection of all attributes which are printed for each
  programme, possibly depending on filter shortcuts (for example you
  can print more details for movies), plus marking selected programmes
  by use of colors and icons.
* UNIX xawtv: implemented "overlay" EPG popup based on nxtvepg
  controlled window (no longer uses "vtx" removed command, which was
  removed in xawtv-3.7x) The colors can be configured via the new
  resources xawtv_overlay_fg and xawtv_overlay_bg (see manual for
  details)
* UNIX: the Nxtvepg app-defaults file is now loaded during startup
  because some user's didn't realize they should have copied
  modified entries into their $HOME/.Xdefaults
* Fixed bug in description text redundancy removal from 2.4.2: texts
  with less than 30 characters length were not removed. Thanks to
  Thierry for pointing this out. Also fixed a bug which caused text
  truncation.
* Fixed bug in text decoder which caused some national characters to
  be displayed falsely, e.g. "D'ECONSEILL'" instead of "D?CONSEILL?".
* Fixed bug in "global invert" filter matching (depending on which
  filter types were inverted, expired programmes could have shown up
  in the listing)
* added possibility to combine several text searches (logical OR)
* added fixes for FreeBSD and NetBSD provided by Simon Barner
* added Linux "devfs" compatibility, i.e. find /dev/v4l/vbi
* added Makefile fixes provided by Debian maintainer Gerd Knorr
* fixed SEGV during build on IA64 due to missing include in tcl2c tool
  (reported to Debian bug tracking by Bdale Garbee)

8 files changed, 188 insertions, 128 deletions

diff --git a/misc/nxtvepg/Makefile b/misc/nxtvepg/Makefile
index 3d766a27c22..a762e2fa1e7 100644
--- a/misc/nxtvepg/Makefile
+++ b/misc/nxtvepg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2003/01/05 22:44:42 magick Exp $
+# $NetBSD: Makefile,v 1.23 2003/04/06 18:27:42 magick Exp $
+
+DISTNAME=	nxtvepg-2.5.0
 
-DISTNAME=	nxtvepg-2.4.2
-PKGREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=nxtvepg/}
 
@@ -18,6 +18,7 @@ USE_X11=	yes
 USE_X11BASE=	yes
 USE_BUILDLINK2= yes
 pre-configure:
+	${CP} ${FILESDIR}/Makefile.netbsd ${WRKSRC}/
 	cd ${WRKSRC};							\
 	${MV} -f pod2help.pl pod2help.pl.orig;				\
 	${SED} -e "s|@PERL5@|${PERL5}|g" pod2help.pl.orig > pod2help.pl; \
diff --git a/misc/nxtvepg/distinfo b/misc/nxtvepg/distinfo
index 88ee3248a7f..3d8c09851d2 100644
--- a/misc/nxtvepg/distinfo
+++ b/misc/nxtvepg/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.19 2003/01/05 22:44:43 magick Exp $
+$NetBSD: distinfo,v 1.20 2003/04/06 18:27:42 magick Exp $
 
-SHA1 (nxtvepg-2.4.2.tar.gz) = 8dd312bc1f16ed4fd300b273e6629a11a798ba73
-Size (nxtvepg-2.4.2.tar.gz) = 761170 bytes
-SHA1 (patch-aa) = ddc332b6e586c5e94abd12483d6a7831d965fefb
+SHA1 (nxtvepg-2.5.0.tar.gz) = 33909a97fd30dd3373be50c75c65b709fc95bf0b
+Size (nxtvepg-2.5.0.tar.gz) = 991500 bytes
+SHA1 (patch-aa) = 14eb5bb938c12691de9414625aae44098c136dac
 SHA1 (patch-ab) = 634cfd179fd1043e3272ce27836a9052b199d1f4
-SHA1 (patch-ac) = 7eb5f7b443be01ecd8e367f5244be3509e0cb2ae
-SHA1 (patch-ad) = ee64fd67a60783f1b2112771abdb5d1eb5a8b2a1
-SHA1 (patch-ae) = 9502d2c684748d7580650098956bf2e67615c9b2
-SHA1 (patch-af) = 331c778697864c105e1cc87692b8efbafa0b6490
+SHA1 (patch-ac) = 28d5d7a9a31e1a17f8416d271abdefa708b3480b
+SHA1 (patch-ad) = 40c54b286f7ec502f2b31adad439b3e66fa8baa1
diff --git a/misc/nxtvepg/files/Makefile.netbsd b/misc/nxtvepg/files/Makefile.netbsd
new file mode 100644
index 00000000000..0a87bb70d00
--- /dev/null
+++ b/misc/nxtvepg/files/Makefile.netbsd
@@ -0,0 +1,137 @@
+#
+#  NetBSD specific Makefile setup
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License Version 2 as
+#  published by the Free Software Foundation. You find a copy of this
+#  license in the file COPYRIGHT in the root directory of this release.
+#
+#  THIS PROGRAM IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL,
+#  BUT WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF
+#  MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#
+#  Description:
+#
+# NetBSD specific Makefile to reduce changes to the original Makefile.
+# base on the the FreeBSD version from Simon Barner
+#  Author: Mario Kemper
+#
+
+# X11BASE, LOCALBASE and PREFIX are variables used by the ports collection
+# Users of the ports collection may override these values => ifndef foo
+
+# Paths
+X11BASE         ?= /usr/X11R6
+LOCALBASE       ?= /usr/local
+PREFIX          ?= $(X11BASE)
+
+prefix          = $(PREFIX)
+TK_LIBRARY_BASE = $(LOCALBASE)/lib
+SYS_DBDIR       = /tmp/nxtvdb
+# uncomment to force system wide db dir
+WANT_USER_DBDIR = 1
+
+# other settings
+# On FreeBSD there is only a modified tclsh with a message to launch
+# tclsh8.3 or tclsh8.4 , so this is hardcoded here
+TCL_VER         = 8.3
+LDLIBS          = -L$(LOCALBASE)/lib\
+                  -L$(X11BASE)/lib\
+                  -ltk83 -ltcl83 -lX11 -lXmu -lm
+
+INCS            += -I$(LOCALBASE)/include/tcl$(TCL_VER)\
+                   -I$(LOCALBASE)/include/tk$(TCL_VER)
+WANT_THREADS    = 1 # uncomment to force process based implementation
+
+PTHREAD         = -pthread
+
+
+### Common part for all UN*X variants  ###
+
+# Tools
+PERL            ?= /usr/bin/perl
+CC              ?= gcc
+ECHO            ?= @echo
+
+# Paths
+ROOT    =
+exec_prefix = ${prefix}
+bindir  = $(ROOT)${exec_prefix}/bin
+mandir  = $(ROOT)${prefix}/man/man1
+resdir  = $(LOCALBASE)/lib/X11
+
+# other settings
+OPTFLAGS = -O6 -pipe
+
+# use static libraries for debugging only
+#LDLIBS += -Ldbglib -static
+
+INCS   += -I. -I$(X11BASE)/include
+
+# path to Tcl/Tk headers, if not properly installed
+#INCS   += -I/usr/local/tcl/tcl8.0/generic -I/usr/local/tcl/tk8.0/generic
+
+# path to Tcl/Tk script library (Tk is usually in X11/lib/tk#.#)
+DEFS   += -DTK_LIBRARY_PATH=\"$(TK_LIBRARY_BASE)/tk$(TCL_VER)\"
+DEFS   += -DTCL_LIBRARY_PATH=\"$(TK_LIBRARY_BASE)/tcl$(TCL_VER)\"
+
+# enable use of multi-threading
+ifdef WANT_THREADS
+  DEFS   += -DUSE_THREADS
+  LDLIBS += $(PTHREAD)
+endif
+
+# enable use of daemon and client/server connection
+DEFS   += -DUSE_DAEMON
+
+# The database directory can be either in the user's $HOME (or relative to any
+# other env variable) or at a global place like /var/spool (world-writable)
+# -> set WANT_USER_DBDIR in OS specific part
+ifdef WANT_USER_DBDIR
+USER_DBDIR  = .nxtvdb
+DEFS       += -DEPG_DB_ENV=\"HOME\" -DEPG_DB_DIR=\"$(USER_DBDIR)\"
+endif
+
+ifndef USER_DBDIR
+DEFS        += -DEPG_DB_DIR=\"$(SYS_DBDIR)\"
+INST_DB_DIR  = $(ROOT)$(SYS_DBDIR)
+INST_DB_PERM = 0777
+endif
+
+WARN    = -Wall -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes
+#WARN  += -Wpointer-arith -Werror
+# the following flags can be overridden by an environment variable with the same name
+CFLAGS ?= $(OPTFLAGS)
+CFLAGS += $(WARN) $(INCS) $(DEFS) -g
+#LDLIBS += -pg
+
+X11_APP_DEFAULTS=$(LOCALBASE)/lib/X11/app_defaults
+DEFS += -DX11_APP_DEFAULTS=\"$(X11_APP_DEFAULTS)\"
+all :: printconfig
+
+# this will print some information on the current configuration
+.PHONY: printconfig
+printconfig ::
+	$(ECHO)
+	$(ECHO) Building on $(OS)...
+	$(ECHO)
+	$(ECHO) "   prefix:                                    $(prefix)"
+	$(ECHO) "   tcl version:                               $(TCL_VER)"
+ifdef USER_DBDIR
+	$(ECHO) "   db in home:                                yes"
+else
+	$(ECHO) "   db in home:                                no"
+	$(ECHO) "   system db dir:                             $(SYS_DBDIR)"
+endif
+ifdef WANT_THREADS
+	$(ECHO) "   Concurrency implementation based on:       threads"
+else
+	$(ECHO) "   Concurrency implementation based on:       processes"
+endif
+	$(ECHO) "   C compiler:                                $(CC)"
+	$(ECHO)
+
+# end of NetBSD specific makefile
+# here the main Makefile continues
diff --git a/misc/nxtvepg/patches/patch-aa b/misc/nxtvepg/patches/patch-aa
index 7c5bc71193a..1ce9ed0ac03 100644
--- a/misc/nxtvepg/patches/patch-aa
+++ b/misc/nxtvepg/patches/patch-aa
@@ -1,85 +1,25 @@
-$NetBSD: patch-aa,v 1.10 2002/12/15 11:28:55 magick Exp $
+$NetBSD: patch-aa,v 1.11 2003/04/06 18:27:42 magick Exp $
 
---- Makefile.orig	Sun Dec 15 12:17:51 2002
+--- Makefile.orig	2003-03-22 17:01:56.000000000 +0100
 +++ Makefile
-@@ -33,34 +33,34 @@
+@@ -36,9 +36,9 @@ ifeq ($(OS),Windows_NT)
+ include Makefile.win32
+ else
+ OS = $(shell uname)
+-ifeq ($(OS), FreeBSD)
++ifeq ($(OS), NetBSD)
+ # for FreeBSD 
+-include Makefile.freebsd
++include Makefile.netbsd
  else
  
  ROOT    =
--prefix  = /usr/local
-+prefix  = ${X11PREFIX}
+@@ -46,7 +46,7 @@ prefix  = /usr/local
  exec_prefix = ${prefix}
--bindir  = $(ROOT)${exec_prefix}/bin
--mandir  = $(ROOT)${prefix}/man/man1
+ bindir  = $(ROOT)${exec_prefix}/bin
+ mandir  = $(ROOT)${prefix}/man/man1
 -resdir  = $(ROOT)/usr/X11R6/lib/X11
-+bindir  = ${exec_prefix}/bin
-+mandir  = ${prefix}/man/man1
-+resdir  = ${X11PREFIX}/lib/X11
++resdir  = $(LOCALBASE)/lib/X11
  
  # if you have perl set the path here, else just leave it alone
--PERL    = /usr/bin/perl
-+PERL    = ${LOCALBASE}/perl
- 
- # select Tcl/Tk version
- TCL_VER = 8.3
- 
--LDLIBS  = -ltk$(TCL_VER) -ltcl$(TCL_VER) -L/usr/X11R6/lib -lX11 -lXmu -lm -ldl
-+LDLIBS  = -ltk83 -ltcl83 -lX11 -lXmu -lm
- 
- # use static libraries for debugging only
- #LDLIBS += -Ldbglib -static
- 
--INCS   += -I. -I/usr/X11R6/include
-+INCS   += -I. -I${X11BASE}/include
- # path to Tcl/Tk headers, if not properly installed
- #INCS   += -I/usr/local/tcl/tcl8.0/generic -I/usr/local/tcl/tk8.0/generic
- 
- # path to Tcl/Tk script library (Tk is usually in X11/lib/tk#.#)
--DEFS   += -DTK_LIBRARY_PATH=\"/usr/lib/tk$(TCL_VER)\"
--DEFS   += -DTCL_LIBRARY_PATH=\"/usr/lib/tcl$(TCL_VER)\"
-+DEFS   += -DTK_LIBRARY_PATH=\"$(LOCALBASE)/lib/tk8.3\"
-+DEFS   += -DTCL_LIBRARY_PATH=\"$(LOCALBASE)/lib/tcl8.3\"
- 
- # enable use of multi-threading
--DEFS   += -DUSE_THREADS
--LDLIBS += -lpthread
-+#DEFS   += -DUSE_THREADS
-+#LDLIBS += -lpthread
- 
- # enable use of daemon and client/server connection
- DEFS   += -DUSE_DAEMON
-@@ -71,8 +71,8 @@
- #USER_DBDIR  = .nxtvdb
- #DEFS       += -DEPG_DB_ENV=\"HOME\" -DEPG_DB_DIR=\"$(USER_DBDIR)\"
- ifndef USER_DBDIR
--SYS_DBDIR    = /usr/tmp/nxtvdb
--DEFS        += -DEPG_DB_DIR=\"$(SYS_DBDIR)\"
-+SYS_DBDIR    = _PATH_TMP\"nxtvdb\"
-+DEFS        += -DEPG_DB_DIR=$(SYS_DBDIR)
- INST_DB_DIR  = $(ROOT)$(SYS_DBDIR)
- INST_DB_PERM = 0777
- endif
-@@ -113,14 +113,9 @@
- 	test -d $(bindir) || mkdirhier $(bindir)
- 	test -d $(mandir) || mkdirhier $(mandir)
- 	test -d $(resdir) || mkdirhier $(resdir)
--ifndef USER_DBDIR
--	test -d $(INST_DB_DIR) || mkdirhier $(INST_DB_DIR)
--	chmod $(INST_DB_PERM) $(INST_DB_DIR)
--endif
- 	install -c -m 0755 nxtvepg     $(bindir)
- 	install -c -m 0644 nxtvepg.1   $(mandir)
- 	install -c -m 0644 Nxtvepg.ad  $(resdir)/app-defaults/Nxtvepg
--	rm -f $(mandir)/nxtvepg.1x
- 
- .SUFFIXES: .c .o .tcl
- 
-@@ -172,7 +167,7 @@
- 	cd .. && tar cf pc1.tar pc -X pc/tar-ex && bzip2 -f -9 pc1.tar
- 	tar cf ../pc2.tar www ATTIC dsdrv?* tk8* tcl8* && bzip2 -f -9 ../pc2.tar
- 
--include Makefile.dep
-+#include Makefile.dep
- 
- # end UNIX specific part
- endif
+ PERL    = /usr/bin/perl
diff --git a/misc/nxtvepg/patches/patch-ac b/misc/nxtvepg/patches/patch-ac
index 906d7f3b439..215437d96f1 100644
--- a/misc/nxtvepg/patches/patch-ac
+++ b/misc/nxtvepg/patches/patch-ac
@@ -1,22 +1,22 @@
-$NetBSD: patch-ac,v 1.4 2002/11/24 17:23:40 magick Exp $
+$NetBSD: patch-ac,v 1.5 2003/04/06 18:27:42 magick Exp $
 
---- epgtcl/helptexts.tcl.orig	Sun Nov 24 17:34:29 2002
+--- epgtcl/helptexts.tcl.orig	2003-03-22 18:15:06.000000000 +0100
 +++ epgtcl/helptexts.tcl
-@@ -25,7 +25,7 @@
+@@ -25,7 +25,7 @@ set helpTexts(1) {{Options} title1 {
  } indent {-rcfile} bold { } {} {path} underlined {
  } {} {Specify an alternate configuration file. Default: on UNIX $HOME/.nxtvepgrc, on Windows nxtvepg.ini in the current directory.
  } indent {-dbdir} bold { } {} {directory} underlined {
--} {} {Specify an alternate directory for the databases. Default: On UNIX /usr/tmp/nxtvdb, on Windows the current directory. Note that the database management is not equipped for concurrent writing, so if you have more than one TV tuner card in your system or network, relocate the directory into the users' homes.
-+} {} {Specify an alternate directory for the databases. Default: On UNIX /tmp/nxtvdb, on Windows the current directory. Note that the database management is not equipped for concurrent writing, so if you have more than one TV tuner card in your system or network, relocate the directory into the users' homes.
+-} {} {Specify an alternate directory for the databases. Default: On UNIX } indent {/usr/tmp/nxtvdb} {underlined indent} {, on Windows the current directory. Note that the database management is not equipped for concurrent writing, so if you have more than one TV tuner card in your system or network, relocate the directory into the users' homes.
++} {} {Specify an alternate directory for the databases. Default: On UNIX } indent {/tmp/nxtvdb} {underlined indent} {, on Windows the current directory. Note that the database management is not equipped for concurrent writing, so if you have more than one TV tuner card in your system or network, relocate the directory into the users' homes.
  } indent {If you're using an acquisition daemon, the browser must be configured to use the same directory as the daemon.  If the daemon is running on a different host, you need to mount the remote directory, e.g. via NFS.
  } indent {-card} bold { } {} {index} underlined {
- } {} {Specify which TV card hardware to use, if you have more than card. Default: index 0. On Linux the given index is appended to the device names, i.e. } indent {/dev/vbi} {underlined indent} { and } indent {/dev/video} {underlined indent} {. On Windows index "n" means the n-th card found while scanning the PCI bus for cards with a Bt878, Bt878A, Bt848 or Bt849 chip.  If you have more than one TV card with the same chip, the order between those is undefined, but still constant (i.e. the order is determined by the driver, not nxtvepg)
-@@ -579,7 +579,7 @@
+ } {} {Specify which TV card hardware to use, if you have more than card. Default: index 0. On Linux the given index is appended to the device names, i.e. } indent {/dev/vbi} {underlined indent} { and } indent {/dev/video} {underlined indent} { (see also } indent {Files} {href indent} {). On Windows index "n" means the n-th card found while scanning the PCI bus for cards with a supported capture chip (e.g. Brooktree Bt878, Bt878A, Bt848, Bt849, Philips SAA7134, Conexant 23881).  If you have more than one TV card with the same chip, the order between those is undefined, but still constant (i.e. the order is determined by the driver, not nxtvepg)
+@@ -600,7 +600,7 @@ set helpTexts(15) {{Files} title1 {
  } {} {Files used on UNIX systems} title2 {
  } {} {$HOME/.nxtvepgrc} bold {
- } {} {Configuration file where all personal settings are stored. Per default this is created in your home directory, but a different path and file name can be specified with the } indent {-rcfile} {bold indent} { option.
+ } {} {Configuration file where all personal settings are stored. Per default this is created in your home directory, but a different path and file name can be specified with the } indent {-rcfile} {bold indent} { option (see } indent {Options} {href indent} {).
 -} indent {/usr/tmp/nxtvdb/nxtvdb-} bold {
 +} indent {/tmp/nxtvdb/nxtvdb-} bold {
- } {} {Directory containing one file for each provider's database. Can be changed with the } indent {-dbdir} {bold indent} { command line option.  Note that the path can also be configured during compilation of the software, so if you downloaded a binary version of this package the path may be different.  The current default setting can be queried with the } indent {-help} {bold indent} { command line switch.
+ } {} {Directory containing one file for each provider's database.  The path can be changed with the } indent {-dbdir} {bold indent} { command line option (see } indent {Options} {href indent} {). Note that the path can also be configured during compilation of the software, so if you downloaded a binary version of this package the path may be different.  The current default setting can be queried with the } indent {-help} {bold indent} { command line switch.
  } indent {The last 4 digits of the file names are the hexadecimal CNI (Country and Network Identifier) of the provider.
  } indent {/dev/vbi0} bold {, } {} {/dev/vbi1} bold {, etc.
diff --git a/misc/nxtvepg/patches/patch-ad b/misc/nxtvepg/patches/patch-ad
index 290278735df..7fbc0f617fd 100644
--- a/misc/nxtvepg/patches/patch-ad
+++ b/misc/nxtvepg/patches/patch-ad
@@ -1,13 +1,24 @@
-$NetBSD: patch-ad,v 1.3 2002/03/04 19:56:53 magick Exp $
+$NetBSD: patch-ad,v 1.4 2003/04/06 18:27:42 magick Exp $
 
---- nxtvepg.1.orig	Sun Feb 17 13:36:12 2002
+--- nxtvepg.1.orig	2003-03-22 18:15:10.000000000 +0100
 +++ nxtvepg.1
-@@ -199,7 +199,7 @@
+@@ -205,7 +205,7 @@ on Windows nxtvepg.ini in the current di
  .Ip "\fB\-dbdir\fR \fIdirectory\fR" 4
  .IX Item "-dbdir directory"
  Specify an alternate directory for the databases.
--Default: On \s-1UNIX\s0 /usr/tmp/nxtvdb, on Windows the current directory.
-+Default: On \s-1UNIX\s0 /tmp/nxtvdb, on Windows the current directory.
+-Default: On \s-1UNIX\s0 \fI/usr/tmp/nxtvdb\fR, on Windows the current directory.
++Default: On \s-1UNIX\s0 \fI/tmp/nxtvdb\fR, on Windows the current directory.
  Note that the database management is not equipped for concurrent writing,
  so if you have more than one \s-1TV\s0 tuner card in your system or network,
  relocate the directory into the users' homes.
+@@ -2494,8 +2494,8 @@ of the list (unless column header button
+ Configuration file where all personal settings are stored. Per default
+ this is created in your home directory, but a different path and file
+ name can be specified with the \fB\-rcfile\fR option (see the section on "OPTIONS").
+-.Ip "\fB/usr/tmp/nxtvdb/nxtvdb-####\fR" 4
+-.IX Item "/usr/tmp/nxtvdb/nxtvdb-####"
++.Ip "\fB/tmp/nxtvdb/nxtvdb-####\fR" 4
++.IX Item "/tmp/nxtvdb/nxtvdb-####"
+ Directory containing one file for each provider's database.  The path
+ can be changed with the \fB\-dbdir\fR command line option (see the section on "OPTIONS").
+ Note that the path can also be configured during compilation of the
diff --git a/misc/nxtvepg/patches/patch-ae b/misc/nxtvepg/patches/patch-ae
deleted file mode 100644
index 83a50b68895..00000000000
--- a/misc/nxtvepg/patches/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2002/11/24 17:23:41 magick Exp $
-
---- epgui/epgmain.c.orig	Sun Nov 24 17:35:46 2002
-+++ epgui/epgmain.c
-@@ -116,6 +116,9 @@
- static const char * const defaultRcFile = "nxtvepg.ini";
- static const char * const defaultDbDir  = ".";
- #else
-+#ifdef __NetBSD__
-+#include <paths.h>
-+#endif
- static char * defaultRcFile = "~/.nxtvepgrc";
- static char * defaultDbDir  = NULL;
- #endif
diff --git a/misc/nxtvepg/patches/patch-af b/misc/nxtvepg/patches/patch-af
deleted file mode 100644
index b15c832fbf6..00000000000
--- a/misc/nxtvepg/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.4 2003/01/05 22:44:45 magick Exp $
-
---- epgvbi/btdrv4linux.c.orig	Mon Nov 25 20:30:52 2002
-+++ epgvbi/btdrv4linux.c
-@@ -213,7 +213,7 @@
-         if (ioctl(fd,METEORSINPUT,&input_id)==0) {
-           pVbiBuf->tv_cards[i].inputs[j].inputID=input_id;
-           pVbiBuf->tv_cards[i].inputs[j].isTuner=(input_id==METEOR_DEV1);
--          strncpy((char*)pVbiBuf->tv_cards[i].inputs[j].name,input_name, DEV_MAX_NAME_LEN);
-+          strncpy((char*)pVbiBuf->tv_cards[i].inputs[j].name,input_name, 20);
-           pVbiBuf->tv_cards[i].inputs[j].isAvailable=1;
-         }
-         else