From 555a86eae823708838620a02d8575cfc43726a7a Mon Sep 17 00:00:00 2001
From: obache <obache@pkgsrc.org>
Date: Sat, 10 Dec 2011 14:17:37 +0000
Subject: [PATCH] * convert some needless buildlink to simple DEPENDS. *
 distutils pkg, register egg-info.

Bump PKGREVISION.
---
 audio/py-karaoke/Makefile | 14 ++++++--------
 audio/py-karaoke/PLIST    |  3 ++-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/audio/py-karaoke/Makefile b/audio/py-karaoke/Makefile
index 64c52fc4e97e..4eccb30bc7da 100644
--- a/audio/py-karaoke/Makefile
+++ b/audio/py-karaoke/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2011/11/01 06:00:40 sbd Exp $
+# $NetBSD: Makefile,v 1.20 2011/12/10 14:17:37 obache Exp $
 #
 
 DISTNAME=	pykaraoke-0.7.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pykaraoke/}
 EXTRACT_SUFX=	.zip
@@ -15,11 +15,12 @@ LICENSE=	gnu-lgpl-v2.1
 
 # for .kar files, untested for lack of files
 #DEPENDS+=	timidity-[0-9]*:../../audio/timidity
+DEPENDS+=	${PYPKGPREFIX}-wxWidgets>=2.6:../../x11/py-wxWidgets
+DEPENDS+=	${PYPKGPREFIX}-mutagen-[0-9]*:../../audio/py-mutagen
+DEPENDS+=	${PYPKGPREFIX}-Numeric-[0-9]*:../../math/py-Numeric
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-PYDISTUTILSPKG=	yes
-
 REPLACE_PYTHON+=	performer_prompt.py
 REPLACE_PYTHON+=	pycdg.py
 REPLACE_PYTHON+=	pykar.py
@@ -36,11 +37,8 @@ REPLACE_PYTHON+=	pykaraoke_mini.py
 # supposedly needed, but I couldn't find out why
 #.include "../../audio/SDL_mixer/buildlink3.mk"
 #.include "../../devel/SDL/buildlink3.mk"
-.include "../../audio/py-mutagen/buildlink3.mk"
 .include "../../devel/py-game/buildlink3.mk"
 .include "../../lang/python/application.mk"
-.include "../../lang/python/extension.mk"
-.include "../../math/py-Numeric/buildlink3.mk"
+.include "../../lang/python/distutils.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/py-wxWidgets/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/py-karaoke/PLIST b/audio/py-karaoke/PLIST
index 61c6665630aa..429094be9db9 100644
--- a/audio/py-karaoke/PLIST
+++ b/audio/py-karaoke/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/09/09 14:10:58 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2011/12/10 14:17:37 obache Exp $
 bin/cdg2mpg
 bin/pycdg
 bin/pykar
@@ -18,6 +18,7 @@ ${PYSITELIB}/pycdgAux.pyo
 ${PYSITELIB}/pykar.py
 ${PYSITELIB}/pykar.pyc
 ${PYSITELIB}/pykar.pyo
+${PLIST.eggfile}${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/pykaraoke.py
 ${PYSITELIB}/pykaraoke.pyc
 ${PYSITELIB}/pykaraoke.pyo