Attachment #45268 for bug #69842

View | Details | Raw Unified | Return to bug 69842
Collapse All | Expand All

Lines 6-13 Link Here

(-)nxtvepg/Makefile (-3 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= nxtvepg	8	PORTNAME= nxtvepg
9	PORTVERSION= 2.6.0	9	PORTVERSION= 2.7.1
10	PORTREVISION= 1
11	CATEGORIES= multimedia tcl84 tk84	10	CATEGORIES= multimedia tcl84 tk84
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR=${PORTNAME}	12	MASTER_SITE_SUBDIR=${PORTNAME}
Lines 20-26 Link Here
20	USE_GMAKE= yes	19	USE_GMAKE= yes
21	USE_XLIB= yes	20	USE_XLIB= yes
22	USE_X_PREFIX= yes	21	USE_X_PREFIX= yes
23	MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS}	22	MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} WRKSRC=${WRKSRC}
24		23
25	MAN1= nxtvepg.1	24	MAN1= nxtvepg.1
26	MYPORTDOCS= README TODO CHANGES manual.html	25	MYPORTDOCS= README TODO CHANGES manual.html

Lines 1-2 Link Here

(-)nxtvepg/distinfo (-2 / +2 lines)
1	MD5 (nxtvepg-2.6.0.tar.gz) = 9d7efd6b19f95274c002f19b92bcd9da	1	MD5 (nxtvepg-2.7.1.tar.gz) = 7625d7e9d4a57ab58277e7edb073f931
2	SIZE (nxtvepg-2.6.0.tar.gz) = 1129008	2	SIZE (nxtvepg-2.7.1.tar.gz) = 1217393




--- Makefile.orig	Sun Jul 18 15:00:26 2004
+++ Makefile	Fri Jul 30 16:34:23 2004
@@ -43,12 +43,24 @@
 include Makefile.bsd
 else

 
 # if you have perl set the path here, else just leave it alone
 PERL    = /usr/bin/perl
@@ -104,10 +116,10 @@
 # The database directory can be either in the user's $HOME (or relative to any
 # other env variable) or at a global place like /var/spool (world-writable)
 # -> uncomment 2 lines below to put the databases in the user's home

 DEFS        += -DEPG_DB_DIR=\"$(SYS_DBDIR)\"
 INST_DB_DIR  = $(ROOT)$(SYS_DBDIR)
 INST_DB_PERM = 0777
@@ -121,7 +133,7 @@
 CFLAGS += $(WARN) $(INCS) $(DEFS)
 #LDLIBS += -pg
 
-BUILD_DIR  = build-$(shell uname -m | sed -e 's/i.86/i386/' -e 's/ppc/powerpc/')
+BUILD_DIR  ?= build-$(shell uname -m | sed -e 's/i.86/i386/' -e 's/ppc/powerpc/')
 INCS      += -I$(BUILD_DIR)
 
 # end Linux specific part




--- Makefile.bsd.orig	Fri Jul 30 16:35:54 2004
+++ Makefile.bsd	Fri Jul 30 16:36:04 2004
@@ -127,6 +127,7 @@
 CFLAGS ?= $(OPTFLAGS)
 CFLAGS += $(WARN) $(INCS) $(DEFS)
 #LDLIBS += -pg
+BUILD_DIR=	${WRKSRC}
+TCL_VER         = 8.4
 LDLIBS          = -L$(LOCALBASE)/lib\
                   -L$(X11BASE)/lib\
-                  -ltk83 -ltcl83 -lX11 -lXmu -lm
+                  -ltk84 -ltcl84 -lX11 -lXmu -lm
 
 all :: printconfig
                    -I$(LOCALBASE)/include/tk$(TCL_VER)
-WANT_THREADS    = 1 # uncomment to force process based implementation
-
-PTHREAD         = -pthread
+WANT_THREADS    = 1 # comment out to force process based implementation
 
+ifeq ($(OS), FreeBSD)
+PTHREAD         = $(PTHREAD_LIBS)
+else
+PTHREAD		= -pthread
+endif
 
 ### Common part for all UN*X variants  ###
 
@@ -77,7 +80,7 @@
 endif
 
 # other settings
-OPTFLAGS = -O6 -pipe -g
+OPTFLAGS = -O -pipe -g
 
 # use static libraries for debugging only
 #LDLIBS += -Ldbglib -static
