summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
Diffstat (limited to 'misc')
-rw-r--r--misc/nxtvepg/Makefile4
-rw-r--r--misc/nxtvepg/distinfo14
-rw-r--r--misc/nxtvepg/patches/patch-aa44
-rw-r--r--misc/nxtvepg/patches/patch-ac12
-rw-r--r--misc/nxtvepg/patches/patch-ad30
-rw-r--r--misc/nxtvepg/patches/patch-ae14
6 files changed, 46 insertions, 72 deletions
diff --git a/misc/nxtvepg/Makefile b/misc/nxtvepg/Makefile
index 92e2ac5c30b..303436e899d 100644
--- a/misc/nxtvepg/Makefile
+++ b/misc/nxtvepg/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2001/11/08 18:09:45 magick Exp $
+# $NetBSD: Makefile,v 1.13 2002/03/04 19:56:52 magick Exp $
-DISTNAME= nxtvepg-0.6.4
+DISTNAME= nxtvepg-0.7.0
CATEGORIES= misc
MASTER_SITES= http://www.nefkom.net/tomzo/prj/nxtvepg/src/
diff --git a/misc/nxtvepg/distinfo b/misc/nxtvepg/distinfo
index 8f284350878..3468f3725c1 100644
--- a/misc/nxtvepg/distinfo
+++ b/misc/nxtvepg/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2001/11/08 18:09:45 magick Exp $
+$NetBSD: distinfo,v 1.11 2002/03/04 19:56:52 magick Exp $
-SHA1 (nxtvepg-0.6.4.tar.gz) = 45c569f48d67228cce8a2066243038c3833be57c
-Size (nxtvepg-0.6.4.tar.gz) = 403631 bytes
-SHA1 (patch-aa) = 05f42a63f0a97963f662eb04de91b0f4b140e43e
+SHA1 (nxtvepg-0.7.0.tar.gz) = 52258700747dec763339d499638203d02dbd3e12
+Size (nxtvepg-0.7.0.tar.gz) = 506031 bytes
+SHA1 (patch-aa) = 5022b82cdf9c05c5097b564b962b12ffc6b1416f
SHA1 (patch-ab) = 634cfd179fd1043e3272ce27836a9052b199d1f4
-SHA1 (patch-ac) = 2a72e3ea0abdf0ec8e1514c7067576448bc82cdc
-SHA1 (patch-ad) = bd176db9fedd6c21be8967a577af45956985113c
-SHA1 (patch-ae) = e73e5bd9b08f58d7301fa19237861cada6e9b6fe
+SHA1 (patch-ac) = 22a84b2635c130c075f25517aa45cd079c65cca4
+SHA1 (patch-ad) = ee64fd67a60783f1b2112771abdb5d1eb5a8b2a1
+SHA1 (patch-ae) = aa529deb560dabfac39edfb112068f6fd718b601
diff --git a/misc/nxtvepg/patches/patch-aa b/misc/nxtvepg/patches/patch-aa
index 2b6c8ea2e10..338f4c8e788 100644
--- a/misc/nxtvepg/patches/patch-aa
+++ b/misc/nxtvepg/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2001/09/09 13:00:14 magick Exp $
+$NetBSD: patch-aa,v 1.7 2002/03/04 19:56:53 magick Exp $
---- Makefile.orig Fri Sep 7 22:31:54 2001
+--- Makefile.orig Mon Mar 4 20:44:19 2002
+++ Makefile
-@@ -33,36 +33,42 @@
+@@ -33,36 +33,36 @@
else
ROOT =
@@ -14,16 +14,14 @@ $NetBSD: patch-aa,v 1.6 2001/09/09 13:00:14 magick Exp $
# if you have perl set the path here, else just leave it alone
-PERL = /usr/bin/perl
-+PERL = ${LOCALBASE}/bin/perl
++PERL = ${LOCALBASE}/perl
-LDLIBS = -ltk8.3 -ltcl8.3 -L/usr/X11R6/lib -lX11 -lXmu -lm -ldl
-+#LDLIBS = -ltk8.3 -ltcl8.3 -L/usr/X11R6/lib -lX11 -lXmu -lm -ldl
-+LDLIBS = -ltk83 -ltcl83 -lX11 -lXmu -lm
++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
-INCS += -I. -I/usr/X11R6/include
-+#INCS += -I. -I/usr/X11R6/include
+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
@@ -31,41 +29,35 @@ $NetBSD: patch-aa,v 1.6 2001/09/09 13:00:14 magick Exp $
# 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=\"/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=\"$(LOCALBASE)/lib/tk8.3\"
++DEFS += -DTCL_LIBRARY_PATH=\"$(LOCALBASE)/lib/tcl8.3\"
+
+ # enable use of multi-threading
+-DEFS += -DUSE_THREADS
+-LDLIBS += -lpthread
++#DEFS += -DUSE_THREADS
++#LDLIBS += -lpthread
+
+ # 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 = /usr/tmp/nxtvdb
+DB_DIR = _PATH_TMP\"nxtvdb\"
-+#DEFS += -DEPG_DB_DIR=\"$(DB_DIR)\"
+DEFS += -DEPG_DB_DIR=$(DB_DIR)
INST_DB_DIR = $(ROOT)$(DB_DIR)
- #WARN = -Wall -Wpointer-arith -Wnested-externs \
- # -Werror -Wstrict-prototypes -Wmissing-prototypes
- WARN = -Wall
- CC = gcc
--CFLAGS = -pipe $(WARN) $(INCS) $(DEFS) -O3
-+CFLAGS = -pipe $(WARN) $(INCS) $(DEFS)
-
- # ----- don't change anything below ------------------------------------------
-
-@@ -87,11 +93,11 @@
+ WARN = -Wall -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes
+@@ -95,11 +95,8 @@
install: nxtvepg nxtvepg.1
test -d $(bindir) || mkdirhier $(bindir)
test -d $(mandir) || mkdirhier $(mandir)
- test -d $(INST_DB_DIR) || mkdirhier $(INST_DB_DIR)
- chmod 0777 $(INST_DB_DIR)
-+# test -d $(INST_DB_DIR) || mkdirhier $(INST_DB_DIR)
-+# chmod 0777 $(INST_DB_DIR)
install -c -m 0755 nxtvepg $(bindir)
install -c -m 0644 nxtvepg.1 $(mandir)
- rm -f $(mandir)/nxtvepg.1x
-+# rm -f $(mandir)/nxtvepg.1x
##%.o: %.c
## $(CC) $(CFLAGS) -c *.c -o *.o
diff --git a/misc/nxtvepg/patches/patch-ac b/misc/nxtvepg/patches/patch-ac
index cdfb0ee9305..7cc1a58eef2 100644
--- a/misc/nxtvepg/patches/patch-ac
+++ b/misc/nxtvepg/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/02/18 19:17:24 tron Exp $
+$NetBSD: patch-ac,v 1.2 2002/03/04 19:56:53 magick Exp $
---- epgui/help.tcl.orig Wed Feb 14 22:31:37 2001
-+++ epgui/help.tcl Sun Feb 18 20:11:30 2001
-@@ -26,7 +26,7 @@
+--- epgui/help.tcl.orig Sun Feb 17 13:34:51 2002
++++ epgui/help.tcl
+@@ -27,7 +27,7 @@
} {} {-rcfile} bold { } {} {path} underlined {
- Specify an alternate configuration file. Default: on UNIX ~/.nxtvepgrc, on Windows nxtvepg.ini in the current directory.
+ 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 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.
- } {} {-provider} bold { } {} {CNI} underlined {
diff --git a/misc/nxtvepg/patches/patch-ad b/misc/nxtvepg/patches/patch-ad
index e9c68943d23..290278735df 100644
--- a/misc/nxtvepg/patches/patch-ad
+++ b/misc/nxtvepg/patches/patch-ad
@@ -1,31 +1,13 @@
-$NetBSD: patch-ad,v 1.2 2001/06/09 15:14:26 magick Exp $
+$NetBSD: patch-ad,v 1.3 2002/03/04 19:56:53 magick Exp $
---- nxtvepg.1.orig Wed Feb 14 22:31:37 2001
-+++ nxtvepg.1 Sun Feb 18 20:13:22 2001
-@@ -234,7 +234,7 @@
- on Windows nxtvepg.ini in the current directory.
+--- nxtvepg.1.orig Sun Feb 17 13:36:12 2002
++++ nxtvepg.1
+@@ -199,7 +199,7 @@
.Ip "\fB\-dbdir\fR \fIdirectory\fR" 4
+ .IX Item "-dbdir directory"
Specify an alternate directory for the databases.
-Default: On \s-1UNIX\s0 /usr/tmp/nxtvdb, on Windows the current directory.
+Default: On \s-1UNIX\s0 /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 \s-1TV\s0 tuner card in your system or network,
- relocate the directory into the users\*(R' homes.
-@@ -910,7 +910,7 @@
- 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 \fB\-rcfile\fR option.
--.Ip "\fB/usr/tmp/nxtvdb/nxtvdb-####\fR" 4
-+.Ip "\fB/tmp/nxtvdb/nxtvdb-####\fR" 4
- Directory containing one file for each provider's database.
- Can be changed with the \fB\-dbdir\fR command line option.
- The last 4 digits of the file names are the hexadecimal \s-1CNI\s0 (Country
-@@ -1142,7 +1142,7 @@
-
- .IX Item "\fB~/.nxtvepgrc\fR"
-
--.IX Item "\fB/usr/tmp/nxtvdb/nxtvdb-####\fR"
-+.IX Item "\fB/tmp/nxtvdb/nxtvdb-####\fR"
-
- .IX Item "\fB/dev/vbi0\fR, \fB/dev/vbi1\fR, etc."
-
+ relocate the directory into the users' homes.
diff --git a/misc/nxtvepg/patches/patch-ae b/misc/nxtvepg/patches/patch-ae
index 863f87eff25..8d09a711501 100644
--- a/misc/nxtvepg/patches/patch-ae
+++ b/misc/nxtvepg/patches/patch-ae
@@ -1,14 +1,14 @@
-$NetBSD: patch-ae,v 1.3 2001/06/09 15:14:26 magick Exp $
+$NetBSD: patch-ae,v 1.4 2002/03/04 19:56:53 magick Exp $
---- epgui/epgmain.c.orig Sat May 19 16:42:02 2001
+--- epgui/epgmain.c.orig Sun Feb 17 13:38:00 2002
+++ epgui/epgmain.c
-@@ -105,6 +105,9 @@
- static const char *rcfile = "nxtvepg.ini";
- static const char *dbdir = ".";
+@@ -111,6 +111,9 @@
+ static const char * const defaultRcFile = "nxtvepg.ini";
+ static const char * const defaultDbDir = ".";
#else
+#ifdef __NetBSD__
+#include <paths.h>
+#endif
- static const char *rcfile = "~/.nxtvepgrc";
- static const char *dbdir = EPG_DB_DIR;
+ static const char * defaultRcFile = "~/.nxtvepgrc";
+ static const char * defaultDbDir = EPG_DB_DIR;
#endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-04 13:09:40 +0000