- Clarified the requirement for Qt with OpenGL support to avoid

  compilation problems
- Fixed backwards configure flag handling with WITH_OPENGL option
- Split some multi-file patches
- Regenerated patches with "make makepatch"
- Added patches to avoid compilation problems with installed ffmpeg port [1]
- Bumped PORTREVISION

Reported by:	Torfinn Ingolfsen <torfinn dot ingolfsen at broadpark dot no> [1]
Submitted by:	Bernhard Frohlich <decke at bluelife dot at> [1]

17 files changed, 144 insertions, 119 deletions

diff --git a/multimedia/mythtv-frontend/Makefile b/multimedia/mythtv-frontend/Makefile
index b3ac79cae151..918740d0310c 100644
--- a/multimedia/mythtv-frontend/Makefile
+++ b/multimedia/mythtv-frontend/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mythtv-frontend
 PORTVERSION=	0.21
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://ftp.osuosl.org/pub/mythtv/ \
 		http://ftp.oregonstate.edu/pub/mythtv/
@@ -54,9 +55,8 @@ OPTIONS=	ARTS "arts sound driver" off \
 
 pre-everything::
 	@${ECHO_MSG}
-	@${ECHO_MSG} "If you want OpenGL video support in MythTV, please"
-	@${ECHO_MSG} "hit Ctrl-C right now and install QT 3.3 with OpenGL"
-	@${ECHO_MSG} "support with the following command, if it isn't"
+	@${ECHO_MSG} "Please hit Ctrl-C right now and install QT 3.3 with"
+	@${ECHO_MSG} "OpenGL support with the following command, if it isn't"
 	@${ECHO_MSG} "already:"
 	@${ECHO_MSG}
 	@${ECHO_MSG} "    cd /usr/ports/x11-toolkits/qt33"
@@ -79,9 +79,9 @@ CONFIGURE_ARGS+=	--disable-audio-jack
 .endif
 
 .if defined(WITH_OPENGL)
-CONFIGURE_ARGS+=	--disable-opengl-video
-.else
 CONFIGURE_ARGS+=	--enable-opengl-video
