8 files changed, 64 insertions, 25 deletions

diff --git a/multimedia/mythtv/Makefile b/multimedia/mythtv/Makefile
index cdb700de6b06..0d4c419c23a3 100644
--- a/multimedia/mythtv/Makefile
+++ b/multimedia/mythtv/Makefile
@@ -2,8 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	mythtv
-PORTVERSION=	0.27
+PORTVERSION=	0.27.0.20140121
 CATEGORIES=	multimedia
+MASTER_SITES=	http://people.freebsd.org/~decke/distfiles/
 
 MAINTAINER=	decke@FreeBSD.org
 COMMENT=	MythTV is a homebrew PVR project
@@ -21,11 +22,11 @@ CONFLICTS=	mythtv-frontend-[0-9]*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	MythTV
-GH_TAGNAME=	v${PORTVERSION}
+GH_TAGNAME=	${GH_COMMIT}
+GH_COMMIT=	5a5e1cd
 
-WRKSRC=		${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-e9545c0/${GH_PROJECT}
+WRKSRC=		${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}/${GH_PROJECT}
 
-USE_GCC=	any
 ONLY_FOR_ARCHS=	i386 amd64
 USES=		gmake pkgconfig perl5
 USE_QT4=	gui sql network script linguist_build l10n sql-mysql_run \
@@ -56,7 +57,8 @@ CONFIGURE_ARGS=	--prefix="${PREFIX}" --cc="${CC}" --cxx="${CXX}" --dvb-path="${L
 QMAKESPEC?=	${LOCALBASE}/share/qt4/mkspecs/freebsd-g++
 
 OPTIONS_DEFINE=	BINDINGS LIRC MYSQL OPENGL VDPAU
-OPTIONS_DEFAULT=	BINDINGS OPENGL
+OPTIONS_DEFAULT=	BINDINGS OPENGL VDPAU
+OPTIONS_SUB=	BINDINGS
 BINDINGS_DESC=	Perl and Python bindings
 
 LIRC_LIB_DEPENDS=	liblirc_client.so:${PORTSDIR}/comms/lirc
@@ -103,10 +105,8 @@ RUN_DEPENDS+=	py*-lxml>=0:${PORTSDIR}/devel/py-lxml \
 		p5-IO-Socket-INET6>=2.51:${PORTSDIR}/net/p5-IO-Socket-INET6 \
 		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
 		p5-DBD-mysql>0:${PORTSDIR}/databases/p5-DBD-mysql
-PLIST_SUB+=	BINDINGS=""
 .else
 CONFIGURE_ARGS+=--without-bindings=perl,python
-PLIST_SUB+=	BINDINGS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MOPENGL}
diff --git a/multimedia/mythtv/distinfo b/multimedia/mythtv/distinfo
index 66c307cfbe08..7c5406fbf1b1 100644
--- a/multimedia/mythtv/distinfo
+++ b/multimedia/mythtv/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mythtv-0.27.tar.gz) = e8d77c48f487bd057b2f887c27416d502b79c78c4e1cfb05d87ec70d690f8d0d
-SIZE (mythtv-0.27.tar.gz) = 85915149
+SHA256 (mythtv-0.27.0.20140121.tar.gz) = dcc6c2401110111793999faf8f317c9036378e2a90cbb55b990f138e76a39dad
+SIZE (mythtv-0.27.0.20140121.tar.gz) = 85938811
diff --git a/multimedia/mythtv/files/patch-libs__libmyth__remoteutil.h b/multimedia/mythtv/files/patch-libs__libmyth__remoteutil.h
new file mode 100644
index 000000000000..e74d28832a41
--- /dev/null
+++ b/multimedia/mythtv/files/patch-libs__libmyth__remoteutil.h
@@ -0,0 +1,11 @@
+--- libs/libmyth/remoteutil.h.orig	2013-09-18 16:06:08.000000000 -0400
++++ libs/libmyth/remoteutil.h	2014-01-22 08:26:34.000000000 -0500
+@@ -8,6 +8,7 @@
+ using namespace std;
+ 
+ #include "mythexp.h"
++#include <sys/types.h>
+ 
+ class ProgramInfo;
+ class MythEvent;
+
diff --git a/multimedia/mythtv/files/patch-libs__libmythtv__recorders__dvbdev__dvbci.cpp b/multimedia/mythtv/files/patch-libs__libmythtv__recorders__dvbdev__dvbci.cpp
index 91a99ccb98b0..4b9296c39856 100644
--- a/multimedia/mythtv/files/patch-libs__libmythtv__recorders__dvbdev__dvbci.cpp
+++ b/multimedia/mythtv/files/patch-libs__libmythtv__recorders__dvbdev__dvbci.cpp
@@ -1,11 +1,13 @@
---- libs/libmythtv/recorders/dvbdev/dvbci.cpp.orig	2010-03-07 04:11:52.000000000 +0100
-+++ libs/libmythtv/recorders/dvbdev/dvbci.cpp	2010-04-26 23:30:52.000000000 +0200
-@@ -28,7 +28,9 @@
+--- libs/libmythtv/recorders/dvbdev/dvbci.cpp.orig	2010-04-26 23:30:52.000000000 +0200
++++ libs/libmythtv/recorders/dvbdev/dvbci.cpp	2014-01-22 09:13:22.000000000 -0500
+@@ -28,7 +28,11 @@
  #include <errno.h>
  #include <ctype.h>
  #include <linux/dvb/ca.h>
 +#ifndef __FreeBSD__
  #include <malloc.h>
