Update nxtvepg to 2.2.1

Changes since 0.7.4 (Windows changes ommitted):

From 2.2.0 (aka 0.7.4) to 2.2.1 (August/24/2002)
This release contains the following fixes:

* Major bugfix: nxtvepg crashed frequently due to a memory
  overwrite bug in the description text display function. The bug
  exists in all previous versions! (It surfaced only now because
  some very long description texts were transmitted by the German
  provider Kabel1.)
* Bugfix in database merge: merge failed when no networks were manually
  selected yet
* Network name column in the programme listing now automatically adapts
  its width so that network names no longer get cut off.

Thanks to Thierry M?n?trier for his excellent feedback.
From 2.1.2 (aka 0.7.4) to 2.2.0 (August/18/2002)

This release contains the following new features and fixes:

* Network selection config dialog: allow to specify time windows for
  each network (e.g. for ARTE 19:00 - 06:00 o'clock). Programmes that
  are completely outside this window are suppressed in the listing.
* PDC theme descriptors were translated to French and German; the
  language can be either selected automatically or manually. Thanks to
  Matthieu for triggering this improvement and for the French
  translation.
* The programme database can be exported into a text file in TAB
  separated format, so that it can be directly loaded into an SQL
  database. (This feature has been added to support the HTML converter
  E*plore EPG nexTView written in PHP by sysmik)
* Bugfix in the EPG scan due to which on channels which could not be
  identified via VPS/PDC no EPG provider was found. Thanks to Helge
  Kreutzmann for pointing out this problem.
* Manual size changes of the help window are now remembered; also improved
  a few details in help text formatting.

4 files changed, 43 insertions, 23 deletions

diff --git a/misc/nxtvepg/Makefile b/misc/nxtvepg/Makefile
index b5de9dd520a..8446d69d1a6 100644
--- a/misc/nxtvepg/Makefile
+++ b/misc/nxtvepg/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2002/06/09 10:59:34 magick Exp $
+# $NetBSD: Makefile,v 1.17 2002/08/31 09:25:04 magick Exp $
 
-DISTNAME=	nxtvepg-0.7.4
+DISTNAME=	nxtvepg-2.2.1
 CATEGORIES=	misc
 MASTER_SITES=	http://www.nefkom.net/tomzo/prj/nxtvepg/src/
 
@@ -21,5 +21,9 @@ pre-configure:
 	${SED} -e "s|@PERL5@|${PERL5}|g" pod2help.pl.orig > pod2help.pl; \
 	${CHMOD} +x ${WRKSRC}/pod2help.pl
 
+pre-build:
+	cd ${WRKSRC};							\
+	${GMAKE} depend
+
 .include "../../x11/tk/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/nxtvepg/distinfo b/misc/nxtvepg/distinfo
index 122accf5792..b2249584748 100644
--- a/misc/nxtvepg/distinfo
+++ b/misc/nxtvepg/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.14 2002/06/09 10:59:35 magick Exp $
+$NetBSD: distinfo,v 1.15 2002/08/31 09:25:04 magick Exp $
 
-SHA1 (nxtvepg-0.7.4.tar.gz) = 4d45c6a999cd2c7fbddf795370a8bbe844cb9c3f
-Size (nxtvepg-0.7.4.tar.gz) = 650336 bytes
-SHA1 (patch-aa) = 5022b82cdf9c05c5097b564b962b12ffc6b1416f
+SHA1 (nxtvepg-2.2.1.tar.gz) = 1c5cd3bf4a5072d1d3e95ed831f58edfec92f904
+Size (nxtvepg-2.2.1.tar.gz) = 676754 bytes
+SHA1 (patch-aa) = 7b1d277b7962426b90e06b02b5988b964837943c
 SHA1 (patch-ab) = 634cfd179fd1043e3272ce27836a9052b199d1f4
-SHA1 (patch-ac) = 22a84b2635c130c075f25517aa45cd079c65cca4
+SHA1 (patch-ac) = 2a60509e543d7ee796ef72cf555a9c0c32c5d927
 SHA1 (patch-ad) = ee64fd67a60783f1b2112771abdb5d1eb5a8b2a1
 SHA1 (patch-ae) = aa529deb560dabfac39edfb112068f6fd718b601
diff --git a/misc/nxtvepg/patches/patch-aa b/misc/nxtvepg/patches/patch-aa
index 338f4c8e788..10b952ad03c 100644
--- a/misc/nxtvepg/patches/patch-aa
+++ b/misc/nxtvepg/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2002/03/04 19:56:53 magick Exp $
+$NetBSD: patch-aa,v 1.8 2002/08/31 09:25:05 magick Exp $
 
---- Makefile.orig	Mon Mar  4 20:44:19 2002
+--- Makefile.orig	Sat Aug 31 11:13:30 2002
 +++ Makefile
-@@ -33,36 +33,36 @@
+@@ -33,40 +33,42 @@
  else
  
  ROOT    =
@@ -16,10 +16,14 @@ $NetBSD: patch-aa,v 1.7 2002/03/04 19:56:53 magick Exp $
 -PERL    = /usr/bin/perl
 +PERL    = ${LOCALBASE}/perl
  
--LDLIBS  = -ltk8.3 -ltcl8.3 -L/usr/X11R6/lib -lX11 -lXmu -lm -ldl
+ # 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  = dbglib/libtk8.3.a dbglib/libtcl8.3.a -lX11 -lm -ldl -L/usr/X11R6/lib
+ #LDLIBS += -Ldbglib -static
  
 -INCS   += -I. -I/usr/X11R6/include
 +INCS   += -I. -I${X11BASE}/include
@@ -27,10 +31,11 @@ $NetBSD: patch-aa,v 1.7 2002/03/04 19:56:53 magick Exp $
  #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/tk8.3\"
--DEFS   += -DTCL_LIBRARY_PATH=\"/usr/lib/tcl8.3\"
-+DEFS   += -DTK_LIBRARY_PATH=\"$(LOCALBASE)/lib/tk8.3\" 
-+DEFS   += -DTCL_LIBRARY_PATH=\"$(LOCALBASE)/lib/tcl8.3\" 
+-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
@@ -44,12 +49,13 @@ $NetBSD: patch-aa,v 1.7 2002/03/04 19:56:53 magick Exp $
  # path to the directory where the provider database files are kept
 -DB_DIR  = /usr/tmp/nxtvdb
 -DEFS   += -DEPG_DB_DIR=\"$(DB_DIR)\"
-+DB_DIR  = _PATH_TMP\"nxtvdb\"
-+DEFS   += -DEPG_DB_DIR=$(DB_DIR)
++DB_DIR  = _PATH_TMP\"nxtvdb\" 
++DEFS   += -DEPG_DB_DIR=$(DB_DIR) 
++
  INST_DB_DIR = $(ROOT)$(DB_DIR)
  
  WARN    = -Wall -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes
-@@ -95,11 +95,8 @@
+@@ -101,11 +103,9 @@
  install: nxtvepg nxtvepg.1
  	test -d $(bindir) || mkdirhier $(bindir)
  	test -d $(mandir) || mkdirhier $(mandir)
@@ -58,6 +64,16 @@ $NetBSD: patch-aa,v 1.7 2002/03/04 19:56:53 magick Exp $
  	install -c -m 0755 nxtvepg     $(bindir)
  	install -c -m 0644 nxtvepg.1   $(mandir)
 -	rm -f $(mandir)/nxtvepg.1x
++
  
  ##%.o: %.c
  ##	$(CC) $(CFLAGS) -c *.c -o *.o
+@@ -157,7 +157,7 @@
+ 	tar cf ../pc2.tar www ATTIC dsdrv?* tk8* tcl8* && bzip2 -f -9 ../pc2.tar
+ 	cd .. && tar cf /e/pc.tar pc -X pc/tar-ex-win
+ 
+-include Makefile.dep
++#include Makefile.dep
+ 
+ # end UNIX specific part
+ endif
diff --git a/misc/nxtvepg/patches/patch-ac b/misc/nxtvepg/patches/patch-ac
index 7cc1a58eef2..87593708ab6 100644
--- a/misc/nxtvepg/patches/patch-ac
+++ b/misc/nxtvepg/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2002/03/04 19:56:53 magick Exp $
+$NetBSD: patch-ac,v 1.3 2002/08/31 09:25:05 magick Exp $
 
---- epgui/help.tcl.orig	Sun Feb 17 13:34:51 2002
+--- epgui/help.tcl.orig	Sat Aug 31 11:00:26 2002
 +++ epgui/help.tcl
-@@ -27,7 +27,7 @@
+@@ -28,7 +28,7 @@
  } {} {-rcfile} bold { } {} {path} underlined {
  Specify an alternate configuration file. Default: on UNIX $HOME/.nxtvepgrc, on Windows nxtvepg.ini in the current directory.
  } {} {-dbdir} bold { } {} {directory} underlined {
@@ -10,4 +10,4 @@ $NetBSD: patch-ac,v 1.2 2002/03/04 19:56:53 magick Exp $
 +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.
  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.
  } {} {-card} bold { } {} {index} underlined {
- Specify which tuner card to use, if you have more than one. The given index is appended to /dev/vbi and /dev/video. Default: index 0, i.e. the card in the first PCI slot.
+ 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. } {} {/dev/vbi} underlined { and } {} {/dev/video} underlined {. 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)