+.else
+CONFIGURE_ARGS+=	--disable-opengl-video
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/mythtv-frontend/files/patch-changeset-r16895.diff b/multimedia/mythtv-frontend/files/patch-changeset-r16895.diff
deleted file mode 100644
index ed063d22c449..000000000000
--- a/multimedia/mythtv-frontend/files/patch-changeset-r16895.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: configure
-===================================================================
---- configure (revision 16772)
-+++ configure (revision 16895)
-@@ -164,4 +164,5 @@
-   echo "  --disable-x11            disable X11 support"
-   echo "  --x11-path=X11LOC        location of X11 include files [$x11_include_path-path]"
-+#  echo "  --enable-glx-procaddrarb use glXGetProcAddressARB() instead of glXGetProcAddress()"
-   echo "  --disable-xrandr         disable X11 resolution switching"
-   echo "  --disable-xv             disable XVideo   (X11 video output accel.)"
-@@ -905,4 +906,5 @@
-     dvdv
-     fribidi
-+    glx_proc_addr_arb
- '
- 
-@@ -1190,4 +1192,5 @@
- xvmc_vld="yes"
- xvmcw="yes"
-+glx_proc_addr_arb="no"
- 
- # libraries
-@@ -1353,4 +1356,8 @@
-   ;;
-   --xvmc-lib=*) xvmc_lib="$optval"
-+  ;;
-+  --enable-glx-procaddrarb) glx_proc_addr_arb="yes"
-+  ;;
-+  --disable-glx-procaddrarb) glx_proc_addr_arb="no"
-   ;;
-   --enable-mac-accel) dvdv="yes"
-Index: libs/libmythtv/libmythtv.pro
-===================================================================
---- libs/libmythtv/libmythtv.pro (revision 16142)
-+++ libs/libmythtv/libmythtv.pro (revision 16895)
-@@ -313,4 +313,6 @@
-     using_opengl_video:SOURCES += openglvideo.cpp
- 
-+    using_glx_proc_addr_arb:DEFINES += USING_GLX_PROC_ADDR_ARB
-+
-     # Misc. frontend
-     HEADERS += guidegrid.h              infostructs.h
-Index: /branches/release-0-21-fixes/mythtv/libs/libmythtv/util-opengl.cpp
-===================================================================
---- libs/libmythtv/util-opengl.cpp (revision 15141)
-+++ libs/libmythtv/util-opengl.cpp (revision 16895)
-@@ -307,5 +307,7 @@
-     __GLXextFuncPtr ret = NULL;
- 
--#if GLX_VERSION_1_4
-+#if USING_GLX_PROC_ADDR_ARB
-+    X11S(ret = glXGetProcAddressARB((const GLubyte*)procName.latin1()));
-+#elif GLX_VERSION_1_4
-     X11S(ret = glXGetProcAddress((const GLubyte*)procName.latin1()));
- #elif GLX_ARB_get_proc_address
diff --git a/multimedia/mythtv-frontend/files/patch-configure b/multimedia/mythtv-frontend/files/patch-configure
index 701c35a529ef..a603100df551 100644
--- a/multimedia/mythtv-frontend/files/patch-configure
+++ b/multimedia/mythtv-frontend/files/patch-configure
@@ -1,6 +1,58 @@
---- configure.orig	2008-03-04 22:23:23.000000000 +0100
-+++ configure	2008-11-04 20:12:25.000000000 +0100
-@@ -1466,7 +1466,7 @@
+--- configure.orig	2009-04-22 21:32:14.000000000 -0400
++++ configure	2009-04-22 21:32:19.000000000 -0400
+@@ -163,6 +163,7 @@
+   echo "                           directory with frontend.h [$dvb_path]"
+   echo "  --disable-x11            disable X11 support"
+   echo "  --x11-path=X11LOC        location of X11 include files [$x11_include_path-path]"
++#  echo "  --enable-glx-procaddrarb use glXGetProcAddressARB() instead of glXGetProcAddress()"
+   echo "  --disable-xrandr         disable X11 resolution switching"
+   echo "  --disable-xv             disable XVideo   (X11 video output accel.)"
+   echo "  --disable-xvmc           disable XvMC     (Linux/BSD MPEG accel.)"
+@@ -273,13 +274,13 @@
+     exit 1
+ }
+ 
+-# "tr '[a-z]' '[A-Z]'" is a workaround for Solaris tr not grokking "tr a-z A-Z"
++# Avoid locale weirdness, besides we really just want to translate ASCII.
+ toupper(){
+-    echo "$@" | tr '[a-z]' '[A-Z]'
++    echo "$@" | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ
+ }
+ 
+ tolower(){
+-    echo "$@" | tr '[A-Z]' '[a-z]'
++    echo "$@" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz
+ }
+ 
+ set_all(){
+@@ -904,6 +905,7 @@
+     xvmc_vld
+     dvdv
+     fribidi
++    glx_proc_addr_arb
+ '
+ 
+ MYTHTV_LIST='
+@@ -1189,6 +1191,7 @@
+ xvmc_opengl="yes"
+ xvmc_vld="yes"
+ xvmcw="yes"
++glx_proc_addr_arb="no"
+ 
+ # libraries
+ enable zlib
+@@ -1353,6 +1356,10 @@
+   ;;
+   --xvmc-lib=*) xvmc_lib="$optval"
+   ;;
++  --enable-glx-procaddrarb) glx_proc_addr_arb="yes"
++  ;;
++  --disable-glx-procaddrarb) glx_proc_addr_arb="no"
++  ;;
+   --enable-mac-accel) dvdv="yes"
+   ;;
+   --disable-mac-accel) dvdv="no"
+@@ -1466,7 +1473,7 @@
    x86_64|amd64)
      arch="x86_32"
      enable fast_unaligned
