Update nxtvepg to 2.4.0:

Changes since 2.3.0 are too numerous to mention all here. Refer to the homepage
for details.

The most important changes:

* Project page was moved to sourceforge
* Implemented user-defined columns in TV schedule output, which allow
  to define the column content depending on matches against a number
  of filter shortcuts; the content can consist of static text,
  pre-defined images or a standard attribute. See the manual or this
  screenshot for details.
* Implemented inverted filters, i.e. you can now search for all
  programmes which do not match one or more of given filter criteria
  or simply invert the outcome of a complete filter setting.
* Added a new filter type: "VPS/PDC" which allows to search for
  programmes with a VPS/PDC timestamp attached, and/or whose VPS/PDC
  start time differs from the actual start time (i.e. shifted or newly
  added programmes)
* Enhanced start time filter: added an option "ignore date" which
  allows to search for programmes in a daily time window
  (e.g. restrict a search for German new magazine "Tagesschau" to
  20:00-20:10)
* Added database export in XML format (according to xmltv.dtd), provided by
  Massis Sirapian.
* Bugfix for Power-PC architecture in pioutput.c; Thanks to Gerhard Tonn
* Internal changes: split Tcl/Tk script for GUI into modules (the
* daemon only loads the script which manages the rcfile - saves
* apx. 400 kB RAM)

Plus many bug fixes.

7 files changed, 75 insertions, 96 deletions

diff --git a/misc/nxtvepg/Makefile b/misc/nxtvepg/Makefile
index f6a55fc18ae..1c1a41c155f 100644
--- a/misc/nxtvepg/Makefile
+++ b/misc/nxtvepg/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.18 2002/10/06 13:03:57 magick Exp $
+# $NetBSD: Makefile,v 1.19 2002/11/24 17:23:40 magick Exp $
 
-DISTNAME=	nxtvepg-2.3.0
+DISTNAME=	nxtvepg-2.4.0
 CATEGORIES=	misc
-MASTER_SITES=	http://www.nefkom.net/tomzo/prj/nxtvepg/src/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=nxtvepg/}
 
 MAINTAINER=	magick@zhadum.de
-HOMEPAGE=	http://www.nefkom.net/tomzo/prj/nxtvepg/
+HOMEPAGE=	http://sourceforge.net/projects/nxtvepg/
 COMMENT=	NextView EPG decoder
 
 ONLY_FOR_PLATFORM=      NetBSD-1.4[Y-Z]-* NetBSD-1.4Z[A-Z]-* \
@@ -21,9 +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
+#pre-build:
+#	cd ${WRKSRC};							\
+#	${GMAKE} depend
 
 .include "../../x11/tk/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/nxtvepg/PLIST b/misc/nxtvepg/PLIST
index fa0ebbec39b..af1524af0e6 100644
--- a/misc/nxtvepg/PLIST
+++ b/misc/nxtvepg/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:28:56 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/11/24 17:23:40 magick Exp $
 bin/nxtvepg
 man/man1/nxtvepg.1
+lib/X11/app-defaults/Nxtvepg
diff --git a/misc/nxtvepg/distinfo b/misc/nxtvepg/distinfo
index d41d45da6af..474f07faf9f 100644
--- a/misc/nxtvepg/distinfo
+++ b/misc/nxtvepg/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.16 2002/10/06 13:03:57 magick Exp $
+$NetBSD: distinfo,v 1.17 2002/11/24 17:23:40 magick Exp $
 
-SHA1 (nxtvepg-2.3.0.tar.gz) = 11b3681ad6dad3175f8613625e32f8ab5603c418
-Size (nxtvepg-2.3.0.tar.gz) = 696204 bytes
-SHA1 (patch-aa) = 7b1d277b7962426b90e06b02b5988b964837943c
+SHA1 (nxtvepg-2.4.0.tar.gz) = a8e6e01932fd3d660e5f1487194ad25deb6528fd
+Size (nxtvepg-2.4.0.tar.gz) = 763234 bytes
+SHA1 (patch-aa) = ce710fabed5467fb44968214a155d5d1c5426d62
 SHA1 (patch-ab) = 634cfd179fd1043e3272ce27836a9052b199d1f4
