Fix check for texi2html to work with older texi2html versions.

While at it, don't build the html documentation that isn't installed
anyway.

3 files changed, 27 insertions, 9 deletions

diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
index 0f40257e11a..701848d43b3 100644
--- a/multimedia/ffmpeg/distinfo
+++ b/multimedia/ffmpeg/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.43 2011/09/12 17:18:52 drochner Exp $
+$NetBSD: distinfo,v 1.44 2011/09/14 17:21:08 hans Exp $
 
 SHA1 (ffmpeg-0.7.4.tar.bz2) = f528ef9eaa224acd970710d6a408f2ff03b39544
 RMD160 (ffmpeg-0.7.4.tar.bz2) = df886310ae02b851c02be531a67b5c140970af96
 Size (ffmpeg-0.7.4.tar.bz2) = 4523220 bytes
 SHA1 (patch-aa) = c9540d0ca0a671e9faa8b5b7847c103b515ac382
-SHA1 (patch-ac) = 63e3835a9af2123ab872f6e105bf355bb16cad6c
+SHA1 (patch-ac) = 4eba6e68d3fab082a957fa08f5618561f3b4aecb
 SHA1 (patch-ad) = d3e06c855ab1a5ff3ddb0bee108ea88166c32cb6
-SHA1 (patch-configure) = 041d976ee22fab612580c2fb141fb5c829fa68d5
+SHA1 (patch-configure) = 89e56f8cd662c078380b1a700f84639bc423c807
diff --git a/multimedia/ffmpeg/patches/patch-ac b/multimedia/ffmpeg/patches/patch-ac
index 47401a772de..d4266d934f0 100644
--- a/multimedia/ffmpeg/patches/patch-ac
+++ b/multimedia/ffmpeg/patches/patch-ac
@@ -1,7 +1,16 @@
-$NetBSD: patch-ac,v 1.10 2011/07/19 19:53:18 drochner Exp $
+$NetBSD: patch-ac,v 1.11 2011/09/14 17:21:08 hans Exp $
 
---- Makefile.orig	2011-06-21 19:29:25.000000000 +0000
-+++ Makefile
+--- Makefile.orig	2011-06-21 21:29:25.000000000 +0200
++++ Makefile	2011-09-12 17:54:06.075569882 +0200
+@@ -112,7 +112,7 @@ version.h .version:
+ # force version.sh to run whenever version might have changed
+ -include .version
+ 
+-DOCS = $(addprefix doc/, developer.html faq.html general.html libavfilter.html) $(HTMLPAGES) $(MANPAGES) $(PODPAGES)
++DOCS = $(MANPAGES) $(PODPAGES)
+ 
+ documentation: $(DOCS)
+ 
 @@ -152,11 +152,11 @@ install-progs: install-progs-yes $(PROGS
  
  install-data: $(DATA_FILES)
diff --git a/multimedia/ffmpeg/patches/patch-configure b/multimedia/ffmpeg/patches/patch-configure
index db31fbbb52e..8d15db80354 100644
--- a/multimedia/ffmpeg/patches/patch-configure
+++ b/multimedia/ffmpeg/patches/patch-configure
@@ -1,7 +1,7 @@
-$NetBSD: patch-configure,v 1.12 2011/07/19 19:53:18 drochner Exp $
+$NetBSD: patch-configure,v 1.13 2011/09/14 17:21:08 hans Exp $
 
---- configure.orig	2011-06-21 19:29:25.000000000 +0000
-+++ configure
+--- configure.orig	2011-06-21 21:29:25.000000000 +0200
++++ configure	2011-09-12 17:35:52.888456457 +0200
 @@ -2404,6 +2404,10 @@ case $target_os in
          ;;
      netbsd)
@@ -30,6 +30,15 @@ $NetBSD: patch-configure,v 1.12 2011/07/19 19:53:18 drochner Exp $
  
  if enabled alpha; then
  
+@@ -2963,7 +2970,7 @@ else
+ fi
+ enabled sdl && add_cflags $sdl_cflags && add_extralibs $sdl_libs
+ 
+-texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html
++which texi2html > /dev/null 2>&1 && enable texi2html || disable texi2html
+ 
+ check_header linux/fb.h
+ check_header linux/videodev.h
 @@ -3049,6 +3056,7 @@ check_ldflags -Wl,--warn-common
  check_ldflags -Wl,-rpath-link,libpostproc -Wl,-rpath-link,libswscale -Wl,-rpath-link,libavfilter -Wl,-rpath-link,libavdevice -Wl,-rpath-link,libavformat -Wl,-rpath-link,libavcodec -Wl,-rpath-link,libavutil
  test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic