From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Aug 19 16:10:18 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C033E16A4E0 for ; Sat, 19 Aug 2006 16:10:18 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 10D3E43D58 for ; Sat, 19 Aug 2006 16:10:18 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k7JGAHl6063649 for ; Sat, 19 Aug 2006 16:10:17 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k7JGAHN3063648; Sat, 19 Aug 2006 16:10:17 GMT (envelope-from gnats) Resent-Date: Sat, 19 Aug 2006 16:10:17 GMT Resent-Message-Id: <200608191610.k7JGAHN3063648@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, nivit@email.it (Nicola Vitale) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0BB3F16A4DE for ; Sat, 19 Aug 2006 16:00:52 +0000 (UTC) (envelope-from nivit@email.it) Received: from vsmtp3.tin.it (vsmtp3alice.tin.it [212.216.176.143]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1E7CD43D55 for ; Sat, 19 Aug 2006 16:00:46 +0000 (GMT) (envelope-from nivit@email.it) Received: from fabula (87.8.164.75) by vsmtp3.tin.it (7.2.072.1) id 44C9C5AB00CD380F for FreeBSD-gnats-submit@freebsd.org; Sat, 19 Aug 2006 18:00:45 +0200 Received: (qmail 19584 invoked by uid 0); 19 Aug 2006 16:00:58 -0000 Message-Id: <20060819160058.19583.qmail@fabula> Date: 19 Aug 2006 16:00:58 -0000 From: nivit@email.it (Nicola Vitale) To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/102277: [MAINTAINER] multimedia/tunapie: update to 1.0.r4.3 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Aug 2006 16:10:18 -0000 >Number: 102277 >Category: ports >Synopsis: [MAINTAINER] multimedia/tunapie: update to 1.0.r4.3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Aug 19 16:10:17 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Nicola Vitale >Release: FreeBSD 6.1-STABLE i386 >Organization: >Environment: System: FreeBSD fabula.domo.sva 6.1-STABLE FreeBSD 6.1-STABLE #2: Sat Aug 5 13:02:14 CEST >Description: - Update to 1.0.r4.3 - Add knob WITH_XINE (vs mplayer) Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- tunapie-1.0.r4.3.patch begins here --- 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)) --- tunapie-1.0.r4.3.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: