From 879e57e564e9f6d4d652e7494a8e0b79562842a2 Mon Sep 17 00:00:00 2001
From: FUJISHIMA Satsuki <sf@FreeBSD.org>
Date: Mon, 12 Mar 2001 22:49:21 +0000
Subject: update to 1.03.
PR: 25646
Submitted by: John Saunders <john@nlc.net.au>
(Non-response from maintainer)
---
multimedia/fxtv/Makefile | 5 +----
multimedia/fxtv/distinfo | 2 +-
multimedia/fxtv/files/patch-aa | 16 ----------------
multimedia/fxtv/files/patch-ab | 31 +++++--------------------------
multimedia/fxtv/files/patch-ac | 8 ++++----
multimedia/fxtv/files/patch-ad | 20 --------------------
6 files changed, 11 insertions(+), 71 deletions(-)
delete mode 100644 multimedia/fxtv/files/patch-aa
delete mode 100644 multimedia/fxtv/files/patch-ad
(limited to 'multimedia/fxtv')
diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile
index c018f77dca57..8194944b2048 100644
--- a/multimedia/fxtv/Makefile
+++ b/multimedia/fxtv/Makefile
@@ -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
diff --git a/multimedia/fxtv/distinfo b/multimedia/fxtv/distinfo
index 4ae5db161860..aad3a41d0dfa 100644
--- a/multimedia/fxtv/distinfo
+++ b/multimedia/fxtv/distinfo
@@ -1 +1 @@
-MD5 (fxtv-1.02.tgz) = cc5c464a8585ddeee20c1c70e3122573
+MD5 (fxtv-1.03.tgz) = 2497c0eba13b475d2ca5abf362ffa52b
diff --git a/multimedia/fxtv/files/patch-aa b/multimedia/fxtv/files/patch-aa
deleted file mode 100644
index 364d099bfb93..000000000000
--- a/multimedia/fxtv/files/patch-aa
+++ /dev/null
@@ -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;
diff --git a/multimedia/fxtv/files/patch-ab b/multimedia/fxtv/files/patch-ab
index d3fa7e282669..e93539ed64f2 100644
--- a/multimedia/fxtv/files/patch-ab
+++ b/multimedia/fxtv/files/patch-ab
@@ -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)
diff --git a/multimedia/fxtv/files/patch-ac b/multimedia/fxtv/files/patch-ac
index 2c9d4a828154..393b25bf1dc1 100644
--- a/multimedia/fxtv/files/patch-ac
+++ b/multimedia/fxtv/files/patch-ac
@@ -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)
diff --git a/multimedia/fxtv/files/patch-ad b/multimedia/fxtv/files/patch-ad
deleted file mode 100644
index 35007908089c..000000000000
--- a/multimedia/fxtv/files/patch-ad
+++ /dev/null
@@ -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"
--
cgit debian/1.2.3+git2.25.1-1-2-gaceb0