@@ -143,7 +146,7 @@
 	$(ECHO) "   system db dir:                             $(SYS_DBDIR)"
 endif
 ifdef WANT_THREADS
-	$(ECHO) "   Concurrency implementation based on:       threads"
+	$(ECHO) "   Concurrency implementation based on:       threads (using $(PTHREAD))"
 else
 	$(ECHO) "   Concurrency implementation based on:       processes"
 endif




--- tcl2c.c.orig	Tue Sep 23 21:49:35 2003
+++ tcl2c.c	Tue Oct 21 13:14:35 2003
@@ -50,6 +50,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
+#include <time.h>
 #include <errno.h>
 #include <time.h>
 #include <ctype.h>
@@ -429,6 +430,8 @@
     scriptName = malloc(fileNameLen + 1);
     strncpy(outNameC, inFileName, fileNameLen - 4);
     strncpy(outNameH, inFileName, fileNameLen - 4);
+    outNameC[fileNameLen-4]=0;
+    outNameH[fileNameLen-4]=0;
     baseName = (char *)strrchr(inFileName, '/');
     if (baseName != NULL)
     {




--- tvsim/tvsim_main.c.orig	Fri Jul 30 16:37:05 2004
+++ tvsim/tvsim_main.c	Fri Jul 30 17:00:10 2004
@@ -63,6 +63,9 @@
 #include "tvsim/tvsim_gui.h"
 #include "tvsim/tvsim_version.h"
 
+#if defined(__FreeBSD__) || defined(__NetBSD__)
+#include <machine/ioctl_bt848.h>
+#endif
 
 // prior to 8.4 there's a SEGV when evaluating const scripts (Tcl tries to modify the string)
 #if (TCL_MAJOR_VERSION > 8) || ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))
@@ -493,7 +496,6 @@
    }
 
 #else // __NetBSD__ || __FreeBSD__
-   char * pDevName;
    ulong lfreq;
    uint  norm;
    bool result = FALSE;
@@ -505,26 +507,26 @@
    {
       if ( (*pIsTuner) && (lfreq != 0) )
       {
-         if (tuner_fd != -1)
+         if (video_fd != -1)
          {
             // mute audio
             int mute_arg = AUDIO_MUTE;
-            if (ioctl (tuner_fd, BT848_SAUDIO, &mute_arg) == 0)
+            if (ioctl (video_fd, BT848_SAUDIO, &mute_arg) == 0)
             {
                dprintf0("Muted tuner audio.\n");
             }
             else
-               fprintf(stderr, "muting audio (ioctl AUDIO_MUTE)\n", strerror(errno));
+               fprintf(stderr, "muting audio (ioctl AUDIO_MUTE): %s\n", strerror(errno));
 
             // Set the tuner frequency
-            if(ioctl(tuner_fd, VIDIOCSFREQ, &lfreq) == 0)
+            if(ioctl(video_fd, TVTUNER_SETFREQ, &lfreq) == 0)
             {
                dprintf1("Vbi-TuneChannel: set to %.2f\n", (double)freq/16);
 
                result = TRUE;
             }
             else
-               fprintf(stderr, "setting tuner frequency (ioctl VIDIOCSFREQ): \n", strerror(errno));
+               fprintf(stderr, "setting tuner frequency (ioctl TVTUNER_SETFREQ): %s\n", strerror(errno));
          }
       }
    }

Lines 1-7 Link Here

(-)nxtvepg/pkg-plist (-5 / +5 lines)
1	bin/nxtvepg	1	bin/nxtvepg
2	lib/X11/app-defaults/Nxtvepg	2	lib/X11/app-defaults/Nxtvepg
3	%%PORTDOCS%%share/doc/nxtvepg/README	3	%%PORTDOCS%%%%DOCSDIR%%/README
4	%%PORTDOCS%%share/doc/nxtvepg/TODO	4	%%PORTDOCS%%%%DOCSDIR%%/TODO
5	%%PORTDOCS%%share/doc/nxtvepg/CHANGES	5	%%PORTDOCS%%%%DOCSDIR%%/CHANGES
6	%%PORTDOCS%%share/doc/nxtvepg/manual.html	6	%%PORTDOCS%%%%DOCSDIR%%/manual.html
7	@dirrm share/doc/nxtvepg	7	%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 69842

