From owner-svn-ports-head@FreeBSD.ORG Wed Dec 25 18:38:21 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 83C7F28E; Wed, 25 Dec 2013 18:38:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 561CC1958; Wed, 25 Dec 2013 18:38:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBPIcL3t051788; Wed, 25 Dec 2013 18:38:21 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBPIcLeP051787; Wed, 25 Dec 2013 18:38:21 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201312251838.rBPIcLeP051787@svn.freebsd.org> From: Rusmir Dusko Date: Wed, 25 Dec 2013 18:38:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337438 - head/games/bombz 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.17 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: Wed, 25 Dec 2013 18:38:21 -0000 Author: nemysis Date: Wed Dec 25 18:38:20 2013 New Revision: 337438 URL: http://svnweb.freebsd.org/changeset/ports/337438 Log: - Change master sites - USES dos2unix instead of USE_DOS2UNIX - Fix the usage of 'python' to get rid of the implicit lang/python dependency - Break lines around 80 characters Approved by: pawel / wg (mentors, implicit) Modified: head/games/bombz/Makefile Modified: head/games/bombz/Makefile ============================================================================== --- head/games/bombz/Makefile Wed Dec 25 18:27:28 2013 (r337437) +++ head/games/bombz/Makefile Wed Dec 25 18:38:20 2013 (r337438) @@ -6,7 +6,7 @@ PORTVERSION= 0.2 PORTREVISION= 1 CATEGORIES= games python MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}/ \ - SF/nemysisfreebsdp/:icons + SF/nemysisfreebsdp/games/:icons DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \ ${PORTNAME}.png:icons DIST_SUBDIR= python @@ -22,9 +22,10 @@ RUN_DEPENDS= ${PYGAME} WRKSRC= ${WRKDIR}/Bombz USE_ZIP= yes +USES= dos2unix +DOS2UNIX_FILES= *.txt USE_SDL= sdl image mixer INSTALLS_ICONS= yes -USE_DOS2UNIX= *.txt USE_PYTHON= yes PORTDOCS= ChangeLog readme.txt @@ -36,6 +37,8 @@ OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -i '' '/words = name.split()/,/self.name = name/s/^/#/' \ ${WRKSRC}/bombz/joy.py + @${REINPLACE_CMD} -e 's|/usr/bin/env python|${PYTHON_CMD}|' \ + ${WRKSRC}/${PORTNAME}.py do-build: @${PYTHON_CMD} -m compileall ${WRKSRC} @@ -51,8 +54,10 @@ do-install: @(cd ${WRKSRC} ; ${INSTALL_SCRIPT} ${d} ${STAGEDIR}${DATADIR}) .endfor - ${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps/ - ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/ + ${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps/ + @${MKDIR} ${STAGEDIR}${DESKTOPDIR} + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}