Update port to version 3.67, which fixes all known problems on 5.0.

Hand maintainership to Oliver Lehmann <lehmann@ans-netz.de>, since
greid doesn't seem to be interested in this port any more (various
feedback timeouts and mails from him indicate this)

PR:		31691, 32673, 32802, 33894
Submitted by:	Oliver Lehmann <lehmann@ans-netz.de>
Approved by:	greid (MAINTAINER) (de-facto approved)

5 files changed, 91 insertions, 7 deletions

diff --git a/multimedia/xawtv/files/patch-configure b/multimedia/xawtv/files/patch-configure
new file mode 100644
index 0000000..6029fe4
--- /dev/null
+++ b/multimedia/xawtv/files/patch-configure
@@ -0,0 +1,24 @@
+--- configure.orig	Mon Jan 14 20:33:50 2002
++++ configure	Mon Jan 14 20:35:51 2002
+@@ -2914,19 +2914,13 @@
+ 
+ echo $ac_n "checking for X11 config directory""... $ac_c" 1>&6
+ echo "configure:2917: checking for X11 config directory" >&5
+-x11conf=/usr/X11R6/lib/X11
+-if test -d /etc/X11; then
+-	x11conf=/etc/X11
+-fi
++x11conf=%%X11BASE%%/lib/X11
+ echo "$ac_t""$x11conf" 1>&6
+ 
+ 
+ echo $ac_n "checking for X11 app-defaults directory""... $ac_c" 1>&6
+ echo "configure:2926: checking for X11 app-defaults directory" >&5
+-resdir=/usr/X11R6/lib/X11
+-if test -d /etc/X11/app-defaults; then
+-	resdir=/etc/X11
+-fi
++resdir=%%X11BASE%%/lib/X11
+ echo "$ac_t""$resdir/app-defaults" 1>&6
+ 
+ 
diff --git a/multimedia/xawtv/files/patch-font::Makefile.in b/multimedia/xawtv/files/patch-font::Makefile.in
index c3f1bcf..f9c8412 100644
--- a/multimedia/xawtv/files/patch-font::Makefile.in
+++ b/multimedia/xawtv/files/patch-font::Makefile.in
@@ -1,9 +1,10 @@
---- font/Makefile.in.orig	Sat Mar  3 22:50:32 2001
-+++ font/Makefile.in		Sat Mar  3 22:50:44 2001
-@@ -16,7 +16,6 @@
+--- font/Makefile.in.orig	Sun Sep  2 12:01:30 2001
++++ font/Makefile.in	Sun Sep  2 12:01:45 2001
+@@ -23,7 +23,6 @@
  	done
- 	if test "$(ROOT)" = ""; then		\
- 		(cd $(FONTDIR); mkfontdir);	\
--		xset fp rehash;			\
- 		true;				\
+ 	if test "$(DESTDIR)" = ""; then		\
+ 		(cd $(fontdir); mkfontdir);	\
+-		xset fp rehash || true;		\
  	fi
+ 
+ 
diff --git a/multimedia/xawtv/files/patch-src::Makefile.in b/multimedia/xawtv/files/patch-src::Makefile.in
new file mode 100644
index 0000000..d9b6ed2
--- /dev/null
+++ b/multimedia/xawtv/files/patch-src::Makefile.in
@@ -0,0 +1,19 @@
+--- src/Makefile.in.orig	Thu Dec 13 13:15:07 2001
++++ src/Makefile.in	Mon Jan 14 20:36:59 2002
+@@ -124,12 +124,14 @@
+ install-dirs:
+ 	$(INSTALL_DIR) $(bindir)
+ 	$(INSTALL_DIR) $(resdir)/app-defaults
+-	$(INSTALL_DIR) $(resdir)/de/app-defaults
++	for lang in $(LANG); do \
++	  $(INSTALL_DIR) $(resdir)/$$lang/app-defaults;\
++	done
+ 
+ install-common:
+ 	$(INSTALL_DIR) $(bindir)
+ 	$(INSTALL_DIR) $(resdir)/app-defaults
+-	$(INSTALL_PROGRAM) $(srcdir)/subtitles $(bindir)
++	$(INSTALL_DATA) -m 555 $(srcdir)/subtitles $(bindir)
+ 	$(INSTALL_PROGRAM) -s xawtv-remote $(bindir)
+ 	$(INSTALL_PROGRAM) -s streamer $(bindir)
+ 	$(INSTALL_PROGRAM) -s v4lctl $(bindir)
diff --git a/multimedia/xawtv/files/patch-src::motif.c b/multimedia/xawtv/files/patch-src::motif.c
new file mode 100644
index 0000000..63c9274
--- /dev/null
+++ b/multimedia/xawtv/files/patch-src::motif.c
@@ -0,0 +1,23 @@
+--- src/motif.c.orig	Mon Sep 17 00:42:53 2001
++++ src/motif.c	Mon Sep 17 00:45:40 2001
+@@ -24,6 +24,19 @@
+ # include <sys/soundcard.h>
+ #endif
+ 
++#if defined(__FreeBSD__)
++typedef struct mixer_info
++{
++  char id[16];  
++  char name[32];
++  int  modify_counter;
++  int fillers[10];
++} mixer_info;
++
++
++# define SOUND_MIXER_INFO                _IOR ('M', 101, mixer_info)
++#endif
++
+ #include <X11/Xlib.h>
+ #include <X11/Intrinsic.h>
+ #include <Xm/Xm.h>
+
diff --git a/multimedia/xawtv/files/patch-src::xt.c b/multimedia/xawtv/files/patch-src::xt.c
new file mode 100644
index 0000000..b7463f7
--- /dev/null
+++ b/multimedia/xawtv/files/patch-src::xt.c
@@ -0,0 +1,17 @@
+--- src/xt.c.orig	Mon Sep 17 00:39:58 2001
++++ src/xt.c	Mon Sep 17 00:40:07 2001
+@@ -27,6 +27,13 @@
+ # include <linux/videodev.h>
+ #endif
+ 
++#if defined(__FreeBSD__)
++#define VIDEO_SOUND_MONO        1
++#define VIDEO_SOUND_STEREO      2
++#define VIDEO_SOUND_LANG1       4
++#define VIDEO_SOUND_LANG2       8
++#endif
++
+ #include "config.h"
+ 
+ #include <X11/Xlib.h>
+