- Updated to 0.21

- Fixed user handling
- Added entry to UPDATING for 0.21 to 0.21 version upgrade
- Enable build on amd64
- Unbreak, undeprecate, and unexpire

PR:		ports/126343
Submitted by:	Anders Troback <freebsd at troback dot com>

1 files changed, 35 insertions, 24 deletions

diff --git a/multimedia/mythtv/Makefile b/multimedia/mythtv/Makefile
index dac32886d836..68891da39855 100644
--- a/multimedia/mythtv/Makefile
+++ b/multimedia/mythtv/Makefile
@@ -7,13 +7,12 @@
 # $FreeBSD$
 
 PORTNAME=	mythtv
-PORTVERSION=	0.20
-PORTREVISION=	3
+PORTVERSION=	0.21
 CATEGORIES=	multimedia
-MASTER_SITES=	http://chuggalug.clues.com/mythtv/
-DISTNAME=	mythtv-fixes-0.20-13053
+MASTER_SITES=	ftp://ftp.osuosl.org/pub/mythtv/ \
+		LOCAL/glarkin
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	glarkin@FreeBSD.org
 COMMENT=	MythTV is a homebrew PVR project
 
 LIB_DEPENDS=	mp3lame.0:${PORTSDIR}/audio/lame \
@@ -24,21 +23,28 @@ RUN_DEPENDS=	tv_check:${PORTSDIR}/textproc/p5-xmltv \
 		${LOCALBASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt-mysql-plugin \
 		wget:${PORTSDIR}/ftp/wget
 
-BROKEN=		Incorrect handling of user addition
-DEPRECATED=	Has been broken for more than 6 months
-EXPIRATION_DATE=2009-03-31
-
-ONLY_FOR_ARCHS= i386
+ONLY_FOR_ARCHS= i386 amd64
 USE_BZIP2=	yes
 USE_QT_VER=	3
 USE_MYSQL=	51
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	QMAKESPEC="${QMAKESPEC}" \
 		CFLAGS="${CFLAGS}"
 MAKE_ENV=	QTDIR="${QT_PREFIX}" QMAKESPEC="${QMAKESPEC}"
 USE_RC_SUBR=	mythbackend
+USE_LDCONFIG=	${PREFIX}/lib/mythtv/filters
+
+CONFLICTS=	mythtv-frontend-[0-9]* mythtv-themes-[0-9]*
+
+MYTHTVUSER?=	mythtv
+MYTHTVGROUP?=	mythtv
+MYTHTVUID?=	119
+MYTHTVGID?=	${MYTHTVUID}
+MYTHTVDIR?=	/nonexistent
 
-CONFIG=		--enable-xvmc --enable-opengl-vsync \
+CONFIG=		--enable-xvmc --enable-opengl-vsync --disable-directfb \
+		--disable-ivtv \
 		--disable-xvmc-pro --disable-xvmc-vld --disable-xvmcw  \
 		--prefix=${PREFIX} --extra-cflags=-g --extra-cxxflags=-g
 
@@ -46,25 +52,31 @@ CONFIGURE_ARGS=	--with-qt-dir=${LOCALBASE} ${CONFIG}
 
 QMAKESPEC?=	${LOCALBASE}/share/qt/mkspecs/freebsd-g++
 
-OPTIONS=	LIRC	"Native LIRC Support" 	Off
-OPTIONS+=       MYSQL_LOCAL "RUN_DEPEND on selected MySQL server" off
+OPTIONS=	LIRC		"Native LIRC Support" Off \
+		MYSQL_LOCAL	"RUN_DEPEND on selected MySQL server" Off
 
 .include <bsd.port.pre.mk>
 
+SUB_LIST=	MYTHTVDIR=${MYTHTVDIR} \
+		MYTHTVUSER=${MYTHTVUSER} \
+		MYTHTVGROUP=${MYTHTVGROUP} \
+		MYTHTVUID=${MYTHTVUID} \
+		MYTHTVGID=${MYTHTVGID} \
+		PREFIX=${PREFIX} DATADIR=${DATADIR} \
+		PW=${PW}
+
+SUB_FILES=	pkg-install pkg-deinstall pkg-message
+
 .if defined(WITH_LIRC)
-LIB_DEPENDS+=  lirc_client.1:${PORTSDIR}/comms/lirc
+LIB_DEPENDS+=	lirc_client.1:${PORTSDIR}/comms/lirc
 # EXTRA_PATCHES= ${FILESDIR}/patchsettings-lirc
 .endif
 
 .if defined(WITH_MYSQL_LOCAL)
-RUN_DEPENDS+=  mysqld:${PORTSDIR}/databases/${MYSQL_VER}-server
+RUN_DEPENDS+=	mysqld_safe:${PORTSDIR}/databases/mysql${MYSQL_VER}-server
 .endif
 
 post-extract:
-		${ECHO_CMD} 'const char *myth_source_version = "FreeBSD Ports Collection' \
-			`pwd`, MythTV version ${PORTVERSION} "`date`\";" \
-			> ${WRKSRC}/programs/mythfrontend/version.cpp
-		${CP} -p ${WRKSRC}/programs/mythfrontend/version.cpp  ${WRKSRC}/programs/mythbackend
 		${ECHO_CMD} export QMAKESPEC=${QMAKESPEC}
 
 do-configure:
@@ -74,10 +86,9 @@ do-configure:
 			-spec ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ mythtv.pro
 
 post-install:
-		${MKDIR} ${PREFIX}/share/mythtv/database
-		${CP} ${WRKSRC}/database/mc.sql ${PREFIX}/share/mythtv/database
-		${CP} ${WRKSRC}/programs/mythtv-setup/mythtv-setup ${PREFIX}/bin/mythtv-setup
-		${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-		${MKDIR} ${PREFIX}/share/mythtv/database
+		@${INSTALL} -d ${PREFIX}/share/mythtv/database
+		@${CP} ${WRKSRC}/database/mc.sql ${PREFIX}/share/mythtv/database
+		@${CP} ${WRKSRC}/programs/mythtv-setup/mythtv-setup ${PREFIX}/bin/mythtv-setup
+		@${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.post.mk>