Update to 3.76

PR:		ports/41037
Submitted by:	maintainer

5 files changed, 20 insertions, 84 deletions

diff --git a/multimedia/xawtv/files/patch-common::Subdir.mk b/multimedia/xawtv/files/patch-common::Subdir.mk
new file mode 100644
index 0000000..a781967
--- /dev/null
+++ b/multimedia/xawtv/files/patch-common::Subdir.mk
@@ -0,0 +1,11 @@
+--- common/Subdir.mk.orig	Sat Jul 27 10:24:27 2002
++++ common/Subdir.mk	Sat Jul 27 10:22:47 2002
+@@ -16,7 +16,7 @@
+ 	common/midictrl.o
+ 
+ # RegEdit.c is good old K&R ...
+-common/RegEdit.o : CFLAGS += -Wno-missing-prototypes -Wno-strict-prototypes
++#common/RegEdit.o : CFLAGS += -Wno-missing-prototypes -Wno-strict-prototypes
+ 
+ common/channel-no-x11.o:: common/channel.c
+ 	$(CC) $(CFLAGS) -DNO_X11=1 -Wp,-MD,$*.dep -c -o $@ $<
diff --git a/multimedia/xawtv/files/patch-configure b/multimedia/xawtv/files/patch-configure
index 34e560b..cdbe16a 100644
--- a/multimedia/xawtv/files/patch-configure
+++ b/multimedia/xawtv/files/patch-configure
@@ -1,46 +1,21 @@
---- configure.orig	Thu Jun 20 10:08:52 2002
-+++ configure	Sat Jun 22 16:54:00 2002
-@@ -2028,7 +2028,7 @@
- 	OpenBSD | FreeBSD | NetBSD)
- 		# *BSD has important stuff (from ports)
- 		# in /usr/local ...
--		CFLAGS="$CFLAGS -I/usr/local/include -L/usr/local/lib"
-+		CFLAGS="-I%%LOCALBASE%%/include -L%%LOCALBASE%%/lib"
- 		FOUND_OS="bsd"
- 		;;
- 	*)
-@@ -2591,10 +2591,10 @@
- /usr/XFree86/include/X11
- 
- /usr/include
--/usr/local/include
-+%%LOCALBASE%%/include
- /usr/unsupported/include
- /usr/athena/include
--/usr/local/x11r5/include
-+%%LOCALBASE%%/x11r5/include
- /usr/lpp/Xamples/include
- 
- /usr/openwin/include
-@@ -4442,19 +4442,13 @@
- 
- echo "$as_me:4443: checking for X11 config directory" >&5
+--- configure.orig	Wed Jul 24 19:13:38 2002
++++ configure	Sat Jul 27 10:05:07 2002
+@@ -4460,18 +4460,12 @@
+ echo "$as_me:4460: checking for X11 config directory" >&5
  echo $ECHO_N "checking for X11 config directory... $ECHO_C" >&6
--x11conf=/usr/X11R6/lib/X11
+ x11conf=/usr/X11R6/lib/X11
 -if test -d /etc/X11; then
 -	x11conf=/etc/X11
 -fi
-+x11conf=%%X11BASE%%/lib/X11
- echo "$as_me:4449: result: $x11conf" >&5
+ echo "$as_me:4466: result: $x11conf" >&5
  echo "${ECHO_T}$x11conf" >&6
  
- echo "$as_me:4452: checking for X11 app-defaults directory" >&5
+ echo "$as_me:4469: checking for X11 app-defaults directory" >&5
  echo $ECHO_N "checking for X11 app-defaults directory... $ECHO_C" >&6
--resdir=/usr/X11R6/lib/X11
+ resdir=/usr/X11R6/lib/X11
 -if test -d /etc/X11/app-defaults; then
 -	resdir=/etc/X11
 -fi
-+resdir=%%X11BASE%%/lib/X11
- echo "$as_me:4458: result: $resdir/app-defaults" >&5
+ echo "$as_me:4475: result: $resdir/app-defaults" >&5
  echo "${ECHO_T}$resdir/app-defaults" >&6
  