Lines 1-5 Link Here

(-)nxtvepg/files/patch-Makefile (-3 / +12 lines)
1	--- Makefile.orig Thu Oct 9 21:09:22 2003	1	--- Makefile.orig Sun Jul 18 15:00:26 2004
2	+++ Makefile Tue Oct 21 12:57:04 2003	2	+++ Makefile Fri Jul 30 16:34:23 2004
3	@@ -43,12 +43,24 @@	3	@@ -43,12 +43,24 @@
4	include Makefile.bsd	4	include Makefile.bsd
5	else	5	else
Lines 27-33 Link Here
27		27
28	# if you have perl set the path here, else just leave it alone	28	# if you have perl set the path here, else just leave it alone
29	PERL = /usr/bin/perl	29	PERL = /usr/bin/perl
30	@@ -92,10 +104,10 @@	30	@@ -104,10 +116,10 @@
31	# The database directory can be either in the user's $HOME (or relative to any	31	# The database directory can be either in the user's $HOME (or relative to any
32	# other env variable) or at a global place like /var/spool (world-writable)	32	# other env variable) or at a global place like /var/spool (world-writable)
33	# -> uncomment 2 lines below to put the databases in the user's home	33	# -> uncomment 2 lines below to put the databases in the user's home
Lines 41-43 Link Here
41	DEFS += -DEPG_DB_DIR=\"$(SYS_DBDIR)\"	41	DEFS += -DEPG_DB_DIR=\"$(SYS_DBDIR)\"
42	INST_DB_DIR = $(ROOT)$(SYS_DBDIR)	42	INST_DB_DIR = $(ROOT)$(SYS_DBDIR)
43	INST_DB_PERM = 0777	43	INST_DB_PERM = 0777
		44	@@ -121,7 +133,7 @@
		45	CFLAGS += $(WARN) $(INCS) $(DEFS)
		46	#LDLIBS += -pg
		47
		48	-BUILD_DIR = build-$(shell uname -m \| sed -e 's/i.86/i386/' -e 's/ppc/powerpc/')
		49	+BUILD_DIR ?= build-$(shell uname -m \| sed -e 's/i.86/i386/' -e 's/ppc/powerpc/')
		50	INCS += -I$(BUILD_DIR)
		51
		52	# end Linux specific part

Lines 1-46 Link Here

(-)nxtvepg/files/patch-Makefile.bsd (-44 / +8 lines)
1	--- Makefile.bsd.orig Mon Apr 21 00:10:22 2003	1	--- Makefile.bsd.orig Fri Jul 30 16:35:54 2004
2	+++ Makefile.bsd Tue Oct 21 15:10:24 2003	2	+++ Makefile.bsd Fri Jul 30 16:36:04 2004
3	@@ -46,17 +46,20 @@	3	@@ -127,6 +127,7 @@
4	# other settings	4	CFLAGS ?= $(OPTFLAGS)
5	# On FreeBSD there is only a modified tclsh with a message to launch	5	CFLAGS += $(WARN) $(INCS) $(DEFS)
6	# tclsh8.3 or tclsh8.4 , so this is hardcoded here	6	#LDLIBS += -pg
7	-TCL_VER = 8.3	7	+BUILD_DIR= ${WRKSRC}
8	+TCL_VER = 8.4
9	LDLIBS = -L$(LOCALBASE)/lib\
10	-L$(X11BASE)/lib\
11	- -ltk83 -ltcl83 -lX11 -lXmu -lm
12	+ -ltk84 -ltcl84 -lX11 -lXmu -lm
13		8
14	INCS += -I$(LOCALBASE)/include/tcl$(TCL_VER)\	9	all :: printconfig
15	-I$(LOCALBASE)/include/tk$(TCL_VER)
16	-WANT_THREADS = 1 # uncomment to force process based implementation
17	-
18	-PTHREAD = -pthread
19	+WANT_THREADS = 1 # comment out to force process based implementation
20		10
21	+ifeq ($(OS), FreeBSD)
22	+PTHREAD = $(PTHREAD_LIBS)
23	+else
24	+PTHREAD = -pthread
25	+endif
26
27	### Common part for all UN*X variants ###
28
29	@@ -77,7 +80,7 @@
30	endif
31
32	# other settings
33	-OPTFLAGS = -O6 -pipe -g
34	+OPTFLAGS = -O -pipe -g
35
36	# use static libraries for debugging only
37	#LDLIBS += -Ldbglib -static
38	@@ -143,7 +146,7 @@
39	$(ECHO) " system db dir: $(SYS_DBDIR)"
40	endif
41	ifdef WANT_THREADS
42	- $(ECHO) " Concurrency implementation based on: threads"
43	+ $(ECHO) " Concurrency implementation based on: threads (using $(PTHREAD))"
44	else
45	$(ECHO) " Concurrency implementation based on: processes"
46	endif

