summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--misc/nxtvepg/Makefile4
-rw-r--r--misc/nxtvepg/distinfo12
-rw-r--r--misc/nxtvepg/patches/patch-aa25
-rw-r--r--misc/nxtvepg/patches/patch-ad6
-rw-r--r--misc/nxtvepg/patches/patch-ae15
5 files changed, 30 insertions, 32 deletions
diff --git a/misc/nxtvepg/Makefile b/misc/nxtvepg/Makefile
index db7ea2878b7..5595aa5538e 100644
--- a/misc/nxtvepg/Makefile
+++ b/misc/nxtvepg/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2001/05/23 21:06:01 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/09 15:14:25 magick Exp $
-DISTNAME= nxtvepg-0.5.0
+DISTNAME= nxtvepg-0.5.1
CATEGORIES= misc
MASTER_SITES= http://www.nefkom.net/tomzo/prj/nxtvepg/src/
diff --git a/misc/nxtvepg/distinfo b/misc/nxtvepg/distinfo
index ae2ce920620..fc542564862 100644
--- a/misc/nxtvepg/distinfo
+++ b/misc/nxtvepg/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2001/05/23 21:06:01 jlam Exp $
+$NetBSD: distinfo,v 1.5 2001/06/09 15:14:25 magick Exp $
-SHA1 (nxtvepg-0.5.0.tar.gz) = a3ed2c251bc1920ff2cf7caea3d02d6bede0343a
-Size (nxtvepg-0.5.0.tar.gz) = 310648 bytes
-SHA1 (patch-aa) = f495cf6eda409ce414c8df93c28dd7de416aee2d
+SHA1 (nxtvepg-0.5.1.tar.gz) = d171ac3ff22d1f2d58447abed8e70688f637b132
+Size (nxtvepg-0.5.1.tar.gz) = 337600 bytes
+SHA1 (patch-aa) = e7efa2a757405c82d35c36025564551e0e568af6
SHA1 (patch-ab) = 057fd7fc5e08a198e4ea800bfcb1dadf03363ce0
SHA1 (patch-ac) = 2a72e3ea0abdf0ec8e1514c7067576448bc82cdc
-SHA1 (patch-ad) = 8c2000b19adb73082de8990a5b15b8ea8ede54b1
-SHA1 (patch-ae) = d4e2411277d0e2eab54b1b8d0ee3e86e2deacee3
+SHA1 (patch-ad) = bd176db9fedd6c21be8967a577af45956985113c
+SHA1 (patch-ae) = e73e5bd9b08f58d7301fa19237861cada6e9b6fe
diff --git a/misc/nxtvepg/patches/patch-aa b/misc/nxtvepg/patches/patch-aa
index 9390b550bea..d6cb4727968 100644
--- a/misc/nxtvepg/patches/patch-aa
+++ b/misc/nxtvepg/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2001/03/01 20:52:15 tron Exp $
+$NetBSD: patch-aa,v 1.4 2001/06/09 15:14:26 magick Exp $
---- Makefile.orig Mon Feb 26 22:56:48 2001
+--- Makefile.orig Mon Jun 4 21:25:11 2001
+++ Makefile
-@@ -32,31 +32,31 @@
+@@ -32,33 +32,33 @@
include Makefile.win32
else
@@ -15,8 +15,8 @@ $NetBSD: patch-aa,v 1.3 2001/03/01 20:52:15 tron Exp $
-PERL = /usr/bin/perl
+PERL = $(LOCALBASE)/bin/perl
--LDLIBS = -ltk8.3 -ltcl8.3 -L/usr/X11R6/lib -lX11 -lm -ldl
-+LDLIBS = -ltk83 -ltcl83 -L$(X11BASE)/lib -lX11 -lm
+-LDLIBS = -ltk8.3 -ltcl8.3 -L/usr/X11R6/lib -lX11 -lXmu -lm -ldl
++LDLIBS = -ltk83 -ltcl83 -L$(X11BASE)/lib -lX11 -lm -lXmu
# use static libraries for debugging only
#LDLIBS = dbglib/libtk8.3.a dbglib/libtcl8.3.a -lX11 -lm -ldl -L/usr/X11R6/lib
@@ -31,23 +31,24 @@ $NetBSD: patch-aa,v 1.3 2001/03/01 20:52:15 tron Exp $
+DEFS += -DTK_LIBRARY_PATH=\"$(LOCALBASE)/lib/tk8.3\"
+DEFS += -DTCL_LIBRARY_PATH=\"$(LOCALBASE)/lib/tcl8.3\"
+ # path to the directory where the provider database files are kept
+-DEFS += -DEPG_DB_DIR=\"/usr/tmp/nxtvdb\"
++DEFS += -DEPG_DB_DIR=_PATH_TMP\"nxtvdb\"
#WARN = -Wall -Wpointer-arith -Wnested-externs \
# -Werror -Wstrict-prototypes -Wmissing-prototypes
WARN = -Wall
--CC = gcc
--CFLAGS = -pipe $(WARN) $(INCS) $(DEFS) -O
-+#CC = gcc
+ CC = gcc
+-CFLAGS = -pipe $(WARN) $(INCS) $(DEFS) -O2
+CFLAGS += $(WARN) $(INCS) $(DEFS)
# ----- don't change anything below ------------------------------------------
-@@ -81,7 +81,7 @@
- test -d $(BINDIR) || mkdirhier $(BINDIR)
+@@ -85,7 +85,6 @@
test -d $(MANDIR) || mkdirhier $(MANDIR)
install -c -m 0755 nxtvepg $(BINDIR)
-- install -c -m 0644 nxtvepg.1x $(MANDIR)
-+ install -c -m 0644 nxtvepg.1x $(MANDIR)/nxtvepg.1
+ install -c -m 0644 nxtvepg.1 $(MANDIR)
+- rm -f $(MANDIR)/nxtvepg.1x
##%.o: %.c
## $(CC) $(CFLAGS) -c *.c -o *.o
diff --git a/misc/nxtvepg/patches/patch-ad b/misc/nxtvepg/patches/patch-ad
index 30872497e39..e9c68943d23 100644
--- a/misc/nxtvepg/patches/patch-ad
+++ b/misc/nxtvepg/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/02/18 19:17:24 tron Exp $
+$NetBSD: patch-ad,v 1.2 2001/06/09 15:14:26 magick Exp $
---- nxtvepg.1x.orig Wed Feb 14 22:31:37 2001
-+++ nxtvepg.1x Sun Feb 18 20:13:22 2001
+--- 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.
.Ip "\fB\-dbdir\fR \fIdirectory\fR" 4
diff --git a/misc/nxtvepg/patches/patch-ae b/misc/nxtvepg/patches/patch-ae
index 38940fad493..863f87eff25 100644
--- a/misc/nxtvepg/patches/patch-ae
+++ b/misc/nxtvepg/patches/patch-ae
@@ -1,17 +1,14 @@
-$NetBSD: patch-ae,v 1.2 2001/04/23 20:37:32 tron Exp $
+$NetBSD: patch-ae,v 1.3 2001/06/09 15:14:26 magick Exp $
---- epgui/epgmain.c.orig Sat Apr 21 21:44:48 2001
+--- epgui/epgmain.c.orig Sat May 19 16:42:02 2001
+++ epgui/epgmain.c
-@@ -104,7 +104,12 @@
+@@ -105,6 +105,9 @@
+ static const char *rcfile = "nxtvepg.ini";
static const char *dbdir = ".";
#else
- static const char *rcfile = "~/.nxtvepgrc";
+#ifdef __NetBSD__
+#include <paths.h>
-+static const char *dbdir = _PATH_TMP "nxtvdb";
-+#else
- static const char *dbdir = "/usr/tmp/nxtvdb";
+#endif
+ static const char *rcfile = "~/.nxtvepgrc";
+ static const char *dbdir = EPG_DB_DIR;
#endif
- static int videoCardIndex = -1;
- static bool disableAcq = FALSE;