Date: Mon, 12 Mar 2001 14:10:02 -0800 (PST) From: John Saunders <john@nlc.net.au> To: freebsd-ports@FreeBSD.org Subject: Re: ports/25646: Port update fxtv to version 1.03 Message-ID: <200103122210.f2CMA2w13227@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/25646; it has been noted by GNATS.
From: John Saunders <john@nlc.net.au>
To: FUJISHIMA Satsuki <sf@FreeBSD.org>
Cc: FreeBSD-gnats-submit@freebsd.org
Subject: Re: ports/25646: Port update fxtv to version 1.03
Date: Tue, 13 Mar 2001 09:02:19 +1100 (EST)
On Sun, 11 Mar 2001, FUJISHIMA Satsuki wrote:
> Please submit diff against ports-current.
Done. Please delete files files/patch-aa and files/patch-ab after applying
patch.
> And, did you contact maintainer about this update?
Yes, no response to emails so far.
Regards.
diff -ruN fxtv.bak/Makefile fxtv/Makefile
--- fxtv.bak/Makefile Sun Jan 28 13:25:44 2001
+++ fxtv/Makefile Sat Mar 10 17:41:27 2001
@@ -6,7 +6,7 @@
#
PORTNAME= fxtv
-PORTVERSION= 1.02
+PORTVERSION= 1.03
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= rhh
@@ -30,9 +30,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 -ruN fxtv.bak/distinfo fxtv/distinfo
--- fxtv.bak/distinfo Fri Nov 12 21:08:39 1999
+++ fxtv/distinfo Sat Mar 10 17:32:28 2001
@@ -1 +1 @@
-MD5 (fxtv-1.02.tgz) = cc5c464a8585ddeee20c1c70e3122573
+MD5 (fxtv-1.03.tgz) = 2497c0eba13b475d2ca5abf362ffa52b
diff -ruN fxtv.bak/files/patch-aa fxtv/files/patch-aa
--- fxtv.bak/files/patch-aa Tue Aug 1 19:20:47 2000
+++ fxtv/files/patch-aa Thu Jan 1 10:00:00 1970
@@ -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 -ruN fxtv.bak/files/patch-ab fxtv/files/patch-ab
--- fxtv.bak/files/patch-ab Tue Aug 8 12:55:15 2000
+++ fxtv/files/patch-ab Sat Mar 10 17:54:07 2001
@@ -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 -ruN fxtv.bak/files/patch-ac fxtv/files/patch-ac
--- fxtv.bak/files/patch-ac Tue Aug 8 12:55:15 2000
+++ fxtv/files/patch-ac Sat Mar 10 17:54:15 2001
@@ -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 -ruN fxtv.bak/files/patch-ad fxtv/files/patch-ad
--- fxtv.bak/files/patch-ad Mon Dec 11 13:25:33 2000
+++ fxtv/files/patch-ad Thu Jan 1 10:00:00 1970
@@ -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"
-- +------------------------------------------------------------+
. | John Saunders - mailto:john@nlc.net.au (EMail) |
,--_|\ | - http://www.nlc.net.au/ (WWW) |
/ Oz \ | - 1300-720-122 or 04-1822-3814 (Phone) |
\_,--\_/ | NORTHLINK COMMUNICATIONS P/L - Supplying a professional, |
v | and above all friendly, internet connection service. |
+------------------------------------------------------------+
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200103122210.f2CMA2w13227>