-SHA1 (patch-ac) = 2a60509e543d7ee796ef72cf555a9c0c32c5d927
+SHA1 (patch-ac) = 7eb5f7b443be01ecd8e367f5244be3509e0cb2ae
 SHA1 (patch-ad) = ee64fd67a60783f1b2112771abdb5d1eb5a8b2a1
-SHA1 (patch-ae) = aa529deb560dabfac39edfb112068f6fd718b601
-SHA1 (patch-af) = 886a78d170010f9fb279653938e3c927ff8b92b6
+SHA1 (patch-ae) = 9502d2c684748d7580650098956bf2e67615c9b2
+SHA1 (patch-af) = 7748756e7876ded35ba9ac54d2d0677ce3bcb800
diff --git a/misc/nxtvepg/patches/patch-aa b/misc/nxtvepg/patches/patch-aa
index 10b952ad03c..4e8b46f98d9 100644
--- a/misc/nxtvepg/patches/patch-aa
+++ b/misc/nxtvepg/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.8 2002/08/31 09:25:05 magick Exp $
+$NetBSD: patch-aa,v 1.9 2002/11/24 17:23:40 magick Exp $
 
---- Makefile.orig	Sat Aug 31 11:13:30 2002
+--- Makefile.orig	Tue Nov 19 20:03:24 2002
 +++ Makefile
-@@ -33,40 +33,42 @@
+@@ -33,34 +33,34 @@
  else
  
  ROOT    =
@@ -11,6 +11,8 @@ $NetBSD: patch-aa,v 1.8 2002/08/31 09:25:05 magick Exp $
  exec_prefix = ${prefix}
  bindir  = $(ROOT)${exec_prefix}/bin
  mandir  = $(ROOT)${prefix}/man/man1
+-resdir  = $(ROOT)/usr/X11R6/lib/X11
++resdir  = $(ROOT)${X11PREFIX}/lib/X11
  
  # if you have perl set the path here, else just leave it alone
 -PERL    = /usr/bin/perl
@@ -35,7 +37,6 @@ $NetBSD: patch-aa,v 1.8 2002/08/31 09:25:05 magick Exp $
 -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
@@ -45,32 +46,35 @@ $NetBSD: patch-aa,v 1.8 2002/08/31 09:25:05 magick Exp $
  
  # enable use of daemon and client/server connection
  DEFS   += -DUSE_DAEMON
- 
- # 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) 
-+
- INST_DB_DIR = $(ROOT)$(DB_DIR)
- 
- WARN    = -Wall -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes
-@@ -101,11 +103,9 @@
+@@ -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
+@@ -112,14 +112,9 @@
  install: nxtvepg nxtvepg.1
  	test -d $(bindir) || mkdirhier $(bindir)
  	test -d $(mandir) || mkdirhier $(mandir)
+-ifndef USER_DBDIR
 -	test -d $(INST_DB_DIR) || mkdirhier $(INST_DB_DIR)
--	chmod 0777 $(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
-+
  
- ##%.o: %.c
- ##	$(CC) $(CFLAGS) -c *.c -o *.o
-@@ -157,7 +157,7 @@
+ .SUFFIXES: .c .o .tcl
+ 
+@@ -171,7 +166,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
- 	cd .. && tar cf /e/pc.tar pc -X pc/tar-ex-win
  
 -include Makefile.dep
 +#include Makefile.dep
diff --git a/misc/nxtvepg/patches/patch-ac b/misc/nxtvepg/patches/patch-ac
index 87593708ab6..906d7f3b439 100644
--- a/misc/nxtvepg/patches/patch-ac
+++ b/misc/nxtvepg/patches/patch-ac
@@ -1,13 +1,22 @@
-$NetBSD: patch-ac,v 1.3 2002/08/31 09:25:05 magick Exp $
+$NetBSD: patch-ac,v 1.4 2002/11/24 17:23:40 magick Exp $
 
---- epgui/help.tcl.orig	Sat Aug 31 11:00:26 2002
-+++ epgui/help.tcl
-@@ -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 {
--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.
- 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 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)
+--- epgtcl/helptexts.tcl.orig	Sun Nov 24 17:34:29 2002
++++ epgtcl/helptexts.tcl
+@@ -25,7 +25,7 @@
+ } 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.
+ } 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 @@
+ } {} {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.
+-} 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.
+ } 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-ae b/misc/nxtvepg/patches/patch-ae
index 8d09a711501..83a50b68895 100644
--- a/misc/nxtvepg/patches/patch-ae
+++ b/misc/nxtvepg/patches/patch-ae
@@ -1,14 +1,14 @@
-$NetBSD: patch-ae,v 1.4 2002/03/04 19:56:53 magick Exp $
+$NetBSD: patch-ae,v 1.5 2002/11/24 17:23:41 magick Exp $
 
