diff -ruN --exclude=CVS /usr/ports/multimedia/tunapie/Makefile /usr/ports/multimedia/tunapie.update-1.2/Makefile
--- /usr/ports/multimedia/tunapie/Makefile	Sat Oct 21 11:57:46 2006
+++ /usr/ports/multimedia/tunapie.update-1.2/Makefile	Sun Nov 12 23:39:42 2006
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	tunapie
-PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTVERSION=	1.2
 CATEGORIES=	multimedia audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,12 +15,13 @@
 COMMENT=	Tuner for streaming internet radio and TV
 
 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 \
 		xmms:${PORTSDIR}/multimedia/xmms
 
 NO_BUILD=	yes
 USE_PYTHON=	yes
+USE_WX=	2.6
+USE_COMPS=	python_run
 
 OPTIONS=	ADULT	"non-censored TV listings" off \
 		XINE	"use xine instead of mplayer" off
@@ -41,8 +41,7 @@
 		-e 's|%%MANPREFIX%%|${MANPREFIX}|g' \
 		-e 's|%%PREFIX%%|${PREFIX}|g' \
 		-e 's|%%VIDEOPLAYER%%|${VIDEOPLAYER}|g' \
-		-e 's|%%X11BASE%%|${X11BASE}|g' \
-		-e 's|wxversion.select("2.6")|wxversion.select("${WX_PYTHON_DIR:S/^wx-//g}")|g' {} \;
+		-e 's|%%X11BASE%%|${X11BASE}|g' {} ";"
 
 do-install:
 	${MKDIR} ${DATADIR}
@@ -61,12 +60,6 @@
 .else
 RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
 VIDEOPLAYER=	${LOCALBASE}/bin/mplayer
-.endif
-
-.if defined(WITH_UNICODE) && (${OSVERSION} > 500000)
-WX_PYTHON_DIR=	wx-2.6-gtk2-unicode
-.else
-WX_PYTHON_DIR=	wx-2.6-gtk2-ansi
 .endif
 
 .include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/multimedia/tunapie/distinfo /usr/ports/multimedia/tunapie.update-1.2/distinfo
--- /usr/ports/multimedia/tunapie/distinfo	Thu Oct  5 11:30:06 2006
+++ /usr/ports/multimedia/tunapie.update-1.2/distinfo	Sun Nov 12 23:07:40 2006
@@ -1,3 +1,3 @@
-MD5 (tunapie-1.1.1.tar.gz) = 951f24890401db696e61578d054aa233
-SHA256 (tunapie-1.1.1.tar.gz) = 86edd3f3630827b26ff8cf7dbbd44d4e953aa07d5dd8eb016b82e71e44db7108
-SIZE (tunapie-1.1.1.tar.gz) = 39149
+MD5 (tunapie-1.2.tar.gz) = f25dd1d4f18a9f55920301f747ede457
+SHA256 (tunapie-1.2.tar.gz) = a7a000fccc5eec79b362ae142872560178ee187c4894c8a782fc6370bb30db1a
+SIZE (tunapie-1.2.tar.gz) = 39279
diff -ruN --exclude=CVS /usr/ports/multimedia/tunapie/files/patch-install.sh /usr/ports/multimedia/tunapie.update-1.2/files/patch-install.sh
--- /usr/ports/multimedia/tunapie/files/patch-install.sh	Sat Oct 21 11:57:46 2006
+++ /usr/ports/multimedia/tunapie.update-1.2/files/patch-install.sh	Sun Nov 12 23:10:36 2006
@@ -1,5 +1,5 @@
---- install.sh	Sat Sep 30 01:02:29 2006
-+++ install.sh.port	Wed Oct 18 14:18:49 2006
+--- install.sh	Sat Nov 11 21:19:00 2006
++++ install.sh.port	Sun Nov 12 23:10:26 2006
 @@ -1,11 +1,9 @@
  #!/bin/sh
 -if [ "$1" = "--adult" ]; then echo '1'>/etc/tunapie.config 
diff -ruN --exclude=CVS /usr/ports/multimedia/tunapie/pkg-plist /usr/ports/multimedia/tunapie.update-1.2/pkg-plist
--- /usr/ports/multimedia/tunapie/pkg-plist	Sat Oct 21 11:57:46 2006
+++ /usr/ports/multimedia/tunapie.update-1.2/pkg-plist	Sun Nov 12 23:37:12 2006
@@ -24,4 +24,4 @@
 %%DATADIR%%/tuner.pyc
 %%DESKTOPDIR%%/tunapie.desktop
 @dirrm %%DATADIR%%
-@dirrmtry share/applications
+@dirrmtry %%DESKTOPDIR%%