Update tunapie to 2.6.18, for fixes CVE-2009-1253 and CVE-2009-1254.

2.6.18

Fix recording problem with Icecast.
Add totem and amarok as optional players.

2.1.17

Improve GUI responsiveness when playing radio stations

2.1.16

Fix security issue with use of os.system, commands and non-secure tempfiles

2.1.15

Fix minimal wx version back to 2.6

2.1.14

Fix errors with wxGTK 2.8.
Fix startup error if Geom file corrupted.

2.1.13

play icecast stations correctly

2.1.12

Fix bug where radiolist is not always refreshed correctly.

2.1.11

Revert to deprecated code in prefs as new version not supported by wxpython 2.6!

2.1.10

Fix icecast directory.
Fix deprecation warnings for wxpython 2.8

2.1.9

Fix problem with GUI breakage when right clicking before download finished.
Fix xcb_lock errors.

2.1.8

Fix to allow realplayer to play user-added streams.

2.1.7

Another record bug fixed (thanks Chris O'Halloran!)
Added option to add user-defined streams.

3 files changed, 46 insertions, 33 deletions

diff --git a/audio/tunapie/Makefile b/audio/tunapie/Makefile
index d346be41142..528f9b8c841 100644
--- a/audio/tunapie/Makefile
+++ b/audio/tunapie/Makefile
@@ -1,38 +1,48 @@
-# $NetBSD: Makefile,v 1.12 2011/04/22 13:43:00 obache Exp $
+# $NetBSD: Makefile,v 1.13 2011/09/18 11:58:48 obache Exp $
 #
 
-DISTNAME=	tunapie-2.1.6
-PKGREVISION=	9
+DISTNAME=	tunapie-2.1.18
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tunapie/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://tunapie.sourceforge.net/
 COMMENT=	Directory browser for Internet radio and TV streams
+LICENSE=	gnu-gpl-v2
 
-PKG_DESTDIR_SUPPORT=	user-destdir
+DEPENDS+=	${PYPKGPREFIX}-wxWidgets>=2.6:../../x11/py-wxWidgets
 
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=	# none
-PYTHON_PATCH_SCRIPTS=		src/*.py
-PY_PATCHPLIST=			yes
 
-INSTALLATION_DIRS=	bin share/tunapie ${PKGMANDIR}/man1
+SUBST_CLASSES+=		fixpaths
+SUBST_STAGE.fixpaths=	do-configure
+SUBST_FILES.fixpaths=	tunapie
+SUBST_SED.fixpaths=	-e 's|python|${PYTHONBIN}|'
+SUBST_SED.fixpaths+=	-e 's|/usr/local|${PREFIX}|g'
+
+SUBST_CLASSES+=		sysconfdir
+SUBST_STAGE.sysconfdir=	do-configure
+SUBST_FILES.sysconfdir=	src/tuner.py
+SUBST_SED.sysconfdir=	-e 's|/etc|${PKG_SYSCONFDIR}|g'
+
+INSTALLATION_DIRS=	bin share/applications share/pixmaps share/tunapie
+INSTALLATION_DIRS+=	${PKGMANDIR}/man1
+
+
+# Refer ${WRKSRC}/install.sh for build&install.
+do-build:
+	${RUN}cd ${WRKSRC};${PYTHONBIN} src/compile
 
 do-install:
-	${PYTHONBIN} ${WRKSRC}/src/compile
-	${INSTALL_SCRIPT} ${WRKSRC}/src/*.py* ${DESTDIR}${PREFIX}/share/tunapie/
-	${INSTALL_DATA} ${WRKSRC}/src/*.xpm ${DESTDIR}${PREFIX}/share/tunapie/
+	${INSTALL_SCRIPT} ${WRKSRC}/tunapie ${DESTDIR}${PREFIX}/bin/
+	${INSTALL_DATA} ${WRKSRC}/src/*.py* ${DESTDIR}${PREFIX}/share/tunapie/
 	${INSTALL_DATA} ${WRKSRC}/src/*.png ${DESTDIR}${PREFIX}/share/tunapie/
+	${INSTALL_DATA} ${WRKSRC}/src/*.xpm ${DESTDIR}${PREFIX}/share/pixmaps/
 	${INSTALL_MAN} ${WRKSRC}/tunapie.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	${ECHO} "#!/bin/sh" > ${WRKSRC}/tunapie.sh
-	${ECHO} "${PYTHONBIN} ${PREFIX}/share/tunapie/Tunapie.py" >> \
-		${WRKSRC}/tunapie.sh
-	${INSTALL_SCRIPT} ${WRKSRC}/tunapie.sh ${DESTDIR}${PREFIX}/bin/tunapie
+	${INSTALL_DATA} ${WRKSRC}/tunapie.desktop ${DESTDIR}${PREFIX}/share/applications
 
 .include "../../lang/python/application.mk"
-.include "../../lang/python/extension.mk"
-.include "../../x11/py-wxWidgets/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/tunapie/PLIST b/audio/tunapie/PLIST
index 4854a21f5f8..744cc502247 100644
--- a/audio/tunapie/PLIST
+++ b/audio/tunapie/PLIST
@@ -1,18 +1,12 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:32:23 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2011/09/18 11:58:48 obache Exp $
 bin/tunapie
 man/man1/tunapie.1
-share/tunapie/fave.png
-share/tunapie/find.png
-share/tunapie/info.png
-share/tunapie/play.png
-share/tunapie/radio.png
-share/tunapie/rec.png
-share/tunapie/remfave.png
-share/tunapie/stop.png
-share/tunapie/tplogo.xpm
-share/tunapie/tv.png
+share/applications/tunapie.desktop
+share/pixmaps/tplogo.xpm
 share/tunapie/AboutTuner.py
 share/tunapie/AboutTuner.pyc
+share/tunapie/AddStream.py
+share/tunapie/AddStream.pyc
 share/tunapie/RecordQueue.py
 share/tunapie/RecordQueue.pyc
 share/tunapie/RecordTime.py
@@ -25,7 +19,16 @@ share/tunapie/TunerInfoDialog.py
 share/tunapie/TunerInfoDialog.pyc
 share/tunapie/TunerPrefs.py
 share/tunapie/TunerPrefs.pyc
+share/tunapie/fave.png
+share/tunapie/find.png
+share/tunapie/info.png
+share/tunapie/play.png
+share/tunapie/radio.png
+share/tunapie/rec.png
+share/tunapie/remfave.png
+share/tunapie/stop.png
 share/tunapie/tunapie2_main.py
 share/tunapie/tunapie2_main.pyc
 share/tunapie/tuner.py
 share/tunapie/tuner.pyc
+share/tunapie/tv.png
diff --git a/audio/tunapie/distinfo b/audio/tunapie/distinfo
index e1f559dc791..b36b3c459fb 100644
--- a/audio/tunapie/distinfo
+++ b/audio/tunapie/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/05/01 16:06:16 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2011/09/18 11:58:48 obache Exp $
 
-SHA1 (tunapie-2.1.6.tar.gz) = 6deb303c03b3fad432162adec4efae1338d9de4b
-RMD160 (tunapie-2.1.6.tar.gz) = d8387198d09c3767165b7e11dcb99d6c2b798b53
-Size (tunapie-2.1.6.tar.gz) = 48717 bytes
+SHA1 (tunapie-2.1.18.tar.gz) = 1642980ffb491105908a9b873e866ef3831bdbb0
+RMD160 (tunapie-2.1.18.tar.gz) = 463f4ba1f2017788855ba6ba1255e8f09ed8a24b
+Size (tunapie-2.1.18.tar.gz) = 49496 bytes