---- epgui/epgmain.c.orig	Sun Feb 17 13:38:00 2002
+--- epgui/epgmain.c.orig	Sun Nov 24 17:35:46 2002
 +++ epgui/epgmain.c
-@@ -111,6 +111,9 @@
+@@ -116,6 +116,9 @@
  static const char * const defaultRcFile = "nxtvepg.ini";
  static const char * const defaultDbDir  = ".";
  #else
 +#ifdef __NetBSD__
 +#include <paths.h>
 +#endif
- static const char * defaultRcFile = "~/.nxtvepgrc";
- static const char * defaultDbDir  = EPG_DB_DIR;
+ static char * defaultRcFile = "~/.nxtvepgrc";
+ static char * defaultDbDir  = NULL;
  #endif
diff --git a/misc/nxtvepg/patches/patch-af b/misc/nxtvepg/patches/patch-af
index 2f89839850b..f5557430493 100644
--- a/misc/nxtvepg/patches/patch-af
+++ b/misc/nxtvepg/patches/patch-af
@@ -1,48 +1,13 @@
-$NetBSD: patch-af,v 1.1 2002/10/06 13:03:58 magick Exp $
+$NetBSD: patch-af,v 1.2 2002/11/24 17:23:41 magick Exp $
 
---- epgvbi/btdrv4linux.c.orig	Sun Oct  6 14:32:01 2002
+--- epgvbi/btdrv4linux.c.orig	Sun Nov 24 17:56:26 2002
 +++ epgvbi/btdrv4linux.c
-@@ -145,6 +145,9 @@
- 
- static void * BtDriver_Main( void * foo );
- static void BtDriver_OpenVbiBuf( void );
-+#ifdef __NetBSD__
-+int BtDriver_StartCapture(void);
-+#endif
- 
- #ifdef __NetBSD__
- // ---------------------------------------------------------------------------
-@@ -481,6 +484,7 @@
-    char devName[DEV_MAX_NAME_LEN];
-    ulong lfreq;
-    bool result = FALSE;
-+   uint  norm;
- 
+@@ -516,7 +516,7 @@
+    norm  = freq >> 24;
     lfreq = freq & 0xffffff;
-    if (BtDriver_SetInputSource(inputIdx, norm, pIsTuner))
-@@ -1358,13 +1362,15 @@
  
-       if (pVbiBuf->doQueryFreq && (vbi_fdin != -1))
+-   if (DevKeptOpen || BtDriver_SetInputSource(inputIdx, norm, pIsTuner))
++   if (devKeptOpen || BtDriver_SetInputSource(inputIdx, norm, pIsTuner))
+    {
+       if ( (devKeptOpen || *pIsTuner) && (lfreq != 0) )
        {
-+#ifndef __NetBSD__
-          struct video_channel vchan;
-+#endif __NetBSD__
-          ulong lfreq;
- 
-          if (ioctl(vbi_fdin, VIDIOCGFREQ, &lfreq) == 0)
-          {
-             dprintf1("BtDriver-Main: QueryChannel got %.2f MHz\n", (double)lfreq/16);
--
-+#ifndef __NetBSD__
-             // get TV norm set in the tuner (channel #0)
-             memset(&vchan, 0, sizeof(vchan));
-             if (ioctl(vbi_fdin, VIDIOCGCHAN, &vchan) == 0)
-@@ -1374,7 +1380,7 @@
-             }
-             else
-                debug1("BtDriver-Main: VIDIOCGCHAN error: %s", strerror(errno));
--
-+#endif //__NetBSD__	    
-             pVbiBuf->vbiQueryFreq = lfreq;
-          }
-          else