Lines 1-19 Link Here

(-)nxtvepg/files/patch-tcl2c.c (-19 lines)
1	--- tcl2c.c.orig Tue Sep 23 21:49:35 2003
2	+++ tcl2c.c Tue Oct 21 13:14:35 2003
3	@@ -50,6 +50,7 @@
4	#include <stdlib.h>
5	#include <string.h>
6	#include <stdio.h>
7	+#include <time.h>
8	#include <errno.h>
9	#include <time.h>
10	#include <ctype.h>
11	@@ -429,6 +430,8 @@
12	scriptName = malloc(fileNameLen + 1);
13	strncpy(outNameC, inFileName, fileNameLen - 4);
14	strncpy(outNameH, inFileName, fileNameLen - 4);
15	+ outNameC[fileNameLen-4]=0;
16	+ outNameH[fileNameLen-4]=0;
17	baseName = (char *)strrchr(inFileName, '/');
18	if (baseName != NULL)
19	{

Line 0 Link Here

(-)nxtvepg/files/patch-tvsim::tvsim_main.c (+52 lines)
	1	--- tvsim/tvsim_main.c.orig Fri Jul 30 16:37:05 2004
	2	+++ tvsim/tvsim_main.c Fri Jul 30 17:00:10 2004
	3	@@ -63,6 +63,9 @@
	4	#include "tvsim/tvsim_gui.h"
	5	#include "tvsim/tvsim_version.h"
	6
	7	+#if defined(__FreeBSD__) \|\| defined(__NetBSD__)
	8	+#include <machine/ioctl_bt848.h>
	9	+#endif
	10
	11	// prior to 8.4 there's a SEGV when evaluating const scripts (Tcl tries to modify the string)
	12	#if (TCL_MAJOR_VERSION > 8) \|\| ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))
	13	@@ -493,7 +496,6 @@
	14	}
	15
	16	#else // __NetBSD__ \|\| __FreeBSD__
	17	- char * pDevName;
	18	ulong lfreq;
	19	uint norm;
	20	bool result = FALSE;
	21	@@ -505,26 +507,26 @@
	22	{
	23	if ( (*pIsTuner) && (lfreq != 0) )
	24	{
	25	- if (tuner_fd != -1)
	26	+ if (video_fd != -1)
	27	{
	28	// mute audio
	29	int mute_arg = AUDIO_MUTE;
	30	- if (ioctl (tuner_fd, BT848_SAUDIO, &mute_arg) == 0)
	31	+ if (ioctl (video_fd, BT848_SAUDIO, &mute_arg) == 0)
	32	{
	33	dprintf0("Muted tuner audio.\n");
	34	}
	35	else
	36	- fprintf(stderr, "muting audio (ioctl AUDIO_MUTE)\n", strerror(errno));
	37	+ fprintf(stderr, "muting audio (ioctl AUDIO_MUTE): %s\n", strerror(errno));
	38
	39	// Set the tuner frequency
	40	- if(ioctl(tuner_fd, VIDIOCSFREQ, &lfreq) == 0)
	41	+ if(ioctl(video_fd, TVTUNER_SETFREQ, &lfreq) == 0)
	42	{
	43	dprintf1("Vbi-TuneChannel: set to %.2f\n", (double)freq/16);
	44
	45	result = TRUE;
	46	}
	47	else
	48	- fprintf(stderr, "setting tuner frequency (ioctl VIDIOCSFREQ): \n", strerror(errno));
	49	+ fprintf(stderr, "setting tuner frequency (ioctl TVTUNER_SETFREQ): %s\n", strerror(errno));
	50	}
	51	}
	52	}