5 files changed, 87 insertions, 27 deletions

diff --git a/audio/py-karaoke/Makefile b/audio/py-karaoke/Makefile
index 5e943902527d..1a7269d1e45a 100644
--- a/audio/py-karaoke/Makefile
+++ b/audio/py-karaoke/Makefile
@@ -2,25 +2,64 @@
 # $FreeBSD$
 
 PORTNAME=	karaoke
-PORTVERSION=	0.5
-PORTREVISION=	6
+PORTVERSION=	0.7.5
 CATEGORIES=	audio python
 MASTER_SITES=	SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	pykaraoke-${PORTVERSION}
+DISTNAME=	py${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python karaoke application (Plays CD+G, MP3+G, OGG+G files)
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric
+LICENSE=	LGPL21 # (or later)
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game
+LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
+		aa:${PORTSDIR}/graphics/aalib \
+		xcb:${PORTSDIR}/x11/libxcb
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game \
+		dejavu>0:${PORTSDIR}/x11-fonts/dejavu \
+		${PYNUMPY}
+
+OPTIONS_DEFINE=	MUTAGEN
+MUTAGEN_DESC=	Enable Mutagen support
 
-USE_WX=	2.4+
-WX_COMPS=	python
 USE_ZIP=	yes
+USE_ICONV=	yes
+USE_SDL=	sdl
+USE_XORG=	x11 xau xdmcp
+USE_WX=		2.6+
+WX_COMPS=	python:lib
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-PYDISTUTILS_PKGNAME=	pykaraoke
+PYDISTUTILS_PKGNAME=	py${PORTNAME}
+
+DATADIR=	${PREFIX}/share/py${PORTNAME}
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MMUTAGEN}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mutagen>0:${PORTSDIR}/audio/py-mutagen
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/setup.cfg
+	@${REINPLACE_CMD} -e \
+		'/if /s|==|=|' ${WRKSRC}/install/cdg2mpg
+.for i in pykaraoke.desktop pykaraoke_mini.desktop
+	@${REINPLACE_CMD} -e \
+		'/^Encodings=/d ; \
+		 /^Icon=/s|/usr/share/pykaraoke|${DATADIR}| ; \
+		 /^MimeType=/s|audio/midi$$|audio/midi;| ; \
+		 /^Categories=/s|Application;||' ${WRKSRC}/install/${i}
+.endfor
+
+post-install:
+	@${MKDIR} ${DATADIR}/fonts
+.for i in DejaVuSans.ttf DejaVuSansCondensed-Bold.ttf DejaVuSansCondensed.ttf
+	@${LN} -sf ${LOCALBASE}/lib/X11/fonts/dejavu/${i} ${DATADIR}/fonts
+.endfor
 
 .include <bsd.port.mk>
diff --git a/audio/py-karaoke/distinfo b/audio/py-karaoke/distinfo
index 8028d8826f3b..67087db3f6f1 100644
--- a/audio/py-karaoke/distinfo
+++ b/audio/py-karaoke/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pykaraoke-0.5.zip) = a67b6f447419d5ad020726c6489ee60e1bcb18f8bee867527df7c8e18704daf9
-SIZE (pykaraoke-0.5.zip) = 817895
+SHA256 (pykaraoke-0.7.5.zip) = d2a5f02fd655ef32dba151324ce5f23be1bdac36603ade47870d28ce8e8430c6
+SIZE (pykaraoke-0.7.5.zip) = 872237
diff --git a/audio/py-karaoke/files/patch-setup.cfg b/audio/py-karaoke/files/patch-setup.cfg
index 55565f22a71c..1d2870b0d51e 100644
--- a/audio/py-karaoke/files/patch-setup.cfg
+++ b/audio/py-karaoke/files/patch-setup.cfg
@@ -1,9 +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 @@
+--- setup.cfg.orig	2011-06-15 03:59:31.000000000 +0900
++++ setup.cfg	2012-09-28 07:07:06.000000000 +0900
+@@ -27,4 +27,5 @@
  requires=python,pygame,numeric,wxpython,timidity,freepats
  
  [build_ext]
 -include_dirs = /usr/include/SDL
-+include_dirs = /usr/local/include:/usr/local/include/python2.4/:/usr/local/include/SDL
-+library_dirs = /usr/local/lib
++include_dirs = %%LOCALBASE%%/include/SDL
++library_dirs = %%LOCALBASE%%/lib
diff --git a/audio/py-karaoke/files/patch-setup.py b/audio/py-karaoke/files/patch-setup.py
new file mode 100644
index 000000000000..1183adc89e91
--- /dev/null
+++ b/audio/py-karaoke/files/patch-setup.py
@@ -0,0 +1,16 @@
+--- setup.py.orig	2011-06-15 03:59:31.000000000 +0900
++++ setup.py	2012-09-28 07:03:50.000000000 +0900
+@@ -61,12 +61,7 @@
+       'icons/microphone.ico',
+       'icons/microphone.png',
+       'icons/pykaraoke.xpm',
+-      'icons/splash.png']),
+-    ('share/pykaraoke/fonts', [
+-    'fonts/DejaVuSans.ttf',
+-    'fonts/DejaVuSansCondensed.ttf',
+-    'fonts/DejaVuSansCondensed-Bold.ttf',
+-    ])]
++      'icons/splash.png'])]
+ 
+ # These data files only make sense on Unix-like systems.
+ if env != ENV_WINDOWS:
diff --git a/audio/py-karaoke/pkg-plist b/audio/py-karaoke/pkg-plist
index c245ea484cff..e7643b9da158 100644
--- a/audio/py-karaoke/pkg-plist
+++ b/audio/py-karaoke/pkg-plist
@@ -1,9 +1,13 @@
+bin/cdg2mpg
 bin/pycdg
 bin/pykar
 bin/pykaraoke
 bin/pykaraoke_mini
 bin/pympg
 %%PYTHON_SITELIBDIR%%/_pycdgAux.so
+%%PYTHON_SITELIBDIR%%/performer_prompt.py
+%%PYTHON_SITELIBDIR%%/performer_prompt.pyc
+%%PYTHON_SITELIBDIR%%/performer_prompt.pyo
 %%PYTHON_SITELIBDIR%%/pycdg.py
 %%PYTHON_SITELIBDIR%%/pycdg.pyc
 %%PYTHON_SITELIBDIR%%/pycdg.pyo
@@ -42,16 +46,17 @@ bin/pympg
 %%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/microphone.ico
-share/pykaraoke/icons/pykaraoke.xpm
-share/pykaraoke/icons/splash.jpg
+%%DATADIR%%/fonts/DejaVuSans.ttf
+%%DATADIR%%/fonts/DejaVuSansCondensed-Bold.ttf
+%%DATADIR%%/fonts/DejaVuSansCondensed.ttf
+%%DATADIR%%/icons/audio_16.png
+%%DATADIR%%/icons/folder_close_16.png
+%%DATADIR%%/icons/folder_open_16.png
+%%DATADIR%%/icons/microphone.ico
+%%DATADIR%%/icons/microphone.png
+%%DATADIR%%/icons/pykaraoke.xpm
+%%DATADIR%%/icons/splash.png
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%/fonts
+@dirrm %%DATADIR%%
 @dirrmtry share/applications
-@dirrm share/pykaraoke/icons
-@dirrm share/pykaraoke/fonts
-@dirrm share/pykaraoke