1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00

update to 1.03.

PR:		25646
Submitted by:	John Saunders <john@nlc.net.au>
(Non-response from maintainer)
This commit is contained in:
FUJISHIMA Satsuki 2001-03-12 22:49:21 +00:00
parent 8a738c0aa7
commit 879e57e564
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=39700
12 changed files with 22 additions and 142 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= fxtv
PORTVERSION= 1.02
PORTVERSION= 1.03
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= rhh
@ -31,9 +31,6 @@ USE_GMAKE= yes
MAKE_FLAGS= -e
MAN1= fxtv.1
post-extract:
${RM} ${WRKSRC}/videolib/*.o
pre-install:
${CP} ${WRKSRC}/fxtv.1 ${WRKSRC}/fxtv.man

View File

@ -1 +1 @@
MD5 (fxtv-1.02.tgz) = cc5c464a8585ddeee20c1c70e3122573
MD5 (fxtv-1.03.tgz) = 2497c0eba13b475d2ca5abf362ffa52b

View File

@ -1,16 +0,0 @@
--- tvaudio.c-orig Sat Oct 16 19:29:16 1999
+++ tvaudio.c Mon Jul 31 19:23:57 2000
@@ -104,6 +104,13 @@
Mixer_dev_mask = SOUND_MASK_MIC;
Mixer_dev_name = "LINE";
}
+#ifdef SOUND_MIXER_VIDEO
+ else if ( STREQ( buf, "VIDEO" ) ) {
+ Mixer_dev_id = SOUND_MIXER_VIDEO;
+ Mixer_dev_mask = SOUND_MASK_VIDEO;
+ Mixer_dev_name = "VIDEO";
+ }
+#endif
else {
Mixer_dev_id = SOUND_MIXER_LINE;
Mixer_dev_mask = SOUND_MASK_LINE;

View File

@ -1,32 +1,11 @@
--- Makefile.orig Thu Nov 4 18:43:51 1999
+++ Makefile Sun Aug 6 19:19:54 2000
@@ -3,16 +3,17 @@
#
HAVE_XFREE86 = YES
-X11BASE = /usr/X11R6
+X11BASE ?= /usr/X11R6
+LOCALBASE ?= /usr/local
DEBUG = NO
OS = $(shell uname -s)
OS_MAJOR = $(shell uname -r | cut -f1 -d\.)
override CF_VERS = -DVERS_STR=\"1.02\"
override VIDEOLIB_DIR = ./videolib
-override INC = -I$(X11BASE)/include -I/usr/local/include \
+override INC = -I$(X11BASE)/include -I$(LOCALBASE)/include \
-I$(VIDEOLIB_DIR) -I.
-override LIBDIRS = $(X11BASE)/lib /usr/local/lib
+override LIBDIRS = $(X11BASE)/lib $(LOCALBASE)/lib
override SHELL = /bin/sh
#
@@ -45,7 +46,7 @@
--- Makefile.orig Tue Feb 13 09:08:59 2001
+++ Makefile Sat Mar 10 17:36:25 2001
@@ -62,7 +62,7 @@
ifneq ($(DEBUG),NO)
override CFLAGS = -DDEBUG -g
else
- override CFLAGS = -O2 -m486
+ override CFLAGS = #-O2 -m486
- override CFLAGS = -DNDEBUG -O2
+ override CFLAGS += -DNDEBUG #-O2
endif
C_WARN_FLAG = -Wall
override CFLAGS += $(C_WARN_FLAG) $(INC) $(CF_VERS)

View File

@ -1,11 +1,11 @@
--- videolib/Makefile.orig Sun Aug 6 19:24:57 2000
+++ videolib/Makefile Sun Aug 6 19:25:09 2000
--- videolib/Makefile.orig Tue Feb 13 06:04:45 2001
+++ videolib/Makefile Sat Mar 10 17:39:59 2001
@@ -15,7 +15,7 @@
ifneq ($(DEBUG),NO)
override CFLAGS = -DDEBUG -g
else
- override CFLAGS = -DNDEBUG -O2 -m486
+ override CFLAGS = -DNDEBUG #-O2 -m486
- override CFLAGS = -DNDEBUG -O2
+ override CFLAGS += -DNDEBUG #-O2
endif
C_WARN_FLAG = -Wall
override CFLAGS += $(C_WARN_FLAG) $(INC)

View File

@ -1,20 +0,0 @@
--- remote.c.orig Sun Dec 10 14:02:55 2000
+++ remote.c Sun Dec 10 14:06:22 2000
@@ -45,7 +45,16 @@
#include <sys/time.h>
#include <sys/socket.h>
#include <sys/un.h>
-#include <machine/mouse.h>
+#ifdef __FreeBSD__
+# include <sys/param.h>
+# if __FreeBSD_version >= 500013
+# include <sys/mouse.h>
+# else
+# include <machine/mouse.h>
+# endif
+#else
+# include <machine/mouse.h>
+#endif
#include <X11/Intrinsic.h>
#include "tvdebug.h"
#include "tvutil.h"

View File

@ -6,7 +6,7 @@
#
PORTNAME= fxtv
PORTVERSION= 1.02
PORTVERSION= 1.03
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= rhh
@ -31,9 +31,6 @@ USE_GMAKE= yes
MAKE_FLAGS= -e
MAN1= fxtv.1
post-extract:
${RM} ${WRKSRC}/videolib/*.o
pre-install:
${CP} ${WRKSRC}/fxtv.1 ${WRKSRC}/fxtv.man

View File

@ -1 +1 @@
MD5 (fxtv-1.02.tgz) = cc5c464a8585ddeee20c1c70e3122573
MD5 (fxtv-1.03.tgz) = 2497c0eba13b475d2ca5abf362ffa52b

View File

@ -1,16 +0,0 @@
--- tvaudio.c-orig Sat Oct 16 19:29:16 1999
+++ tvaudio.c Mon Jul 31 19:23:57 2000
@@ -104,6 +104,13 @@
Mixer_dev_mask = SOUND_MASK_MIC;
Mixer_dev_name = "LINE";
}
+#ifdef SOUND_MIXER_VIDEO
+ else if ( STREQ( buf, "VIDEO" ) ) {
+ Mixer_dev_id = SOUND_MIXER_VIDEO;
+ Mixer_dev_mask = SOUND_MASK_VIDEO;
+ Mixer_dev_name = "VIDEO";
+ }
+#endif
else {
Mixer_dev_id = SOUND_MIXER_LINE;
Mixer_dev_mask = SOUND_MASK_LINE;

View File

@ -1,32 +1,11 @@
--- Makefile.orig Thu Nov 4 18:43:51 1999
+++ Makefile Sun Aug 6 19:19:54 2000
@@ -3,16 +3,17 @@
#
HAVE_XFREE86 = YES
-X11BASE = /usr/X11R6
+X11BASE ?= /usr/X11R6
+LOCALBASE ?= /usr/local
DEBUG = NO
OS = $(shell uname -s)
OS_MAJOR = $(shell uname -r | cut -f1 -d\.)
override CF_VERS = -DVERS_STR=\"1.02\"
override VIDEOLIB_DIR = ./videolib
-override INC = -I$(X11BASE)/include -I/usr/local/include \
+override INC = -I$(X11BASE)/include -I$(LOCALBASE)/include \
-I$(VIDEOLIB_DIR) -I.
-override LIBDIRS = $(X11BASE)/lib /usr/local/lib
+override LIBDIRS = $(X11BASE)/lib $(LOCALBASE)/lib
override SHELL = /bin/sh
#
@@ -45,7 +46,7 @@
--- Makefile.orig Tue Feb 13 09:08:59 2001
+++ Makefile Sat Mar 10 17:36:25 2001
@@ -62,7 +62,7 @@
ifneq ($(DEBUG),NO)
override CFLAGS = -DDEBUG -g
else
- override CFLAGS = -O2 -m486
+ override CFLAGS = #-O2 -m486
- override CFLAGS = -DNDEBUG -O2
+ override CFLAGS += -DNDEBUG #-O2
endif
C_WARN_FLAG = -Wall
override CFLAGS += $(C_WARN_FLAG) $(INC) $(CF_VERS)

View File

@ -1,11 +1,11 @@
--- videolib/Makefile.orig Sun Aug 6 19:24:57 2000
+++ videolib/Makefile Sun Aug 6 19:25:09 2000
--- videolib/Makefile.orig Tue Feb 13 06:04:45 2001
+++ videolib/Makefile Sat Mar 10 17:39:59 2001
@@ -15,7 +15,7 @@
ifneq ($(DEBUG),NO)
override CFLAGS = -DDEBUG -g
else
- override CFLAGS = -DNDEBUG -O2 -m486
+ override CFLAGS = -DNDEBUG #-O2 -m486
- override CFLAGS = -DNDEBUG -O2
+ override CFLAGS += -DNDEBUG #-O2
endif
C_WARN_FLAG = -Wall
override CFLAGS += $(C_WARN_FLAG) $(INC)

View File

@ -1,20 +0,0 @@
--- remote.c.orig Sun Dec 10 14:02:55 2000
+++ remote.c Sun Dec 10 14:06:22 2000
@@ -45,7 +45,16 @@
#include <sys/time.h>
#include <sys/socket.h>
#include <sys/un.h>
-#include <machine/mouse.h>
+#ifdef __FreeBSD__
+# include <sys/param.h>
+# if __FreeBSD_version >= 500013
+# include <sys/mouse.h>
+# else
+# include <machine/mouse.h>
+# endif
+#else
+# include <machine/mouse.h>
+#endif
#include <X11/Intrinsic.h>
#include "tvdebug.h"
#include "tvutil.h"