4 files changed, 61 insertions, 13 deletions
diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile
index 0309a932c67..18081b6a262 100644
--- a/multimedia/xawtv/Makefile
+++ b/multimedia/xawtv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xawtv
 PORTVERSION=	3.91
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://bytesex.org/xawtv/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -49,6 +49,19 @@ ONLY_FOR_ARCHS=	i386
 ONLY_FOR_ARCHS=	alpha i386 ia64
 .endif
 
+.if defined(WITH_LIBZVBI)
+LIB_DEPENDS+=	zvbi.2:${PORTSDIR}/devel/libzvbi
+CONFIGURE_ARGS+=--enable-zvbi
+.if ${OSVERSION} > 500000
+PLIST_SUB+=	ZVBI="" ZVBI5=""
+.else
+PLIST_SUB+=	ZVBI="" ZVBI5="@comment "
+.endif
+.else
+CONFIGURE_ARGS+=--enable-zvbi=no
+PLIST_SUB+=	ZVBI="@comment " ZVBI5="@comment "
+.endif
+
 .if defined(WITH_LIBDV)
 LIB_DEPENDS+=	dv.3:${PORTSDIR}/multimedia/libdv
 CONFIGURE_ARGS+=--enable-dv
@@ -80,6 +93,8 @@ pre-everything::
 	@${ECHO} ""
 	@${ECHO} "	WITH_LIBDV=yes    Enable reading/writing raw dv files"
 	@${ECHO} "	WITH_LIBQTIME=yes Enable quicktime support"
+	@${ECHO} "	WITH_LIBZVBI=yes  Enable libzvbi support"
+	@${ECHO} "	                  (scantv compiles, but doesn't work for me)"
 	@${ECHO} "	WITH_MMX=yes      Enable mmx support"
 	@${ECHO} ""
 
@@ -92,4 +107,9 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|-ljpeg|-L${LOCALBASE}/lib -ljpeg|g" ${WRKSRC}/$i
 .endfor
 
+.if ${OSVERSION} < 500000
+	@${REINPLACE_CMD} -e "s|FOUND_ZVBI|NOT_WORKING_&|g" \
+		${WRKSRC}/vbistuff/Subdir.mk
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/multimedia/xawtv/files/patch-configure b/multimedia/xawtv/files/patch-configure
index 753531d831d..0bbc1ec7014 100644
--- a/multimedia/xawtv/files/patch-configure
+++ b/multimedia/xawtv/files/patch-configure
@@ -1,6 +1,24 @@
---- configure.orig	Fri Feb  7 12:02:43 2003
-+++ configure	Thu Feb 13 16:57:29 2003
-@@ -5399,7 +5399,7 @@
+--- configure.orig	Tue Apr 15 14:37:29 2003
++++ configure	Sun Feb  8 21:07:06 2004
+@@ -5287,7 +5287,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"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+@@ -5340,7 +5340,7 @@
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_ZVBI 1
+ _ACEOF
+- FOUND_ZVBI="yes"; LIBZVBI="-lzvbi -lpthread -lm -lpng -lz"
++ FOUND_ZVBI="yes"; LIBZVBI="-lzvbi -L/usr/X11R6/lib -lunicode -lpthread -lm -lpng -lz"
+ fi
+ 
+ else
+@@ -5427,7 +5427,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -9,7 +27,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  /* confdefs.h.  */
-@@ -5452,7 +5452,7 @@
+@@ -5480,7 +5480,7 @@
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_DV 1
  _ACEOF
@@ -18,7 +36,7 @@
  fi
  
  else
-@@ -5466,7 +5466,7 @@
+@@ -5494,7 +5494,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -27,7 +45,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  /* confdefs.h.  */
-@@ -5527,7 +5527,7 @@
+@@ -5555,7 +5555,7 @@
  fi
  QTLIBS=""
  if test "$FOUND_LQT" = "yes"; then
@@ -36,7 +54,7 @@
  fi
  
  
-@@ -6062,9 +6062,6 @@
+@@ -6218,9 +6218,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
@@ -46,7 +64,7 @@
  echo "$as_me:$LINENO: result: $x11conf" >&5
  echo "${ECHO_T}$x11conf" >&6
  
-@@ -6072,9 +6069,6 @@
+@@ -6228,9 +6225,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
diff --git a/multimedia/xawtv/files/patch-x11::Subdir.mk b/multimedia/xawtv/files/patch-x11::Subdir.mk
index edf67d2e389..1ae44876e2e 100644
--- a/multimedia/xawtv/files/patch-x11::Subdir.mk
+++ b/multimedia/xawtv/files/patch-x11::Subdir.mk
@@ -1,6 +1,15 @@
---- x11/Subdir.mk.orig	Tue Jan  7 16:17:05 2003
-+++ x11/Subdir.mk	Sat Jan 18 00:46:26 2003
-@@ -110,8 +110,8 @@
+--- x11/Subdir.mk.orig	Mon Jan 12 18:56:17 2004
++++ x11/Subdir.mk	Mon Feb  9 18:49:10 2004
+@@ -15,7 +15,7 @@
+ TARGETS-x11 += \
+ 	x11/motv
+ endif
+-ifeq ($(FOUND_MOTIF)$(FOUND_ZVBI),yesyes)
++ifeq ($(FOUND_MOTIF)$(NOT_WORKINGFOUND_ZVBI),yesyes)
+ TARGETS-x11 += \
+ 	x11/mtt
+ endif
+@@ -116,8 +116,8 @@
  x11/pia          : LDFLAGS := $(DLFLAGS)
  
  # compile flags
@@ -11,7 +20,7 @@
  
  
  # i18n
-@@ -122,12 +122,12 @@
+@@ -128,12 +128,12 @@
  # local targets
  x11/complete-xaw.o: x11/complete.c
  	@$(echo_compile_c)
diff --git a/multimedia/xawtv/pkg-plist b/multimedia/xawtv/pkg-plist
index 1bbb64547e3..3abe949d583 100644
--- a/multimedia/xawtv/pkg-plist
+++ b/multimedia/xawtv/pkg-plist
@@ -5,6 +5,7 @@ bin/pia
 bin/propwatch
 bin/record
 bin/rootv
+%%ZVBI%%bin/scantv
 bin/showqt
 bin/showriff
 bin/streamer