diff --git a/multimedia/xawtv/files/patch-console::Subdir.mk b/multimedia/xawtv/files/patch-console::Subdir.mk
deleted file mode 100644
index 891683a..0000000
--- a/multimedia/xawtv/files/patch-console::Subdir.mk
+++ /dev/null
@@ -1,19 +0,0 @@
---- console/Subdir.mk.orig	Sat Jun 22 17:04:53 2002
-+++ console/Subdir.mk	Sat Jun 22 17:05:30 2002
-@@ -65,11 +65,11 @@
- # libraries to link
- console/fbtv     : LDLIBS  := \
- 	$(THREAD_LIBS) $(CURSES_LIBS) $(LIRC_LIBS) $(ALSA_LIBS) \
--	$(FS_LIBS) -ljpeg -lm
--console/ttv      : LDLIBS  := $(THREAD_LIBS) $(AA_LIBS) -ljpeg -lm
--console/scantv   : LDLIBS  := $(THREAD_LIBS) $(VBI_LIBS) -ljpeg
--console/streamer : LDLIBS  := $(THREAD_LIBS) -ljpeg -lm
--console/webcam   : LDLIBS  := $(THREAD_LIBS) -ljpeg
-+	$(FS_LIBS) -L%%LOCALBASE%%/lib -ljpeg -lm
-+console/ttv      : LDLIBS  := $(THREAD_LIBS) $(AA_LIBS) -L%%LOCALBASE%%/lib -ljpeg -lm
-+console/scantv   : LDLIBS  := $(THREAD_LIBS) $(VBI_LIBS) -L%%LOCALBASE%%/lib -ljpeg
-+console/streamer : LDLIBS  := $(THREAD_LIBS) -L%%LOCALBASE%%/lib -ljpeg -lm
-+console/webcam   : LDLIBS  := $(THREAD_LIBS) -L%%LOCALBASE%%/lib -ljpeg
- console/radio    : LDLIBS  := $(CURSES_LIBS)
- console/record   : LDLIBS  := $(CURSES_LIBS)
- console/v4l-conf : LDLIBS  := $(ATHENA_LIBS)
diff --git a/multimedia/xawtv/files/patch-debug::Subdir.mk b/multimedia/xawtv/files/patch-debug::Subdir.mk
deleted file mode 100644
index 542ea9b..0000000
--- a/multimedia/xawtv/files/patch-debug::Subdir.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- debug/Subdir.mk.orig	Mon Jun 24 02:12:21 2002
-+++ debug/Subdir.mk	Mon Jun 24 02:12:46 2002
-@@ -22,8 +22,8 @@
- 
- debug/xvideo: debug/xvideo.o
- 
--debug/gl     : LDLIBS  := $(THREADLIB) $(MOTIF_LIBS) -lGLU -lGL -ljpeg -lm
--debug/hwscan : LDLIBS  := $(ALSA_LIBS) -ljpeg
-+debug/gl     : LDLIBS  := $(THREADLIB) $(MOTIF_LIBS) -L%%LOCALBASE%%/lib -lGLU -lGL -ljpeg -lm
-+debug/hwscan : LDLIBS  := $(ALSA_LIBS) -L%%LOCALBASE%%/lib -ljpeg
- debug/xvideo : LDLIBS  := $(ATHENA_LIBS)
- 
- debug/gl     : LDFLAGS := $(DLFLAGS)
diff --git a/multimedia/xawtv/files/patch-x11::Subdir.mk b/multimedia/xawtv/files/patch-x11::Subdir.mk
deleted file mode 100644
index f1b3ad5..0000000
--- a/multimedia/xawtv/files/patch-x11::Subdir.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- x11/Subdir.mk.orig	Sat Jun 22 17:13:04 2002
-+++ x11/Subdir.mk	Sat Jun 22 17:13:43 2002
-@@ -83,12 +83,12 @@
- # libraries to link
- x11/xawtv        : LDLIBS  := \
- 	$(THREAD_LIBS) $(CURSES_LIBS) $(LIRC_LIBS) $(ALSA_LIBS) \
--	$(ATHENA_LIBS) $(VBI_LIBS) -ljpeg -lm
-+	$(ATHENA_LIBS) $(VBI_LIBS) -L%%LOCALBASE%%/lib -ljpeg -lm
- x11/motv         : LDLIBS  := \
- 	$(THREAD_LIBS) $(CURSES_LIBS) $(LIRC_LIBS) $(ALSA_LIBS) \
--	$(MOTIF_LIBS) $(VBI_LIBS) -ljpeg -lm
-+	$(MOTIF_LIBS) $(VBI_LIBS) -L%%LOCALBASE%%/lib -ljpeg -lm
- x11/mtt          : LDLIBS  := $(THREAD_LIBS) $(MOTIF_LIBS) $(VBI_LIBS)
--x11/v4lctl       : LDLIBS  := $(THREAD_LIBS) $(ATHENA_LIBS) -ljpeg -lm
-+x11/v4lctl       : LDLIBS  := $(THREAD_LIBS) $(ATHENA_LIBS) -L%%LOCALBASE%%/lib -ljpeg -lm
- x11/rootv        : LDLIBS  := $(ATHENA_LIBS)
- x11/xawtv-remote : LDLIBS  := $(ATHENA_LIBS)
- x11/propwatch    : LDLIBS  := $(ATHENA_LIBS)