From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Oct 1 18:10:03 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 73FCF1065719 for ; Mon, 1 Oct 2012 18:10:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 48F138FC0A for ; Mon, 1 Oct 2012 18:10:03 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q91IA3mp012874 for ; Mon, 1 Oct 2012 18:10:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q91IA3fB012873; Mon, 1 Oct 2012 18:10:03 GMT (envelope-from gnats) Resent-Date: Mon, 1 Oct 2012 18:10:03 GMT Resent-Message-Id: <201210011810.q91IA3fB012873@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 516C81065680 for ; Mon, 1 Oct 2012 18:00:31 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa102lp.auone-net.jp (msa102lp.auone-net.jp [222.3.140.165]) by mx1.freebsd.org (Postfix) with ESMTP id E04A98FC16 for ; Mon, 1 Oct 2012 18:00:30 +0000 (UTC) Received: from localhost.localdomain (ZT037251.ppp.dion.ne.jp [59.128.37.251]) by msa102lp.auone-net.jp (au one net msa) with ESMTP id 360794AC037 for ; Tue, 2 Oct 2012 03:00:16 +0900 (JST) Message-Id: <20121002025253.1669e853f6f783ba8989069d@yahoo.com> Date: Tue, 2 Oct 2012 02:52:53 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/172217: audio/py-karaoke: Update to version 0.7.5 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Oct 2012 18:10:03 -0000 X-List-Received-Date: Mon, 01 Oct 2012 18:10:03 -0000 X-List-Received-Date: Mon, 01 Oct 2012 18:10:03 -0000 >Number: 172217 >Category: ports >Synopsis: audio/py-karaoke: Update to version 0.7.5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Oct 01 18:10:02 UTC 2012 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.4-RELEASE-p10 i386 >Organization: >Environment: >Description: - Update to version 0.7.5 New file: files/patch-setup.py >How-To-Repeat: >Fix: diff -urN /usr/ports/audio/py-karaoke/Makefile audio/py-karaoke/Makefile --- /usr/ports/audio/py-karaoke/Makefile 2012-09-22 13:14:04.000000000 +0900 +++ audio/py-karaoke/Makefile 2012-09-28 07:34:08.000000000 +0900 @@ -2,25 +2,59 @@ # $FreeBSD: ports/audio/py-karaoke/Makefile,v 1.13 2012/09/22 04:14:04 tabthorpe Exp $ 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) + +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_SDL= sdl + +USE_WX= 2.6+ +WX_COMPS= python USE_PYTHON= yes USE_PYDISTUTILS= yes -PYDISTUTILS_PKGNAME= pykaraoke +PYDISTUTILS_PKGNAME= py${PORTNAME} + +DATADIR= ${PREFIX}/share/py${PORTNAME} + +.include + +.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 diff -urN /usr/ports/audio/py-karaoke/distinfo audio/py-karaoke/distinfo --- /usr/ports/audio/py-karaoke/distinfo 2011-03-19 21:28:55.000000000 +0900 +++ audio/py-karaoke/distinfo 2012-09-23 18:55:38.000000000 +0900 @@ -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 -urN /usr/ports/audio/py-karaoke/files/patch-setup.cfg audio/py-karaoke/files/patch-setup.cfg --- /usr/ports/audio/py-karaoke/files/patch-setup.cfg 2006-11-26 21:33:36.000000000 +0900 +++ audio/py-karaoke/files/patch-setup.cfg 2012-09-28 07:07:29.000000000 +0900 @@ -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 -urN /usr/ports/audio/py-karaoke/files/patch-setup.py audio/py-karaoke/files/patch-setup.py --- /usr/ports/audio/py-karaoke/files/patch-setup.py 1970-01-01 09:00:00.000000000 +0900 +++ audio/py-karaoke/files/patch-setup.py 2012-09-28 07:10:56.000000000 +0900 @@ -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 -urN /usr/ports/audio/py-karaoke/pkg-plist audio/py-karaoke/pkg-plist --- /usr/ports/audio/py-karaoke/pkg-plist 2006-11-26 21:33:03.000000000 +0900 +++ audio/py-karaoke/pkg-plist 2012-09-23 18:59:32.000000000 +0900 @@ -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 @@ %%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 >Release-Note: >Audit-Trail: >Unformatted: