Date: Sat, 31 Jul 2004 13:29:26 +0200 (CEST) From: Simon Barner <barner@in.tum.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/69842: multimedia/nxtvepg: maintainer update to 2.7.1 Message-ID: <20040731112926.0E6833F20@zi025.glhnet.mhn.de> Resent-Message-ID: <200407311130.i6VBUOdP007210@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 69842
>Category: ports
>Synopsis: multimedia/nxtvepg: maintainer update to 2.7.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Jul 31 11:30:24 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Simon Barner
>Release: FreeBSD 5.2.1-RELEASE-p5 i386
>Organization:
>Environment:
System: FreeBSD zi025.glhnet.mhn.de 5.2.1-RELEASE-p5 FreeBSD 5.2.1-RELEASE-p5 #0: Sat Apr 17 12:06:11 CEST 2004 toor@zi025.glhnet.mhn.de:/usr/src/sys/i386/compile/KISTE i386
>Description:
- Update to 2.7.1
- Fix build with WRKDIRPREFIX
- use %%DOCSDIR%%
>How-To-Repeat:
N/A
>Fix:
--- nxtvepg.diff begins here ---
diff -ruN nxtvepg.orig/Makefile nxtvepg/Makefile
--- nxtvepg.orig/Makefile Fri Jul 30 16:17:55 2004
+++ nxtvepg/Makefile Fri Jul 30 17:14:19 2004
@@ -6,8 +6,7 @@
#
PORTNAME= nxtvepg
-PORTVERSION= 2.6.0
-PORTREVISION= 1
+PORTVERSION= 2.7.1
CATEGORIES= multimedia tcl84 tk84
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=${PORTNAME}
@@ -20,7 +19,7 @@
USE_GMAKE= yes
USE_XLIB= yes
USE_X_PREFIX= yes
-MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS}
+MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} WRKSRC=${WRKSRC}
MAN1= nxtvepg.1
MYPORTDOCS= README TODO CHANGES manual.html
diff -ruN nxtvepg.orig/distinfo nxtvepg/distinfo
--- nxtvepg.orig/distinfo Fri Jul 30 16:17:55 2004
+++ nxtvepg/distinfo Fri Jul 30 16:19:43 2004
@@ -1,2 +1,2 @@
-MD5 (nxtvepg-2.6.0.tar.gz) = 9d7efd6b19f95274c002f19b92bcd9da
-SIZE (nxtvepg-2.6.0.tar.gz) = 1129008
+MD5 (nxtvepg-2.7.1.tar.gz) = 7625d7e9d4a57ab58277e7edb073f931
+SIZE (nxtvepg-2.7.1.tar.gz) = 1217393
diff -ruN nxtvepg.orig/files/patch-Makefile nxtvepg/files/patch-Makefile
--- nxtvepg.orig/files/patch-Makefile Fri Jul 30 16:17:55 2004
+++ nxtvepg/files/patch-Makefile Fri Jul 30 16:35:14 2004
@@ -1,5 +1,5 @@
---- Makefile.orig Thu Oct 9 21:09:22 2003
-+++ Makefile Tue Oct 21 12:57:04 2003
+--- 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
@@ -27,7 +27,7 @@
# if you have perl set the path here, else just leave it alone
PERL = /usr/bin/perl
-@@ -92,10 +104,10 @@
+@@ -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
@@ -41,3 +41,12 @@
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
diff -ruN nxtvepg.orig/files/patch-Makefile.bsd nxtvepg/files/patch-Makefile.bsd
--- nxtvepg.orig/files/patch-Makefile.bsd Fri Jul 30 16:17:55 2004
+++ nxtvepg/files/patch-Makefile.bsd Fri Jul 30 16:36:16 2004
@@ -1,46 +1,10 @@
---- Makefile.bsd.orig Mon Apr 21 00:10:22 2003
-+++ Makefile.bsd Tue Oct 21 15:10:24 2003
-@@ -46,17 +46,20 @@
- # other settings
- # On FreeBSD there is only a modified tclsh with a message to launch
- # tclsh8.3 or tclsh8.4 , so this is hardcoded here
--TCL_VER = 8.3
-+TCL_VER = 8.4
- LDLIBS = -L$(LOCALBASE)/lib\
- -L$(X11BASE)/lib\
-- -ltk83 -ltcl83 -lX11 -lXmu -lm
-+ -ltk84 -ltcl84 -lX11 -lXmu -lm
+--- 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}
- INCS += -I$(LOCALBASE)/include/tcl$(TCL_VER)\
- -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
+ all :: printconfig
-+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
diff -ruN nxtvepg.orig/files/patch-tcl2c.c nxtvepg/files/patch-tcl2c.c
--- nxtvepg.orig/files/patch-tcl2c.c Fri Jul 30 16:17:55 2004
+++ nxtvepg/files/patch-tcl2c.c Thu Jan 1 01:00:00 1970
@@ -1,19 +0,0 @@
---- 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)
- {
diff -ruN nxtvepg.orig/files/patch-tvsim::tvsim_main.c nxtvepg/files/patch-tvsim::tvsim_main.c
--- nxtvepg.orig/files/patch-tvsim::tvsim_main.c Thu Jan 1 01:00:00 1970
+++ nxtvepg/files/patch-tvsim::tvsim_main.c Fri Jul 30 17:06:05 2004
@@ -0,0 +1,52 @@
+--- 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));
+ }
+ }
+ }
diff -ruN nxtvepg.orig/pkg-plist nxtvepg/pkg-plist
--- nxtvepg.orig/pkg-plist Fri Jul 30 16:17:55 2004
+++ nxtvepg/pkg-plist Sat Jul 31 13:18:42 2004
@@ -1,7 +1,7 @@
bin/nxtvepg
lib/X11/app-defaults/Nxtvepg
-%%PORTDOCS%%share/doc/nxtvepg/README
-%%PORTDOCS%%share/doc/nxtvepg/TODO
-%%PORTDOCS%%share/doc/nxtvepg/CHANGES
-%%PORTDOCS%%share/doc/nxtvepg/manual.html
-@dirrm share/doc/nxtvepg
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/manual.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- nxtvepg.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040731112926.0E6833F20>