From owner-svn-ports-head@freebsd.org Sat Oct 10 10:13:52 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 213C2A1009E; Sat, 10 Oct 2015 10:13:52 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EA6B71063; Sat, 10 Oct 2015 10:13:51 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9AADovO045205; Sat, 10 Oct 2015 10:13:50 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9AADo1b045203; Sat, 10 Oct 2015 10:13:50 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201510101013.t9AADo1b045203@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Sat, 10 Oct 2015 10:13:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r398985 - 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.20 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: Sat, 10 Oct 2015 10:13:52 -0000 Author: marino Date: Sat Oct 10 10:13:50 2015 New Revision: 398985 URL: https://svnweb.freebsd.org/changeset/ports/398985 Log: audio/py-karaoke: Fix runtime error on F9 PR: 199216 Submitted by: ports fury Deleted: head/audio/py-karaoke/pkg-plist Modified: head/audio/py-karaoke/Makefile head/audio/py-karaoke/files/patch-setup.py Modified: head/audio/py-karaoke/Makefile ============================================================================== --- head/audio/py-karaoke/Makefile Sat Oct 10 09:52:46 2015 (r398984) +++ head/audio/py-karaoke/Makefile Sat Oct 10 10:13:50 2015 (r398985) @@ -3,7 +3,7 @@ PORTNAME= karaoke PORTVERSION= 0.7.5 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= audio python MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,14 +14,14 @@ COMMENT= Python karaoke application (Pla LICENSE= LGPL21 # (or later) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game +BUILD_DEPENDS= ${PYGAME} LIB_DEPENDS= libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \ libaa.so:${PORTSDIR}/graphics/aalib -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game \ - dejavu>0:${PORTSDIR}/x11-fonts/dejavu \ +RUN_DEPENDS= dejavu>0:${PORTSDIR}/x11-fonts/dejavu \ + ${PYGAME} \ ${PYNUMPY} -USES= desktop-file-utils iconv python:2 zip +USES= compiler:c++11-lib desktop-file-utils iconv python:2 zip USE_SDL= sdl USE_XORG= x11 xau xcb xdmcp USE_WX= 3.0+ @@ -31,11 +31,24 @@ USE_PYTHON= distutils autoplist DATADIR= ${PREFIX}/share/py${PORTNAME} -OPTIONS_DEFINE= MUTAGEN +PLIST_FILES= ${BIN_SCRIPTS:S,^,bin/,} \ + ${DATA_FONTS:S,^,%%DATADIR%%/fonts/,} + +OPTIONS_DEFINE= MUTAGEN MUTAGEN_DESC= Mutagen support MUTAGEN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>0:${PORTSDIR}/audio/py-mutagen +BIN_SCRIPTS= cdg2mpg pycdg pykar pykaraoke pykaraoke_mini pympg +DATA_FONTS= DejaVuSans.ttf DejaVuSansCondensed.ttf \ + DejaVuSansCondensed-Bold.ttf + +.include + +.if ${OPSYS} == FreeBSD && ${CHOSEN_COMPILER_TYPE} == gcc +MAKE_ENV+= LD_LIBRARY_PATH="${LOCALBASE}/lib/${CC}:$$LD_LIBRARY_PATH" +.endif + post-patch: @${REINPLACE_CMD} -e \ 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/setup.cfg @@ -49,12 +62,35 @@ post-patch: /^Categories=/s|Application;||' ${WRKSRC}/install/${i} .endfor +post-build: + @${MKDIR} ${WRKDIR}/wrappers +.for i in ${BIN_SCRIPTS} + @${ECHO_CMD} -n \ + >> ${WRKDIR}/wrappers/${i} + @${ECHO_CMD} '#!/bin/sh' \ + >> ${WRKDIR}/wrappers/${i} +.if ${OPSYS} == FreeBSD && ${CHOSEN_COMPILER_TYPE} == gcc + @${ECHO_CMD} 'LD_LIBRARY_PATH="${LOCALBASE}/lib/${CC}:$$LD_LIBRARY_PATH"' \ + >> ${WRKDIR}/wrappers/${i} + @${ECHO_CMD} 'export LD_LIBRARY_PATH' \ + >> ${WRKDIR}/wrappers/${i} + @${ECHO_CMD} \ + >> ${WRKDIR}/wrappers/${i} +.endif + @${ECHO_CMD} 'exec ${PREFIX}/libexec/${i} "$$@"' \ + >> ${WRKDIR}/wrappers/${i} +.endfor + post-install: +.for i in ${BIN_SCRIPTS} + (cd ${WRKDIR}/wrappers && ${INSTALL_SCRIPT} ${i} \ + ${STAGEDIR}${PREFIX}/bin) +.endfor @${MKDIR} ${STAGEDIR}${DATADIR}/fonts -.for i in DejaVuSans.ttf DejaVuSansCondensed-Bold.ttf DejaVuSansCondensed.ttf +.for i in ${DATA_FONTS} @${LN} -sf ${LOCALBASE}/share/fonts/dejavu/${i} \ ${STAGEDIR}${DATADIR}/fonts .endfor @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_pycdgAux.so -.include +.include Modified: head/audio/py-karaoke/files/patch-setup.py ============================================================================== --- head/audio/py-karaoke/files/patch-setup.py Sat Oct 10 09:52:46 2015 (r398984) +++ head/audio/py-karaoke/files/patch-setup.py Sat Oct 10 10:13:50 2015 (r398985) @@ -1,6 +1,6 @@ --- 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 @@ +@@ -61,17 +61,12 @@ 'icons/microphone.ico', 'icons/microphone.png', 'icons/pykaraoke.xpm', @@ -14,3 +14,9 @@ # These data files only make sense on Unix-like systems. if env != ENV_WINDOWS: + data_files += [ +- ('bin', ['install/pykaraoke', ++ ('libexec', ['install/pykaraoke', + 'install/pykaraoke_mini', + 'install/pycdg', + 'install/pykar',