- Update to 0.22

PR:		141722 141723 141724
Submitted by:	Bernhard Froehlich <decke@bluelife.at> (maintainer)

1 files changed, 28 insertions, 33 deletions

diff --git a/multimedia/mythtv/Makefile b/multimedia/mythtv/Makefile
index 79098ebac07c..a217fe15d054 100644
--- a/multimedia/mythtv/Makefile
+++ b/multimedia/mythtv/Makefile
@@ -7,8 +7,7 @@
 # $FreeBSD$
 
 PORTNAME=	mythtv
-PORTVERSION=	0.21
-PORTREVISION=	2
+PORTVERSION=	0.22
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.osuosl.org/pub/mythtv/ \
 		LOCAL/glarkin
@@ -18,25 +17,32 @@ COMMENT=	MythTV is a homebrew PVR project
 
 LIB_DEPENDS=	mp3lame.0:${PORTSDIR}/audio/lame \
 		freetype.9:${PORTSDIR}/print/freetype2
-BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake \
-		${SITE_PERL}/${PERL_ARCH}/XML/Parser/Expat.pm:${PORTSDIR}/textproc/p5-XML-SAX-Expat
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/Parser/Expat.pm:${PORTSDIR}/textproc/p5-XML-SAX-Expat
 RUN_DEPENDS=	tv_check:${PORTSDIR}/textproc/p5-xmltv \
-		${LOCALBASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt-mysql-plugin \
+		${QT_PREFIX}/lib/qt4/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt4-mysql-plugin \
 		wget:${PORTSDIR}/ftp/wget
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_BZIP2=	yes
-USE_QT_VER=	3
+USE_QT_VER=	4
+QT_COMPONENTS=	gui sql network script linguist_build l10n \
+		moc_build qmake_build rcc_build uic_build
 USE_MYSQL=	51
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-LOCALE_CLEANUP=	LANG="" LC_ALL="" LC_COLLATE="" LC_CTYPE="" \
-		LC_MESSAGES="" LC_MONETARY="" LC_NUMERIC="" \
-		LC_TIME=""
-CONFIGURE_ENV=	QMAKESPEC="${QMAKESPEC}" \
-		CFLAGS="${CFLAGS}" ${LOCALE_CLEANUP}
-MAKE_ENV=	QTDIR="${QT_PREFIX}" QMAKESPEC="${QMAKESPEC}" \
-		${LOCALE_CLEANUP}
+HAS_CONFIGURE=	yes
+QT_NONSTANDARD=	yes
+USE_PERL=	yes
+USE_PYTHON=	yes
+INSTALLS_EGGINFO=yes
+PYDISTUTILS_PKGNAME=MythTV
+REINPLACE_ARGS=	-i ""
+
+MAKE_ENV=	QTDIR="${QT_PREFIX}" \
+		QMAKESPEC="${QMAKESPEC}"
+
+CONFIGURE_ENV+=	QMAKESPEC="${QMAKESPEC}" MOC="${MOC}" CPPFLAGS="${CPPFLAGS}  ${QTCPPFLAGS}" \
+		QTDIR="${QT_PREFIX}" LDFLAGS="-L${LOCALBASE}/lib"
+
 USE_RC_SUBR=	mythbackend
 USE_LDCONFIG=	${PREFIX}/lib/mythtv/filters
 
@@ -48,14 +54,11 @@ MYTHTVUID?=	119
 MYTHTVGID?=	${MYTHTVUID}
 MYTHTVDIR?=	/nonexistent
 
-CONFIG=		--enable-xvmc --enable-opengl-vsync --disable-directfb \
-		--disable-ivtv \
-		--disable-xvmc-pro --disable-xvmc-vld --disable-xvmcw  \
+CONFIGURE_ARGS=	--enable-xvmc --enable-opengl-vsync --disable-directfb --enable-ivtv \
+		--disable-xvmc-pro --disable-xvmc-vld --disable-xvmcw \
 		--prefix=${PREFIX} --extra-cflags=-g --extra-cxxflags=-g
 
-CONFIGURE_ARGS=	--with-qt-dir=${LOCALBASE} ${CONFIG}
-
-QMAKESPEC?=	${LOCALBASE}/share/qt/mkspecs/freebsd-g++
+QMAKESPEC?=	${LOCALBASE}/share/qt4/mkspecs/freebsd-g++
 
 OPTIONS=	LIRC		"Native LIRC Support" Off \
 		MYSQL_LOCAL	"RUN_DEPEND on selected MySQL server" Off
@@ -83,19 +86,11 @@ RUN_DEPENDS+=	mysqld_safe:${PORTSDIR}/databases/mysql${MYSQL_VER}-server
 
 post-patch:
 		@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
-			${WRKSRC}/configure
-
-post-extract:
-		@${ECHO_CMD} export QMAKESPEC=${QMAKESPEC}
-
-do-configure:
-		@${ECHO_CMD} CONFIGURE_ENV: ${CONFIGURE_ENV}
-		@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-			./configure ${CONFIG}
-		@${ECHO_CMD} MAKE_ENV: ${MAKE_ENV}
-		@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} qmake \
-			-spec ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ \
-			mythtv.pro
+			${WRKSRC}/libs/libmythtv/libmythtv.pro \
+			${WRKSRC}/libs/libavformat/libavformat.pro \
+			${WRKSRC}/bindings/perl/MythTV/Recording.pm \
+			${WRKSRC}/programs/mythtranscode/replex/Makefile.standalone \
+			${WRKSRC}/programs/scripts/database/mythconverg_backup.pl
 
 post-install:
 		@${INSTALL} -d ${PREFIX}/share/mythtv/database