Correct install-path for app-defaults. Should work now without

xpkwedge.
Update to 2.4.2.

Notable changes are:
* Fixed keyboard input handling for various configuration dialogs: popup menus
  can now invoked by ALT-<underlined char>
* Implemented redundancy removal in description texts of French
  providers (e.g. multiple "Au sommaire: ..." paragraphs). (Note that
  these repetitions exist because both a short and long version of the
  programme description is broadcasted; nxtvepg displays these
  together, but in TV sets they would normally appear on different
  pages)

3 files changed, 19 insertions, 18 deletions

diff --git a/misc/nxtvepg/Makefile b/misc/nxtvepg/Makefile
index 1c1a41c155f..e97295d036e 100644
--- a/misc/nxtvepg/Makefile
+++ b/misc/nxtvepg/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2002/11/24 17:23:40 magick Exp $
+# $NetBSD: Makefile,v 1.20 2002/12/15 11:28:54 magick Exp $
 
-DISTNAME=	nxtvepg-2.4.0
+DISTNAME=	nxtvepg-2.4.2
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=nxtvepg/}
 
diff --git a/misc/nxtvepg/distinfo b/misc/nxtvepg/distinfo
index 474f07faf9f..f74c0a4f895 100644
--- a/misc/nxtvepg/distinfo
+++ b/misc/nxtvepg/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.17 2002/11/24 17:23:40 magick Exp $
+$NetBSD: distinfo,v 1.18 2002/12/15 11:28:54 magick Exp $
 
-SHA1 (nxtvepg-2.4.0.tar.gz) = a8e6e01932fd3d660e5f1487194ad25deb6528fd
-Size (nxtvepg-2.4.0.tar.gz) = 763234 bytes
-SHA1 (patch-aa) = ce710fabed5467fb44968214a155d5d1c5426d62
+SHA1 (nxtvepg-2.4.2.tar.gz) = 8dd312bc1f16ed4fd300b273e6629a11a798ba73
+Size (nxtvepg-2.4.2.tar.gz) = 761170 bytes
+SHA1 (patch-aa) = ddc332b6e586c5e94abd12483d6a7831d965fefb
 SHA1 (patch-ab) = 634cfd179fd1043e3272ce27836a9052b199d1f4
 SHA1 (patch-ac) = 7eb5f7b443be01ecd8e367f5244be3509e0cb2ae
 SHA1 (patch-ad) = ee64fd67a60783f1b2112771abdb5d1eb5a8b2a1
 SHA1 (patch-ae) = 9502d2c684748d7580650098956bf2e67615c9b2
-SHA1 (patch-af) = 7748756e7876ded35ba9ac54d2d0677ce3bcb800
diff --git a/misc/nxtvepg/patches/patch-aa b/misc/nxtvepg/patches/patch-aa
index 4e8b46f98d9..7c5bc71193a 100644
--- a/misc/nxtvepg/patches/patch-aa
+++ b/misc/nxtvepg/patches/patch-aa
@@ -1,18 +1,20 @@
-$NetBSD: patch-aa,v 1.9 2002/11/24 17:23:40 magick Exp $
+$NetBSD: patch-aa,v 1.10 2002/12/15 11:28:55 magick Exp $
 
---- Makefile.orig	Tue Nov 19 20:03:24 2002
+--- Makefile.orig	Sun Dec 15 12:17:51 2002
 +++ Makefile
 @@ -33,34 +33,34 @@
  else
  
  ROOT    =
 -prefix  = /usr/local
-+prefix  = ${PREFIX}
++prefix  = ${X11PREFIX}
  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
-+resdir  = $(ROOT)${X11PREFIX}/lib/X11
++bindir  = ${exec_prefix}/bin
++mandir  = ${prefix}/man/man1
++resdir  = ${X11PREFIX}/lib/X11
  
  # if you have perl set the path here, else just leave it alone
 -PERL    = /usr/bin/perl
@@ -35,8 +37,8 @@ $NetBSD: patch-aa,v 1.9 2002/11/24 17:23:40 magick Exp $
  # 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\"  
++DEFS   += -DTK_LIBRARY_PATH=\"$(LOCALBASE)/lib/tk8.3\"
++DEFS   += -DTCL_LIBRARY_PATH=\"$(LOCALBASE)/lib/tcl8.3\"
  
  # enable use of multi-threading
 -DEFS   += -DUSE_THREADS
@@ -57,10 +59,10 @@ $NetBSD: patch-aa,v 1.9 2002/11/24 17:23:40 magick Exp $
  INST_DB_DIR  = $(ROOT)$(SYS_DBDIR)
  INST_DB_PERM = 0777
  endif
-@@ -112,14 +112,9 @@
- install: nxtvepg nxtvepg.1
+@@ -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)
@@ -72,7 +74,7 @@ $NetBSD: patch-aa,v 1.9 2002/11/24 17:23:40 magick Exp $
  
  .SUFFIXES: .c .o .tcl
  
-@@ -171,7 +166,7 @@
+@@ -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