diff --git a/multimedia/mythtv-frontend/files/patch-configure-toupper b/multimedia/mythtv-frontend/files/patch-configure-toupper
deleted file mode 100644
index b58b9219b71a..000000000000
--- a/multimedia/mythtv-frontend/files/patch-configure-toupper
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.orig	2008-11-10 22:44:26.000000000 +0100
-+++ configure	2008-11-10 22:45:16.000000000 +0100
-@@ -274,13 +274,13 @@
-     exit 1
- }
- 
--# "tr '[a-z]' '[A-Z]'" is a workaround for Solaris tr not grokking "tr a-z A-Z"
-+# Avoid locale weirdness, besides we really just want to translate ASCII.
- toupper(){
--    echo "$@" | tr '[a-z]' '[A-Z]'
-+    echo "$@" | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ
- }
- 
- tolower(){
--    echo "$@" | tr '[A-Z]' '[a-z]'
-+    echo "$@" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz
- }
- 
- set_all(){
diff --git a/multimedia/mythtv-frontend/files/patch-libs-libmythfreemheg-Programs.cpp b/multimedia/mythtv-frontend/files/patch-libs-libmythfreemheg-Programs.cpp
deleted file mode 100644
index 525aebcc1a24..000000000000
--- a/multimedia/mythtv-frontend/files/patch-libs-libmythfreemheg-Programs.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- libs/libmythfreemheg/Programs.cpp	2007-03-29 21:44:23.000000000 +0200
-+++ libs/libmythfreemheg/Programs.cpp	2008-09-15 20:07:39.000000000 +0200
-@@ -32,6 +32,10 @@
- #include <sys/timeb.h>
- #include <time.h>
- 
-+#ifdef __FreeBSD__
-+#include <sys/time.h>
-+#endif
-+
- #include "../../config.h"
- 
- /*
diff --git a/multimedia/mythtv-frontend/files/patch-libs-libmythtv-libmythtv.pro b/multimedia/mythtv-frontend/files/patch-libs-libmythtv-libmythtv.pro
deleted file mode 100644
index 76499371dafa..000000000000
--- a/multimedia/mythtv-frontend/files/patch-libs-libmythtv-libmythtv.pro
+++ /dev/null
@@ -1,10 +0,0 @@
---- libs/libmythtv/libmythtv.pro.orig	2008-02-18 23:59:32.000000000 +0100
-+++ libs/libmythtv/libmythtv.pro	2008-09-22 11:56:52.000000000 +0200
-@@ -49,6 +49,7 @@
- 
- 
- DEFINES += _LARGEFILE_SOURCE
-+QMAKE_CXXFLAGS = -I../libmyth -I../libavcodec -I../libavutil -I../libmythmpeg2 $${QMAKE_CXXFLAGS}
- QMAKE_CXXFLAGS += $${FREETYPE_CFLAGS}
- QMAKE_LFLAGS_SHLIB += $${FREETYPE_LIBS}
- 
diff --git a/multimedia/mythtv-frontend/files/patch-libs-libavcodec-h264.c b/multimedia/mythtv-frontend/files/patch-libs__libavcodec__h264.c
index f2bdf55afe47..92a4665557b9 100644
--- a/multimedia/mythtv-frontend/files/patch-libs-libavcodec-h264.c
+++ b/multimedia/mythtv-frontend/files/patch-libs__libavcodec__h264.c
@@ -1,5 +1,5 @@
---- libs/libavcodec/h264.c.orig	2008-11-02 21:53:29.000000000 +0100
-+++ libs/libavcodec/h264.c	2008-11-02 21:54:24.000000000 +0100
+--- ./libs/libavcodec/h264.c.orig	2008-03-04 16:05:31.000000000 -0500
++++ ./libs/libavcodec/h264.c	2009-04-22 21:05:20.000000000 -0400
 @@ -5366,7 +5366,7 @@
      return ctx + 4 * cat;
  }
diff --git a/multimedia/mythtv-frontend/files/patch-libs-libavcodec-libavcodec.pro b/multimedia/mythtv-frontend/files/patch-libs__libavcodec__libavcodec.pro
index 2e1c68d806d1..f0ea0ae3eb08 100644
--- a/multimedia/mythtv-frontend/files/patch-libs-libavcodec-libavcodec.pro
+++ b/multimedia/mythtv-frontend/files/patch-libs__libavcodec__libavcodec.pro
@@ -1,5 +1,5 @@
---- libs/libavcodec/libavcodec.pro.orig	2008-11-02 21:49:28.000000000 +0100
-+++ libs/libavcodec/libavcodec.pro	2008-11-02 21:51:42.000000000 +0100
+--- ./libs/libavcodec/libavcodec.pro.orig	2008-02-05 22:02:47.000000000 -0500
++++ ./libs/libavcodec/libavcodec.pro	2009-04-22 21:05:20.000000000 -0400
 @@ -13,6 +13,10 @@
  DEFINES -= MMX
  DEFINES += HAVE_AV_CONFIG_H _LARGEFILE_SOURCE
diff --git a/multimedia/mythtv-frontend/files/patch-libs__libmyth__libmyth.pro b/multimedia/mythtv-frontend/files/patch-libs__libmyth__libmyth.pro
new file mode 100644
index 000000000000..38265c4db535
--- /dev/null
+++ b/multimedia/mythtv-frontend/files/patch-libs__libmyth__libmyth.pro
@@ -0,0 +1,25 @@
+--- ./libs/libmyth/libmyth.pro.orig	2008-03-04 12:08:41.000000000 -0500
++++ ./libs/libmyth/libmyth.pro	2009-04-22 21:05:20.000000000 -0400
+@@ -43,14 +43,14 @@
+ SOURCES += volumebase.cpp volumecontrol.cpp virtualkeyboard.cpp xmlparse.cpp
+ SOURCES += mythhdd.cpp mythcdrom.cpp storagegroup.cpp dbutil.cpp
+ 
+-INCLUDEPATH += ../libmythsamplerate ../libmythsoundtouch ../libmythfreesurround
+-INCLUDEPATH += ../libavcodec ../libavutil
+-INCLUDEPATH += ../.. ../ ./
+-DEPENDPATH += ../libmythsamplerate ../libmythsoundtouch
+-DEPENDPATH += ../libmythfreesurround
+-DEPENDPATH += ../libavcodec ../libavutil
+-DEPENDPATH += ../ ../libmythui
+-DEPENDPATH += ../libmythupnp
++INCLUDEPATH = ../libmythsamplerate ../libmythsoundtouch ../libmythfreesurround $${INCLUDEPATH}
++INCLUDEPATH = ../libavcodec ../libavutil $${INCLUDEPATH}
++INCLUDEPATH = ../.. ../ ./ $${INCLUDEPATH}
++DEPENDPATH = ../libmythsamplerate ../libmythsoundtouch $${DEPENDPATH}
++DEPENDPATH = ../libmythfreesurround $${DEPENDPATH}
++DEPENDPATH = ../libavcodec ../libavutil $${DEPENDPATH}
++DEPENDPATH = ../ ../libmythui $${DEPENDPATH}
++DEPENDPATH = ../libmythupnp $${DEPENDPATH}
+ 
+ 
+ LIBS += -L../libmythsamplerate   -lmythsamplerate-$${LIBVERSION}
diff --git a/multimedia/mythtv-frontend/files/patch-libs-libmyth-util.cpp b/multimedia/mythtv-frontend/files/patch-libs__libmyth__util.cpp
index baaf022ff8c5..35242403d7a1 100644
--- a/multimedia/mythtv-frontend/files/patch-libs-libmyth-util.cpp
+++ b/multimedia/mythtv-frontend/files/patch-libs__libmyth__util.cpp
@@ -1,5 +1,5 @@
---- libs/libmyth/util.cpp	2008-09-14 23:29:09.000000000 +0200
-+++ libs/libmyth/util.cpp	2008-09-14 23:28:01.000000000 +0200
+--- ./libs/libmyth/util.cpp.orig	2008-02-24 10:19:20.000000000 -0500
++++ ./libs/libmyth/util.cpp	2009-04-22 21:05:20.000000000 -0400
 @@ -54,6 +54,10 @@
  #include <sys/mount.h>  // for struct statfs
  #endif
diff --git a/multimedia/mythtv-frontend/files/patch-libs-mythdvdnav-dvd_input.c b/multimedia/mythtv-frontend/files/patch-libs__libmythdvdnav__dvd_input.c
index bec030bb6493..d1cd8c4dcbb3 100644
--- a/multimedia/mythtv-frontend/files/patch-libs-mythdvdnav-dvd_input.c
+++ b/multimedia/mythtv-frontend/files/patch-libs__libmythdvdnav__dvd_input.c
@@ -1,5 +1,5 @@
---- libs/libmythdvdnav/dvd_input.c	2008-09-14 22:40:08.000000000 +0200
-+++ libs/libmythdvdnav/dvd_input.c	2008-09-14 22:40:22.000000000 +0200
+--- ./libs/libmythdvdnav/dvd_input.c.orig	2008-01-27 14:27:40.000000000 -0500
++++ ./libs/libmythdvdnav/dvd_input.c	2009-04-22 21:05:20.000000000 -0400
 @@ -24,6 +24,9 @@
  #include <fcntl.h>
  #include <unistd.h>
diff --git a/multimedia/mythtv-frontend/files/patch-libs__libmythfreemheg__Programs.cpp b/multimedia/mythtv-frontend/files/patch-libs__libmythfreemheg__Programs.cpp
new file mode 100644
index 000000000000..7a14a5cf4268
--- /dev/null
+++ b/multimedia/mythtv-frontend/files/patch-libs__libmythfreemheg__Programs.cpp
@@ -0,0 +1,13 @@
+--- ./libs/libmythfreemheg/Programs.cpp.orig	2007-03-29 15:44:23.000000000 -0400
++++ ./libs/libmythfreemheg/Programs.cpp	2009-04-22 21:05:20.000000000 -0400
+@@ -32,6 +32,10 @@
+ #include <sys/timeb.h>
+ #include <time.h>
+ 
++#ifdef __FreeBSD__
++#include <sys/time.h>
++#endif
++
+ #include "../../config.h"
+ 
+ /*
diff --git a/multimedia/mythtv-frontend/files/patch-libs__libmythtv__libmythtv.pro b/multimedia/mythtv-frontend/files/patch-libs__libmythtv__libmythtv.pro
new file mode 100644
index 000000000000..736e5278abf1
--- /dev/null
+++ b/multimedia/mythtv-frontend/files/patch-libs__libmythtv__libmythtv.pro
@@ -0,0 +1,19 @@
+--- libs/libmythtv/libmythtv.pro.orig	2009-04-22 21:32:52.000000000 -0400
++++ libs/libmythtv/libmythtv.pro	2009-04-22 21:33:01.000000000 -0400
+@@ -49,6 +49,7 @@
+ 
+ 
+ DEFINES += _LARGEFILE_SOURCE
++QMAKE_CXXFLAGS = -I../libmyth -I../libavcodec -I../libavutil -I../libmythmpeg2 $${QMAKE_CXXFLAGS}
+ QMAKE_CXXFLAGS += $${FREETYPE_CFLAGS}
+ QMAKE_LFLAGS_SHLIB += $${FREETYPE_LIBS}
+ 
+@@ -312,6 +313,8 @@
+     using_opengl_video:HEADERS += openglvideo.h
+     using_opengl_video:SOURCES += openglvideo.cpp
+ 
++    using_glx_proc_addr_arb:DEFINES += USING_GLX_PROC_ADDR_ARB
++
+     # Misc. frontend
+     HEADERS += guidegrid.h              infostructs.h
+     HEADERS += progfind.h               ttfont.h
diff --git a/multimedia/mythtv-frontend/files/patch-libs__libmythtv__util-opengl.cpp b/multimedia/mythtv-frontend/files/patch-libs__libmythtv__util-opengl.cpp
new file mode 100644
index 000000000000..242878ffe27f
--- /dev/null
+++ b/multimedia/mythtv-frontend/files/patch-libs__libmythtv__util-opengl.cpp
@@ -0,0 +1,13 @@
+--- ./libs/libmythtv/util-opengl.cpp.orig	2007-12-11 23:51:42.000000000 -0500
++++ ./libs/libmythtv/util-opengl.cpp	2009-04-22 21:05:20.000000000 -0400
+@@ -306,7 +306,9 @@
+ {
+     __GLXextFuncPtr ret = NULL;
+ 
+-#if GLX_VERSION_1_4
++#if USING_GLX_PROC_ADDR_ARB
++    X11S(ret = glXGetProcAddressARB((const GLubyte*)procName.latin1()));
++#elif GLX_VERSION_1_4
+     X11S(ret = glXGetProcAddress((const GLubyte*)procName.latin1()));
+ #elif GLX_ARB_get_proc_address
+     X11S(ret = glXGetProcAddressARB((const GLubyte*)procName.latin1()));
diff --git a/multimedia/mythtv-frontend/files/patch-programs-mythfrontend-main.cpp b/multimedia/mythtv-frontend/files/patch-programs__mythfrontend__main.cpp
index 7615dd2da7ab..54d3e2006e8a 100644
--- a/multimedia/mythtv-frontend/files/patch-programs-mythfrontend-main.cpp
+++ b/multimedia/mythtv-frontend/files/patch-programs__mythfrontend__main.cpp
@@ -1,5 +1,5 @@
---- programs/mythfrontend/main.cpp	2008-09-17 20:22:31.000000000 +0200
-+++ programs/mythfrontend/main.cpp	2008-09-17 20:22:58.000000000 +0200
+--- ./programs/mythfrontend/main.cpp.orig	2008-02-23 22:25:03.000000000 -0500
++++ ./programs/mythfrontend/main.cpp	2009-04-22 21:05:21.000000000 -0400
 @@ -577,7 +577,7 @@
  void haltnow()
  {
diff --git a/multimedia/mythtv-frontend/files/patch-programs-mythtranscode-mythtranscode.pro b/multimedia/mythtv-frontend/files/patch-programs__mythtranscode__mythtranscode.pro
index 7e60f3df3d29..a2c68690ae9f 100644
--- a/multimedia/mythtv-frontend/files/patch-programs-mythtranscode-mythtranscode.pro
+++ b/multimedia/mythtv-frontend/files/patch-programs__mythtranscode__mythtranscode.pro
@@ -1,5 +1,5 @@
---- programs/mythtranscode/mythtranscode.pro.orig	2008-09-23 11:10:01.000000000 +0200
-+++ programs/mythtranscode/mythtranscode.pro	2008-09-23 11:10:42.000000000 +0200
+--- ./programs/mythtranscode/mythtranscode.pro.orig	2007-02-24 12:44:00.000000000 -0500
++++ ./programs/mythtranscode/mythtranscode.pro	2009-04-22 21:05:21.000000000 -0400
 @@ -20,3 +20,7 @@
  INCLUDEPATH += replex
  INCLUDEPATH += ../../libs/libavcodec ../../libs/libavformat \
diff --git a/multimedia/mythtv-frontend/files/patch-programs-programs.pro b/multimedia/mythtv-frontend/files/patch-programs__programs.pro
index af6f3b3aea7a..41a18de1cda5 100644
--- a/multimedia/mythtv-frontend/files/patch-programs-programs.pro
+++ b/multimedia/mythtv-frontend/files/patch-programs__programs.pro
@@ -1,5 +1,5 @@
---- programs/programs.pro.orig	2008-12-30 14:08:30.000000000 -0500
-+++ programs/programs.pro	2008-12-30 14:08:40.000000000 -0500
+--- ./programs/programs.pro.orig	2008-01-29 15:17:31.000000000 -0500
++++ ./programs/programs.pro	2009-04-22 21:05:21.000000000 -0400
 @@ -10,10 +10,6 @@
      SUBDIRS += mythwelcome mythshutdown mythtranscode/replex
  }