update to 3.94

3 files changed, 13 insertions, 40 deletions

diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile
index 13bd33ce2619..19798c10ce24 100644
--- a/multimedia/xawtv/Makefile
+++ b/multimedia/xawtv/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xawtv
-PORTVERSION=	3.93
+PORTVERSION=	3.94
 PORTREVISION=	0
 CATEGORIES=	multimedia
 MASTER_SITES=	http://dl.bytesex.org/releases/xawtv/
diff --git a/multimedia/xawtv/distinfo b/multimedia/xawtv/distinfo
index c306a38a64d2..1d31e8af522a 100644
--- a/multimedia/xawtv/distinfo
+++ b/multimedia/xawtv/distinfo
@@ -1,2 +1,2 @@
-MD5 (xawtv-3.93.tar.gz) = 8d2731e6e95f173f41a0ddc875d55804
-SIZE(xawtv-3.93.tar.gz) = 559208
+MD5 (xawtv-3.94.tar.gz) = df768711930605918106c1477327d348
+SIZE(xawtv-3.94.tar.gz) = 553118
diff --git a/multimedia/xawtv/files/patch-configure b/multimedia/xawtv/files/patch-configure
index 9e88c68ce823..28ca07708152 100644
--- a/multimedia/xawtv/files/patch-configure
+++ b/multimedia/xawtv/files/patch-configure
@@ -1,15 +1,15 @@
---- configure.orig	Tue Apr 15 14:37:29 2003
-+++ configure	Sun Feb  8 21:07:06 2004
-@@ -5287,7 +5287,7 @@
+--- configure.orig	Wed Aug 18 17:48:30 2004
++++ configure	Wed Aug 18 20:20:36 2004
+@@ -5710,7 +5710,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--LIBS="-lzvbi  $LIBS"
-+LIBS="-lzvbi -L/usr/X11R6/lib -lunicode -lpthread $LIBS"
+-LIBS="-lzvbi $LIBPTHREAD $LIBS"
++LIBS="-lunicode -lzvbi $LIBPTHREAD $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
  /* confdefs.h.  */
-@@ -5340,7 +5340,7 @@
+ _ACEOF
+@@ -5772,7 +5772,7 @@
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_ZVBI 1
  _ACEOF
@@ -18,16 +18,7 @@
  fi
  
  else
-@@ -5427,7 +5427,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldv -lm $LIBS"
-+LIBS="-ldv -lm $LIBPTHREAD $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -5480,7 +5480,7 @@
+@@ -5930,7 +5930,7 @@
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_DV 1
  _ACEOF
@@ -36,25 +27,7 @@
  fi
  
  else
-@@ -5494,7 +5494,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lquicktime -ldl $dashlglib $LIBPTHREAD $LIBS"
-+LIBS="-lquicktime $dashlglib $LIBPTHREAD $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -5555,7 +5555,7 @@
- fi
- QTLIBS=""
- if test "$FOUND_LQT" = "yes"; then
--    QTLIBS="-lquicktime -ldl $dashlglib -lm"
-+    QTLIBS="-lquicktime $dashlglib $LIBPTHREAD $LIBS"
- fi
- 
- 
-@@ -6218,9 +6218,6 @@
+@@ -6768,9 +6768,6 @@
  echo "$as_me:$LINENO: checking for X11 config directory" >&5
  echo $ECHO_N "checking for X11 config directory... $ECHO_C" >&6
  x11conf=/usr/X11R6/lib/X11
@@ -64,7 +37,7 @@
  echo "$as_me:$LINENO: result: $x11conf" >&5
  echo "${ECHO_T}$x11conf" >&6
  
-@@ -6228,9 +6225,6 @@
+@@ -6778,9 +6775,6 @@
  echo "$as_me:$LINENO: checking for X11 app-defaults directory" >&5
  echo $ECHO_N "checking for X11 app-defaults directory... $ECHO_C" >&6
  resdir=/usr/X11R6/lib/X11