Update nxtvepg to 2.3.0. And while there buildlinkify2 it.

Changes since 2.2.1 (Windows specific changes ommited):
* Bugfix in user-defined context menu entries: variables using
  modifiers (e.g. ${start: %H:%M %d.%m.%Y}) sometimes had trailing
  garbage; this bug was introduced in 2.2.0. Thanks to Friedrich
  Delgado Friedrichs for pointing this out.

* Bugfix in decoding of description texts (newlines were not processed
  correctly sometimes); also improved text display by inserting
  paragraph breaks when there is a completely empty line in the
  original description text

* Added "duration" filter, so that programmes ouside of given running
  time length boundaries can be suppressed (e.g. filler programmes
  which are less then 10 minutes long)

* Added possibility to manually resize all listbox columns by dragging
  the right border of the column header menu buttons (not possible if
  headers are disabled in the "show" options of the configure
  menu). Note that the automatic resizing of the network name column
  was dropped in favour of this feature.

* Timescale windows are now always made large enough to display the
  time range covered by all programmes in the database (formerly only
  the next 5 days were covered, which was by far not enough for the
  German provider Kabel1)

* Added zoom and help buttons to the timescale windows

* Improved key bindings and default keyboard focus in main browser and
  dialog windows; CTRL-F in main window now opens the text search
  dialog; CTRL-C opens the context menu; digit keys now toggle
  shortcuts; Return tunes the channel like pressing the Tune-TV button

* The search text history is now accessible from inside the text
  search filter dialog (by pressing the down cursor key or clicking
  the arrow button next to the text entry field)

* The "Refresh" mode of the EPG scan now allows to remove databases of
  obsolete providers which no longer transmit Nextview EPG (e.g. Pro7
  or TV5). Thanks to Frank Mauler for pointing out the need for this
  feature.

* Added a "Load all used" button to the sorting criterion filter
  dialog which fills the sorting criterion selection listbox with a
  list of all codes that are actually used in the current
  database. This allows a quick overview which criterions will
  produce any matches when filtered for.

* Linux only: fixed tuner frequency setting (in particular the EPG
  scan) for SECAM/PAL multi-norm tuners. Thanks to "Keuleu 36" for
  debugging this problem

* UNIX only: fine tuning offsets and TV norm in the .xawtv file are
  now evaluated for the EPG scan

* Internal reorganization of the interface between Tcl/Tk and C
  modules (using the "object-based" Tcl interface for function
  arguments and results)

3 files changed, 56 insertions, 7 deletions

diff --git a/misc/nxtvepg/Makefile b/misc/nxtvepg/Makefile
index 8446d69d1a6..f6a55fc18ae 100644
--- a/misc/nxtvepg/Makefile
+++ b/misc/nxtvepg/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2002/08/31 09:25:04 magick Exp $
+# $NetBSD: Makefile,v 1.18 2002/10/06 13:03:57 magick Exp $
 
-DISTNAME=	nxtvepg-2.2.1
+DISTNAME=	nxtvepg-2.3.0
 CATEGORIES=	misc
 MASTER_SITES=	http://www.nefkom.net/tomzo/prj/nxtvepg/src/
 
@@ -14,7 +14,7 @@ ONLY_FOR_PLATFORM=      NetBSD-1.4[Y-Z]-* NetBSD-1.4Z[A-Z]-* \
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_X11=	yes
-USE_BUILDLINK_ONLY= yes
+USE_BUILDLINK2= yes
 pre-configure:
 	cd ${WRKSRC};							\
 	${MV} -f pod2help.pl pod2help.pl.orig;				\
@@ -25,5 +25,5 @@ pre-build:
 	cd ${WRKSRC};							\
 	${GMAKE} depend
 
-.include "../../x11/tk/buildlink.mk"
+.include "../../x11/tk/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/nxtvepg/distinfo b/misc/nxtvepg/distinfo
index b2249584748..d41d45da6af 100644
--- a/misc/nxtvepg/distinfo
+++ b/misc/nxtvepg/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.15 2002/08/31 09:25:04 magick Exp $
+$NetBSD: distinfo,v 1.16 2002/10/06 13:03:57 magick Exp $
 
-SHA1 (nxtvepg-2.2.1.tar.gz) = 1c5cd3bf4a5072d1d3e95ed831f58edfec92f904
-Size (nxtvepg-2.2.1.tar.gz) = 676754 bytes
+SHA1 (nxtvepg-2.3.0.tar.gz) = 11b3681ad6dad3175f8613625e32f8ab5603c418
+Size (nxtvepg-2.3.0.tar.gz) = 696204 bytes
 SHA1 (patch-aa) = 7b1d277b7962426b90e06b02b5988b964837943c
 SHA1 (patch-ab) = 634cfd179fd1043e3272ce27836a9052b199d1f4
 SHA1 (patch-ac) = 2a60509e543d7ee796ef72cf555a9c0c32c5d927
 SHA1 (patch-ad) = ee64fd67a60783f1b2112771abdb5d1eb5a8b2a1
 SHA1 (patch-ae) = aa529deb560dabfac39edfb112068f6fd718b601
+SHA1 (patch-af) = 886a78d170010f9fb279653938e3c927ff8b92b6
diff --git a/misc/nxtvepg/patches/patch-af b/misc/nxtvepg/patches/patch-af
new file mode 100644
index 00000000000..2f89839850b
--- /dev/null
+++ b/misc/nxtvepg/patches/patch-af
@@ -0,0 +1,48 @@
+$NetBSD: patch-af,v 1.1 2002/10/06 13:03:58 magick Exp $
+
+--- epgvbi/btdrv4linux.c.orig	Sun Oct  6 14:32:01 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;
+ 
+    lfreq = freq & 0xffffff;
+    if (BtDriver_SetInputSource(inputIdx, norm, pIsTuner))
+@@ -1358,13 +1362,15 @@
+ 
+       if (pVbiBuf->doQueryFreq && (vbi_fdin != -1))
+       {
++#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