From 4a84ce63dbcec7f58ea0094a6b075ea1c72a1885 Mon Sep 17 00:00:00 2001 From: Nicola Vitale Date: Wed, 26 Dec 2007 21:18:03 +0000 Subject: - Update to 2.1.2 - Add WITH_VLC option - Remove files/patch-src-compile --- multimedia/tunapie/Makefile | 24 +++++++++--------------- multimedia/tunapie/distinfo | 6 +++--- multimedia/tunapie/files/patch-src-compile | 17 ----------------- multimedia/tunapie/pkg-plist | 16 ++++++++++++++-- 4 files changed, 26 insertions(+), 37 deletions(-) delete mode 100644 multimedia/tunapie/files/patch-src-compile (limited to 'multimedia') diff --git a/multimedia/tunapie/Makefile b/multimedia/tunapie/Makefile index 83f210453d20..882cf24a7289 100644 --- a/multimedia/tunapie/Makefile +++ b/multimedia/tunapie/Makefile @@ -6,12 +6,11 @@ # PORTNAME= tunapie -PORTVERSION= 1.4.2 -PORTREVISION= 1 +PORTVERSION= 2.1.2 #PORTREVISION= 0 CATEGORIES= multimedia audio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF +DISTNAME= ${PORTNAME}-${PORTVERSION:S,.r,rc,} MAINTAINER= nivit@FreeBSD.org COMMENT= Tuner for streaming internet radio and TV @@ -21,10 +20,11 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/mx/__init__.py:${PORTSDIR}/lang/py-mx-base \ NO_BUILD= yes USE_PYTHON= yes -USE_WX= 2.6 +USE_WX= 2.6+ WX_COMPS= python:run OPTIONS= ADULT "non-censored TV listings" off \ + VLC "use vlc instead of mplayer" off \ XINE "use xine instead of mplayer" off \ AUDACIOUS "use audacious instead of xmms" off \ BEEP_MEDIA_PLAYER "use beep-media-player instead of xmms" off @@ -32,8 +32,6 @@ OPTIONS= ADULT "non-censored TV listings" off \ MAN1= tunapie.1 PLIST_SUB+= DESKTOPDIR="${DESKTOPDIR:S,^${PREFIX}/,,}" -WRKSRC= ${WRKDIR}/${DISTNAME:C/-rc4-3$/_rc4/} - FIND_FILES= -type f -and \( -name "install.sh" -or -name "*.py" \) post-patch: @@ -43,9 +41,8 @@ post-patch: -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ -e 's|%%MANPREFIX%%|${MANPREFIX}|g' \ -e 's|%%PREFIX%%|${PREFIX}|g' \ - -e 's|%%AUDIOPLAYER%%|${AUDIOPLAYER}|g' \ - -e 's|%%VIDEOPLAYER%%|${VIDEOPLAYER}|g' \ - -e 's|%%X11BASE%%|${X11BASE}|g' {} ";" + -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|g' \ + -e 's|%%PYTHON_LIBDIR%%|${PYTHON_LIBDIR}|g' {} ";" \ do-install: @${MKDIR} ${DESKTOPDIR} @@ -60,22 +57,19 @@ ADULT_TVLIST= --adult # default VIDEOPLAYER .if defined(WITH_XINE) RUN_DEPENDS+= xine:${PORTSDIR}/multimedia/xine -VIDEOPLAYER= ${X11BASE}/bin/xine +.elif defined(WITH_VLC) +RUN_DEPENDS+= vlc:${PORTSDIR}/multimedia/vlc .else RUN_DEPENDS+= mplayer:${PORTSDIR}/multimedia/mplayer -VIDEOPLAYER= ${LOCALBASE}/bin/mplayer .endif # default AUDIOPLAYER .if defined(WITH_AUDACIOUS) RUN_DEPENDS+= ${PREFIX}/lib/audacious/Container/libpls.so:${PORTSDIR}/multimedia/audacious-plugins -AUDIOPLAYER= ${LOCALBASE}/bin/audacious .elifdef(WITH_BEEP_MEDIA_PLAYER) RUN_DEPENDS+= beep-media-player:${PORTSDIR}/multimedia/beep-media-player -AUDIOPLAYER= ${LOCALBASE}/bin/beep-media-player .else RUN_DEPENDS+= xmms:${PORTSDIR}/multimedia/xmms -AUDIOPLAYER= ${X11BASE}/bin/xmms .endif .include diff --git a/multimedia/tunapie/distinfo b/multimedia/tunapie/distinfo index 480bee431de9..53b04bb70380 100644 --- a/multimedia/tunapie/distinfo +++ b/multimedia/tunapie/distinfo @@ -1,3 +1,3 @@ -MD5 (tunapie-1.4.2.tar.gz) = 0a5e344269ab3ef26ba56fa4c44fe7af -SHA256 (tunapie-1.4.2.tar.gz) = c3dab8b884eaf9874fde2dcaf79e1d3a084535f777bebe55e47b19b7e82e0b60 -SIZE (tunapie-1.4.2.tar.gz) = 40782 +MD5 (tunapie-2.1.2.tar.gz) = c739a60156d31a8238c3776f618795f2 +SHA256 (tunapie-2.1.2.tar.gz) = c7459b44c4c287dd80f62386e4d17d3f9eafe8ea5eb44580fd585a9824e8b77b +SIZE (tunapie-2.1.2.tar.gz) = 48546 diff --git a/multimedia/tunapie/files/patch-src-compile b/multimedia/tunapie/files/patch-src-compile deleted file mode 100644 index 3e627617891b..000000000000 --- a/multimedia/tunapie/files/patch-src-compile +++ /dev/null @@ -1,17 +0,0 @@ -$FreeBSD$ ---- src/compile Sun Jul 2 10:49:31 2006 -+++ src/compile.port Tue Jul 11 21:30:59 2006 -@@ -1 +1,12 @@ --import Tunapie -+import os, os.path, re -+from compiler import compileFile -+ -+def compile_tunapie(arg, dir, files): -+ for file in files: -+ path = os.path.join(dir, file) -+ path = os.path.normcase(path) -+ if re.search(r".*\.py$", path): -+ print " ==> Generating bytecode for " + path -+ compileFile(path) -+ -+os.path.walk('.', compile_tunapie, 0) diff --git a/multimedia/tunapie/pkg-plist b/multimedia/tunapie/pkg-plist index 1d44459ab553..0fa58c3881c8 100644 --- a/multimedia/tunapie/pkg-plist +++ b/multimedia/tunapie/pkg-plist @@ -3,23 +3,35 @@ bin/tunapie @unexec if cmp -s %D/etc/tunapie.config %D/etc/tunapie.config.default; then rm -f %D/etc/tunapie.config; fi etc/tunapie.config.default @exec [ -f %B/tunapie.config ] || cp %B/%f %B/tunapie.config +share/pixmaps/tplogo.xpm %%DATADIR%%/AboutTuner.py %%DATADIR%%/AboutTuner.pyc %%DATADIR%%/RecordQueue.py %%DATADIR%%/RecordQueue.pyc %%DATADIR%%/RecordTime.py %%DATADIR%%/RecordTime.pyc +%%DATADIR%%/TunaSearch.py +%%DATADIR%%/TunaSearch.pyc %%DATADIR%%/Tunapie.py %%DATADIR%%/Tunapie.pyc -%%DATADIR%%/TunerFrame1.py -%%DATADIR%%/TunerFrame1.pyc %%DATADIR%%/TunerInfoDialog.py %%DATADIR%%/TunerInfoDialog.pyc %%DATADIR%%/TunerPrefs.py %%DATADIR%%/TunerPrefs.pyc +%%DATADIR%%/fave.png +%%DATADIR%%/find.png +%%DATADIR%%/info.png %%DATADIR%%/pixmaps/tplogo.xpm +%%DATADIR%%/play.png +%%DATADIR%%/radio.png +%%DATADIR%%/rec.png +%%DATADIR%%/remfave.png +%%DATADIR%%/stop.png +%%DATADIR%%/tunapie2_main.py +%%DATADIR%%/tunapie2_main.pyc %%DATADIR%%/tuner.py %%DATADIR%%/tuner.pyc +%%DATADIR%%/tv.png %%DESKTOPDIR%%/tunapie.desktop @dirrm %%DATADIR%%/pixmaps @dirrm %%DATADIR%% -- cgit v1.2.3