4 files changed, 64 insertions, 25 deletions

diff --git a/audio/py-karaoke/Makefile b/audio/py-karaoke/Makefile
index 133992ab73dd..09c0a9ab2bd4 100644
--- a/audio/py-karaoke/Makefile
+++ b/audio/py-karaoke/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	karaoke
-PORTVERSION=	0.4.1
+PORTVERSION=	0.5
 CATEGORIES=	audio python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pykaraoke
@@ -16,14 +16,14 @@ DISTNAME=	pykaraoke-${PORTVERSION}
 MAINTAINER=	ocean@mail.gr
 COMMENT=	Python karaoke application (Plays CD+G, MP3+G, OGG+G files)
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game \
-		${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric \
-		${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric
 
+USE_WX=	2.4+
+WX_COMPS=	python
 USE_ZIP=	yes
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-USE_PYTHON_PREFIX=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/py-karaoke/distinfo b/audio/py-karaoke/distinfo
index 2a318461845a..fd460ac388cb 100644
--- a/audio/py-karaoke/distinfo
+++ b/audio/py-karaoke/distinfo
@@ -1,3 +1,3 @@
-MD5 (pykaraoke-0.4.1.zip) = 2df337fd7a7189d6710e4c08a1c7f0dd
-SHA256 (pykaraoke-0.4.1.zip) = b1c24a0affc740c30d712da99af7f09615356afa483f6cc587443f4c2e2ecc86
-SIZE (pykaraoke-0.4.1.zip) = 95379
+MD5 (pykaraoke-0.5.zip) = 1e05f284c7c6a8fac4024cddf77a5b63
+SHA256 (pykaraoke-0.5.zip) = a67b6f447419d5ad020726c6489ee60e1bcb18f8bee867527df7c8e18704daf9
+SIZE (pykaraoke-0.5.zip) = 817895
diff --git a/audio/py-karaoke/files/patch-setup.cfg b/audio/py-karaoke/files/patch-setup.cfg
new file mode 100644
index 000000000000..833649678f83
--- /dev/null
+++ b/audio/py-karaoke/files/patch-setup.cfg
@@ -0,0 +1,9 @@
+--- setup.cfg.orig	Sun Nov 26 02:16:44 2006
++++ setup.cfg	Sun Nov 26 02:16:23 2006
+@@ -4,4 +4,5 @@
+ requires=python,pygame,numeric,wxpython,timidity,freepats
+ 
+ [build_ext]
+-include_dirs = /usr/include/SDL
++include_dirs = /usr/local/include/SDL
++library_dirs = /usr/local/lib
diff --git a/audio/py-karaoke/pkg-plist b/audio/py-karaoke/pkg-plist
index 1708945c41b3..c245ea484cff 100644
--- a/audio/py-karaoke/pkg-plist
+++ b/audio/py-karaoke/pkg-plist
@@ -1,27 +1,57 @@
 bin/pycdg
 bin/pykar
 bin/pykaraoke
+bin/pykaraoke_mini
 bin/pympg
-lib/python2.4/site-packages/pycdg.py
-lib/python2.4/site-packages/pycdg.pyc
-lib/python2.4/site-packages/pycdg.pyo
-lib/python2.4/site-packages/pykar.py
-lib/python2.4/site-packages/pykar.pyc
-lib/python2.4/site-packages/pykar.pyo
-lib/python2.4/site-packages/pykaraoke.py
-lib/python2.4/site-packages/pykaraoke.pyc
-lib/python2.4/site-packages/pykaraoke.pyo
-lib/python2.4/site-packages/pykversion.py
-lib/python2.4/site-packages/pykversion.pyc
-lib/python2.4/site-packages/pykversion.pyo
-lib/python2.4/site-packages/pympg.py
-lib/python2.4/site-packages/pympg.pyc
-lib/python2.4/site-packages/pympg.pyo
-share/pykaraoke/fonts/vera.ttf
+%%PYTHON_SITELIBDIR%%/_pycdgAux.so
+%%PYTHON_SITELIBDIR%%/pycdg.py
+%%PYTHON_SITELIBDIR%%/pycdg.pyc
+%%PYTHON_SITELIBDIR%%/pycdg.pyo
+%%PYTHON_SITELIBDIR%%/pycdgAux.py
+%%PYTHON_SITELIBDIR%%/pycdgAux.pyc
+%%PYTHON_SITELIBDIR%%/pycdgAux.pyo
+%%PYTHON_SITELIBDIR%%/pykar.py
+%%PYTHON_SITELIBDIR%%/pykar.pyc
+%%PYTHON_SITELIBDIR%%/pykar.pyo
+%%PYTHON_SITELIBDIR%%/pykaraoke.py
+%%PYTHON_SITELIBDIR%%/pykaraoke.pyc
+%%PYTHON_SITELIBDIR%%/pykaraoke.pyo
+%%PYTHON_SITELIBDIR%%/pykaraoke_mini.py
+%%PYTHON_SITELIBDIR%%/pykaraoke_mini.pyc
+%%PYTHON_SITELIBDIR%%/pykaraoke_mini.pyo
+%%PYTHON_SITELIBDIR%%/pykconstants.py
+%%PYTHON_SITELIBDIR%%/pykconstants.pyc
+%%PYTHON_SITELIBDIR%%/pykconstants.pyo
+%%PYTHON_SITELIBDIR%%/pykdb.py
+%%PYTHON_SITELIBDIR%%/pykdb.pyc
+%%PYTHON_SITELIBDIR%%/pykdb.pyo
+%%PYTHON_SITELIBDIR%%/pykenv.py
+%%PYTHON_SITELIBDIR%%/pykenv.pyc
+%%PYTHON_SITELIBDIR%%/pykenv.pyo
+%%PYTHON_SITELIBDIR%%/pykmanager.py
+%%PYTHON_SITELIBDIR%%/pykmanager.pyc
+%%PYTHON_SITELIBDIR%%/pykmanager.pyo
+%%PYTHON_SITELIBDIR%%/pykplayer.py
+%%PYTHON_SITELIBDIR%%/pykplayer.pyc
+%%PYTHON_SITELIBDIR%%/pykplayer.pyo
+%%PYTHON_SITELIBDIR%%/pykversion.py
+%%PYTHON_SITELIBDIR%%/pykversion.pyc
+%%PYTHON_SITELIBDIR%%/pykversion.pyo
+%%PYTHON_SITELIBDIR%%/pympg.py
+%%PYTHON_SITELIBDIR%%/pympg.pyc
+%%PYTHON_SITELIBDIR%%/pympg.pyo
+share/applications/pykaraoke.desktop
+share/applications/pykaraoke_mini.desktop
+share/pykaraoke/fonts/DejaVuSans.ttf
+share/pykaraoke/fonts/DejaVuSansCondensed-Bold.ttf
+share/pykaraoke/fonts/DejaVuSansCondensed.ttf
 share/pykaraoke/icons/audio_16.png
 share/pykaraoke/icons/folder_close_16.png
 share/pykaraoke/icons/folder_open_16.png
-share/pykaraoke/icons/note.ico
+share/pykaraoke/icons/microphone.ico
+share/pykaraoke/icons/pykaraoke.xpm
+share/pykaraoke/icons/splash.jpg
+@dirrmtry share/applications
 @dirrm share/pykaraoke/icons
 @dirrm share/pykaraoke/fonts
 @dirrm share/pykaraoke