ports/126343: Update port: multimedia/mythtv

Anders Troback freebsd at troback.com
Thu Aug 7 17:40:03 UTC 2008


>Number:         126343
>Category:       ports
>Synopsis:       Update port: multimedia/mythtv
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 07 17:40:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Anders Troback
>Release:        
>Organization:
>Environment:
>Description:
	Fix broken port and some cleanup!
>How-To-Repeat:
>Fix:

diff -ruN mythtv.org/Makefile mythtv/Makefile
--- mythtv.org/Makefile	2008-08-07 17:23:45.000000000 +0000
+++ mythtv/Makefile	2008-08-07 17:28:17.000000000 +0000
@@ -4,7 +4,7 @@
 # Whom:                                 Stacey Son <mythdev at son.org>
 #                                       Ari Maniatis <ari at ish.com.au>
 #
-# $FreeBSD: ports/multimedia/mythtv/Makefile,v 1.18 2008/08/07 08:58:30 linimon Exp $
+# $FreeBSD: ports/multimedia/mythtv/Makefile,v 1.17 2008/06/19 02:54:51 pav Exp $
 
 PORTNAME=	mythtv
 PORTVERSION=	0.20
@@ -24,11 +24,7 @@
 		${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=2008-09-19
-
-ONLY_FOR_ARCHS= i386
+ONLY_FOR_ARCHS=	i386
 USE_BZIP2=	yes
 USE_QT_VER=	3
 USE_MYSQL=	51
@@ -38,6 +34,12 @@
 MAKE_ENV=	QTDIR="${QT_PREFIX}" QMAKESPEC="${QMAKESPEC}"
 USE_RC_SUBR=	mythbackend
 
+MYTHTVUSER?=	mythtv
+MYTHTVGROUP?=	mythtv
+MYTHTVUID?=	119
+MYTHTVGID?=	${MYTHTVUID}
+MYTHTVDIR?=	/home/mythtv
+
 CONFIG=		--enable-xvmc --enable-opengl-vsync \
 		--disable-xvmc-pro --disable-xvmc-vld --disable-xvmcw  \
 		--prefix=${PREFIX} --extra-cflags=-g --extra-cxxflags=-g
@@ -47,17 +49,29 @@
 QMAKESPEC?=	${LOCALBASE}/share/qt/mkspecs/freebsd-g++
 
 OPTIONS=	LIRC	"Native LIRC Support" 	Off
-OPTIONS+=       MYSQL_LOCAL "RUN_DEPEND on selected MySQL server" off
+OPTIONS+=	MYSQL_LOCAL "RUN_DEPEND on selected MySQL server" off
 
 .include <bsd.port.pre.mk>
 
+PLIST_SUB=	MYTHTVDIR=${MYTHTVDIR} \
+		MYTHTVUSER=${MYTHTVUSER} \
+		MYTHTVGROUP=${MYTHTVGROUP} \
+		MYTHTVUID=${MYTHTVUID} \
+		MYTHTVGID=${MYTHTVGID}
+
+SUB_FILES=	pkg-install \
+		pkg-deinstall
+
+SUB_LIST=	PREFIX=${PREFIX} \
+		${PLIST_SUB}
+
 .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:${PORTSDIR}/databases/${MYSQL_VER}-server
 .endif
 
 post-extract:
diff -ruN mythtv.org/pkg-install mythtv/pkg-install
--- mythtv.org/pkg-install	2007-04-15 09:33:29.000000000 +0000
+++ mythtv/pkg-install	1970-01-01 00:00:00.000000000 +0000
@@ -1,91 +0,0 @@
-#!/bin/sh
-# $FreeBSD: ports/multimedia/mythtv/pkg-install,v 1.5 2007/04/15 09:33:29 grog Exp $
-
-PATH=/bin:/usr/sbin:/usr/bin:/usr/local/bin
-case $2 in
-POST-INSTALL)
-    USER=mythtv
-    GROUP=${USER}
-    UID=119
-    GID=${UID}
-    HOME=/home/mythtv
-
-    if pw group show "${GROUP}" 2>/dev/null; then
-	echo "You already have a group \"${GROUP}\", so I will use it."
-    else
-	if pw groupadd ${GROUP} -g ${GID}; then
-	    echo "Added group \"${GROUP}\"."
-	else
-	    echo "Adding group \"${GROUP}\" failed..."
-	    exit 1
-	fi
-    fi
-
-    if pw user show "${USER}" 2>/dev/null; then
-	echo "You already have a user \"${USER}\", so I will use it."
-    else
-	if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-	    -d ${HOME} -m -s /bin/sh -c "MythTV"
-	then
-	    echo "Added user \"${USER}\"."
-	    mkdir -p ${HOME}
-	    if [ $? -ne 0 ]; then
-		echo '*** Unable to create' ${HOME} '***'
-	    fi
-	else
-	    echo "Adding user \"${USER}\" failed..."
-	    exit 1
-	fi
-    fi
-
-# Now make the database
-    if [ -f /usr/local/etc/rc.d/mysql-server ]; then
-	pgrep mysqld > /dev/null
-	if [ $? -ne 0 ]; then
-	    /usr/local/etc/rc.d/mysql-server start
-	    if [ $? -ne 0 ]; then
-		echo '*** Unable to start mysqld'
-		exit 1
-	    else
-		pgrep mysqld > /dev/null
-	        if [ $? -ne 0 ]; then
-		    echo '*** Unable to start mysqld'
-		    exit 1
-		fi
-	    fi
-	fi
-	# Try to create the database
-	mysql < /usr/local/share/mythtv/database/mc.sql
-	if [ $? -ne 0 ]; then
-	  cat <<EOF
-*********************************************************************
-Database creation failed.  Please read the output above and create it
-manually.  The commands to create the database are in
-/usr/local/share/mythtv/database/mc.sql.
-*********************************************************************
-EOF
-	  else
-	    echo Created database mythconverg.	
-	fi
-    else
-	cat <<EOF
-
-No MySQL server found.	If you want to run the database on this
-machine, please install the latest MySQL server and then create the
-database with this command:
-
-    mysql < /usr/local/share/mythtv/database/mc.sql
-EOF
-
-    fi
-
-cat <<EOF
-
-To set up mythtv, first assign a password to user mythtv, then log in
-as mythtv and run
-
-    mythtv-setup
-EOF
-    ;;
-
-esac
diff -ruN mythtv.org/pkg-message mythtv/pkg-message
--- mythtv.org/pkg-message	2006-12-19 23:55:54.000000000 +0000
+++ mythtv/pkg-message	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-**********
-
-MythTV has now been installed, but it still needs to be configured.
-
-1.  To create the database, use the following command:
-
-	mysql -uroot -p < /usr/local/share/mythtv/database/mc.sql
-
-2.  Next, run mythtv-setup.
-
-See http://www.mythtv.org/docs/ for more information.
-
-**********
>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list