++#else
++#include <stdlib.h>
 +#endif
  #include <netinet/in.h>
  #include <poll.h>
diff --git a/multimedia/mythtv/files/patch-libs__libmythui__mythgesture.cpp b/multimedia/mythtv/files/patch-libs__libmythui__mythgesture.cpp
new file mode 100644
index 000000000000..2f91cb2565a2
--- /dev/null
+++ b/multimedia/mythtv/files/patch-libs__libmythui__mythgesture.cpp
@@ -0,0 +1,19 @@
+--- libs/libmythui/mythgesture.cpp.orig	2013-09-18 16:06:08.000000000 -0400
++++ libs/libmythui/mythgesture.cpp	2014-01-22 08:20:33.000000000 -0500
+@@ -28,6 +28,7 @@
+ 
+ #include "mythgesture.h"
+ 
++#include <cstdlib>
+ #include <cmath>
+ #include <algorithm>
+ 
+@@ -283,7 +284,7 @@
+     int dely = p.y() - points.back().y();
+ 
+     /* step by the greatest delta direction */
+-    if (abs(delx) > abs(dely))
++    if (std::abs(delx) > std::abs(dely))
+     {
+         float iy = points.back().y();
+ 
diff --git a/multimedia/mythtv/files/patch-libs__libmythui__mythpainter.cpp b/multimedia/mythtv/files/patch-libs__libmythui__mythpainter.cpp
new file mode 100644
index 000000000000..9faea34640a0
--- /dev/null
+++ b/multimedia/mythtv/files/patch-libs__libmythui__mythpainter.cpp
@@ -0,0 +1,9 @@
+--- libs/libmythui/mythpainter.cpp.orig	2013-09-18 16:06:08.000000000 -0400
++++ libs/libmythui/mythpainter.cpp	2014-01-22 08:18:40.000000000 -0500
+@@ -1,5 +1,6 @@
+ #include <stdint.h>
+ #include <algorithm>
++#include <cstdlib>
+ 
+ // QT headers
+ #include <QRect>
diff --git a/multimedia/mythtv/files/patch-libs__libmythupnp__mmulticastsocketdevice.h b/multimedia/mythtv/files/patch-libs__libmythupnp__mmulticastsocketdevice.h
new file mode 100644
index 000000000000..a0c40c5ea947
--- /dev/null
+++ b/multimedia/mythtv/files/patch-libs__libmythupnp__mmulticastsocketdevice.h
@@ -0,0 +1,11 @@
+--- libs/libmythupnp/mmulticastsocketdevice.h.orig	2013-09-18 16:06:08.000000000 -0400
++++ libs/libmythupnp/mmulticastsocketdevice.h	2014-01-22 08:24:26.000000000 -0500
+@@ -18,6 +18,7 @@
+ #  include <ws2tcpip.h>
+ # endif
+ #else
++# include <sys/types.h>
+ # include <sys/socket.h>
+ # include <netinet/in.h>
+ # include <netinet/ip.h>
+
diff --git a/multimedia/mythtv/pkg-plist b/multimedia/mythtv/pkg-plist
index 37b267389504..24273d058030 100644
--- a/multimedia/mythtv/pkg-plist
+++ b/multimedia/mythtv/pkg-plist
@@ -525,16 +525,6 @@ include/mythtv/zeromq/zmq_utils.h
 %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/static.pyc
 %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/system.py
 %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/system.pyc
-%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/tmdb/XSLT/tmdbQuery.xsl
-%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/tmdb/XSLT/tmdbVideo.xsl
-%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/tmdb/__init__.py
-%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/tmdb/__init__.pyc
-%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/tmdb/tmdb_api.py
-%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/tmdb/tmdb_api.pyc
-%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/tmdb/tmdb_exceptions.py
-%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/tmdb/tmdb_exceptions.pyc
-%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/tmdb/tmdb_ui.py
-%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/tmdb/tmdb_ui.pyc
 %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/tmdb3/__init__.py
 %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/tmdb3/__init__.pyc
 %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/tmdb3/cache.py
@@ -1112,7 +1102,6 @@ lib/pkgconfig/libmythzmq.pc
 %%DATADIR%%/locales/ru_ru.xml
 %%DATADIR%%/locales/zh_hk.xml
 %%DATADIR%%/locales/zh_tw.xml
-%%DATADIR%%/metadata/Movie/tmdb.py
 %%DATADIR%%/metadata/Movie/tmdb3.py
 %%DATADIR%%/metadata/Television/ttvdb.py
 %%DATADIR%%/mythconverg_backup.pl
@@ -2334,8 +2323,6 @@ lib/pkgconfig/libmythzmq.pc
 %%BINDINGS%%@dirrm %%PYTHON_SITELIBDIR%%/MythTV/ttvdb/XSLT
 %%BINDINGS%%@dirrm %%PYTHON_SITELIBDIR%%/MythTV/ttvdb
 %%BINDINGS%%@dirrm %%PYTHON_SITELIBDIR%%/MythTV/tmdb3
-%%BINDINGS%%@dirrm %%PYTHON_SITELIBDIR%%/MythTV/tmdb/XSLT
-%%BINDINGS%%@dirrm %%PYTHON_SITELIBDIR%%/MythTV/tmdb
 %%BINDINGS%%@dirrm %%PYTHON_SITELIBDIR%%/MythTV
 %%BINDINGS%%@dirrmtry %%SITE_PERL%%/IO/Socket/INET
 %%BINDINGS%%@dirrmtry %%SITE_PERL%%/IO/Socket