Update nxtvepg to 2.5.1

Changes since 2.5.0:
    * Fixed French default shortcut "M?t?o" (did pop up an error
      message when invoked. At first start of 2.5.1 the broken
      shortcut is replaced in the rc file; if that does not work
      remove and re-define the shortcut manually via the "Shortcuts"
      menu)
    * Improved resizing: status line no longer vanishes when reducing
      (however the window bottom now "jitters" during vertical
      resizing)
    * Allow horizontal resizing of main window when in "grid" layout
      (UNIX only)
    * Display warning about "lost changes" when the window is closed
      via it's title bar "close" button, same as with the "Abort"
      button
    * TV app interaction configuration dialog: added TV app selection
      for UNIX, to select which channel table to use, i.e. select
      between xawtv or xawdecode
    * Don't require existance of .xawtv for TV app interaction on UNIX
      Thanks to "Sir Pingus" for suggesting this fix.
    * Programme list can now be scrolled by dragging with the middle
      mouse button
    * Grid layout: added +/- buttons to control column count;
      Thanks to Thorsten for suggesting these features in the
      discussion forum
    * Disabled "Show column headers" option for the grid layout
    * Grid layout: refresh no longer brings scrolled-out elements back
      into view
    * Added French network "M6" back to the EPG scan's list of "known
      providers" and documentation.
      Thanks to Thierry for pointing this out first.
    * Major bugfix in grid layout: when scrolling horizontally one
      programme could be inserted into the wrong network column under
      certain conditions
    * Bugfix EPG provider scan in non-TV-app-assisted mode: channels
      without signal often were not skipped due to uninitialized
      variable (bug was introduced in nxtvepg version 0.7.2). Thanks
      to Florian Zierer for indirectly triggering discovery of this
      bug.
    * UNIX: added new command line option "-tvdisplay" to allow
      communication with a TV app running on a different X11 server
      (e.g. a remote host). Thanks to Stefan Zoller for suggesting
      this feature.

4 files changed, 7 insertions, 158 deletions

diff --git a/misc/nxtvepg/Makefile b/misc/nxtvepg/Makefile
index 6ba88bcd018..cb6fb7539b2 100644
--- a/misc/nxtvepg/Makefile
+++ b/misc/nxtvepg/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2003/05/02 11:55:56 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2003/05/17 10:30:57 magick Exp $
 
-DISTNAME=	nxtvepg-2.5.0
-PKGREVISION=	1
+DISTNAME=	nxtvepg-2.5.1
 
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=nxtvepg/}
@@ -28,7 +27,6 @@ MAKE_ENV+=WANT_THREADS=1
 
 
 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 3d8c09851d2..e3d09630d8a 100644
--- a/misc/nxtvepg/distinfo
+++ b/misc/nxtvepg/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.20 2003/04/06 18:27:42 magick Exp $
+$NetBSD: distinfo,v 1.21 2003/05/17 10:30:57 magick Exp $
 
-SHA1 (nxtvepg-2.5.0.tar.gz) = 33909a97fd30dd3373be50c75c65b709fc95bf0b
-Size (nxtvepg-2.5.0.tar.gz) = 991500 bytes
-SHA1 (patch-aa) = 14eb5bb938c12691de9414625aae44098c136dac
+SHA1 (nxtvepg-2.5.1.tar.gz) = 01fb2522897c93bd597e6d2926013a98c9c15e6d
+Size (nxtvepg-2.5.1.tar.gz) = 1006564 bytes
+SHA1 (patch-aa) = 00ac7056a66e3a0cc88f3f62a1bef889bbbb029d
 SHA1 (patch-ab) = 634cfd179fd1043e3272ce27836a9052b199d1f4
 SHA1 (patch-ac) = 28d5d7a9a31e1a17f8416d271abdefa708b3480b
 SHA1 (patch-ad) = 40c54b286f7ec502f2b31adad439b3e66fa8baa1
diff --git a/misc/nxtvepg/files/Makefile.netbsd b/misc/nxtvepg/files/Makefile.netbsd
deleted file mode 100644
index 5067c7ff338..00000000000
--- a/misc/nxtvepg/files/Makefile.netbsd
+++ /dev/null
@@ -1,137 +0,0 @@
-#
-#  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 1ce9ed0ac03..fc103469b51 100644
--- a/misc/nxtvepg/patches/patch-aa
+++ b/misc/nxtvepg/patches/patch-aa
@@ -1,19 +1,7 @@
-$NetBSD: patch-aa,v 1.11 2003/04/06 18:27:42 magick Exp $
+$NetBSD: patch-aa,v 1.12 2003/05/17 10:30:58 magick Exp $
 
 --- Makefile.orig	2003-03-22 17:01:56.000000000 +0100
 +++ Makefile
-@@ -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    =
 @@ -46,7 +46,7 @@ prefix  = /usr/local
  exec_prefix = ${prefix}
  bindir  = $(ROOT)${exec_prefix}/bin