From owner-svn-ports-head@FreeBSD.ORG Thu Nov 1 14:47:38 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1F335B9D; Thu, 1 Nov 2012 14:47:38 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 06E9E8FC15; Thu, 1 Nov 2012 14:47:38 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id qA1ElbLC014115; Thu, 1 Nov 2012 14:47:37 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA1Elbta014109; Thu, 1 Nov 2012 14:47:37 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201211011447.qA1Elbta014109@svn.freebsd.org> From: Pawel Pekala Date: Thu, 1 Nov 2012 14:47:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306808 - in head/audio/py-karaoke: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Nov 2012 14:47:38 -0000 Author: pawel Date: Thu Nov 1 14:47:37 2012 New Revision: 306808 URL: http://svn.freebsd.org/changeset/ports/306808 Log: - Update to version 0.7.5 - Add optional run dependency on audio/py-mutagen - Install additional fonts - Add LICENSE PR: ports/172217 Submitted by: KATO Tsuguru Feature safe: yes Added: head/audio/py-karaoke/files/patch-setup.py (contents, props changed) Modified: head/audio/py-karaoke/Makefile head/audio/py-karaoke/distinfo head/audio/py-karaoke/files/patch-setup.cfg head/audio/py-karaoke/pkg-plist Modified: head/audio/py-karaoke/Makefile ============================================================================== --- head/audio/py-karaoke/Makefile Thu Nov 1 14:47:20 2012 (r306807) +++ head/audio/py-karaoke/Makefile Thu Nov 1 14:47:37 2012 (r306808) @@ -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 + +.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 Modified: head/audio/py-karaoke/distinfo ============================================================================== --- head/audio/py-karaoke/distinfo Thu Nov 1 14:47:20 2012 (r306807) +++ head/audio/py-karaoke/distinfo Thu Nov 1 14:47:37 2012 (r306808) @@ -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 Modified: head/audio/py-karaoke/files/patch-setup.cfg ============================================================================== --- head/audio/py-karaoke/files/patch-setup.cfg Thu Nov 1 14:47:20 2012 (r306807) +++ head/audio/py-karaoke/files/patch-setup.cfg Thu Nov 1 14:47:37 2012 (r306808) @@ -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 Added: head/audio/py-karaoke/files/patch-setup.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/py-karaoke/files/patch-setup.py Thu Nov 1 14:47:37 2012 (r306808) @@ -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: Modified: head/audio/py-karaoke/pkg-plist ============================================================================== --- head/audio/py-karaoke/pkg-plist Thu Nov 1 14:47:20 2012 (r306807) +++ head/audio/py-karaoke/pkg-plist Thu Nov 1 14:47:37 2012 (r306808) @@ -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