diff -ruN --exclude=CVS /usr/ports/multimedia/tunapie/Makefile /usr/ports/multimedia/tunapie.update-1.0.r4/Makefile
--- /usr/ports/multimedia/tunapie/Makefile	Sun Jul 30 11:34:50 2006
+++ /usr/ports/multimedia/tunapie.update-1.0.r4/Makefile	Sat Aug 19 17:58:17 2006
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	tunapie
-PORTVERSION=	1.0.r3
+PORTVERSION=	1.0.r4.3
 CATEGORIES=	multimedia audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}_${PORTVERSION:S|.r3|_rc3|}
+DISTNAME=	${PORTNAME}_${PORTVERSION:S|.r4.3|-rc4-3|}
 
 MAINTAINER=	nivit@email.it
 COMMENT=	Tuner for streaming internet radio and TV
@@ -18,13 +18,15 @@
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/mx/__init__.py:${PORTSDIR}/lang/py-mx-base \
 		${PYTHON_SITELIBDIR}/${WX_PYTHON_DIR}/wxPython/_wx.py:${PORTSDIR}/x11-toolkits/py-wxPython26 \
 		streamripper:${PORTSDIR}/audio/streamripper \
-		xine:${PORTSDIR}/multimedia/xine \
 		xmms:${PORTSDIR}/multimedia/xmms
 
 NO_BUILD=	yes
 USE_PYTHON=	yes
 
-OPTIONS=	ADULT	"non-censored TV listings" off
+OPTIONS=	ADULT	"non-censored TV listings" off \
+		XINE	"use xine instead of mplayer" off
+
+WRKSRC=	${WRKDIR}/${DISTNAME:C/-rc4-3$/_rc4/}
 
 FIND_FILES=	-type f -and \( -name "install.sh" -or -name "*.py" \)
 
@@ -33,6 +35,7 @@
 		-e 's|%%DATADIR%%|${DATADIR}|g'\
 		-e 's|%%X11BASE%%|${X11BASE}|g'\
 		-e 's|%%PREFIX%%|${PREFIX}|g' \
+		-e 's|%%VIDEOPLAYER%%|${VIDEOPLAYER}|g' \
 		-e 's|wxversion.select("2.6")|wxversion.select("${WX_PYTHON_DIR:S/^wx-//g}")|g' {} \;
 
 do-install:
@@ -42,6 +45,14 @@
 
 .if defined(WITH_ADULT)
 ADULT_TVLIST=	--adult
+.endif
+
+.if defined(WITH_XINE)
+RUN_DEPENDS+=	xine:${PORTSDIR}/multimedia/xine
+VIDEOPLAYER=	${X11BASE}/bin/xine
+.else
+RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
+VIDEOPLAYER=	${LOCALBASE}/bin/mplayer
 .endif
 
 .if defined(WITH_UNICODE) && (${OSVERSION} > 500000)
diff -ruN --exclude=CVS /usr/ports/multimedia/tunapie/distinfo /usr/ports/multimedia/tunapie.update-1.0.r4/distinfo
--- /usr/ports/multimedia/tunapie/distinfo	Sun Jul 30 11:34:50 2006
+++ /usr/ports/multimedia/tunapie.update-1.0.r4/distinfo	Sat Aug 19 17:56:30 2006
@@ -1,3 +1,3 @@
-MD5 (tunapie_1.0_rc3.tar.gz) = b92d0929cbddd0a7252ba49d8e5646ba
-SHA256 (tunapie_1.0_rc3.tar.gz) = bc22079b6e486853588c81029e08d827c649a1b9914b721c73010e394e069e95
-SIZE (tunapie_1.0_rc3.tar.gz) = 39147
+MD5 (tunapie_1.0-rc4-3.tar.gz) = 849390775274b5cc6b31e8cc7dfd11cb
+SHA256 (tunapie_1.0-rc4-3.tar.gz) = 9792a1a960f3ddf2094b45c5aedc7b6cc239570bb4902ebcb1316afff36b2476
+SIZE (tunapie_1.0-rc4-3.tar.gz) = 41982
diff -ruN --exclude=CVS /usr/ports/multimedia/tunapie/files/patch-src-TunerFrame1.py /usr/ports/multimedia/tunapie.update-1.0.r4/files/patch-src-TunerFrame1.py
--- /usr/ports/multimedia/tunapie/files/patch-src-TunerFrame1.py	Wed Jul 12 21:44:58 2006
+++ /usr/ports/multimedia/tunapie.update-1.0.r4/files/patch-src-TunerFrame1.py	Sat Aug 19 17:47:24 2006
@@ -10,7 +10,7 @@
 -        self.term='/usr/bin/x-terminal-emulator'
 -        self.ripper='/usr/bin/streamripper -t -u winamp2 -o never'
 +        self.mediaplayer='%%X11BASE%%/bin/xmms'
-+        self.videoplayer='%%X11BASE%%/bin/xine'
++        self.videoplayer='%%VIDEOPLAYER%%'
 +        self.term='%%X11BASE%%/bin/xterm'
 +        self.ripper='%%LOCALBASE%%/bin/streamripper -t -u winamp2 -o never'
          self.rdir=self.home+'/.tunapie/streamripper'
diff -ruN --exclude=CVS /usr/ports/multimedia/tunapie/files/patch-src-TunerPrefs.py /usr/ports/multimedia/tunapie.update-1.0.r4/files/patch-src-TunerPrefs.py
--- /usr/ports/multimedia/tunapie/files/patch-src-TunerPrefs.py	Sun Jul 30 11:34:50 2006
+++ /usr/ports/multimedia/tunapie.update-1.0.r4/files/patch-src-TunerPrefs.py	Sat Aug 19 17:48:18 2006
@@ -14,7 +14,7 @@
          self.videopath = wx.TextCtrl(id=wxID_PREFERENCESVIDEOPATH,
                name='videopath', parent=self, pos=wx.Point(168, 48),
 -              size=wx.Size(200, 22), style=0, value='/usr/bin/mplayer')
-+              size=wx.Size(200, 22), style=0, value='%%X11BASE%%/bin/xine')
++              size=wx.Size(200, 22), style=0, value='%%VIDEOPLAYER%%')
          self.videopath.SetFont(wx.Font(7, 77, wx.NORMAL, wx.NORMAL, False,
                u'Sans'))
          self.videopath.SetBackgroundColour(wx.Colour(255, 253, 239))