From owner-svn-ports-all@freebsd.org Wed Sep 9 15:00:34 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 96B163D3491; Wed, 9 Sep 2020 15:00:34 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BmlZB3ZTJz4MT7; Wed, 9 Sep 2020 15:00:34 +0000 (UTC) (envelope-from amdmi3@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5E10A22E74; Wed, 9 Sep 2020 15:00:34 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 089F0YaY037822; Wed, 9 Sep 2020 15:00:34 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 089F0Xme037815; Wed, 9 Sep 2020 15:00:33 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <202009091500.089F0Xme037815@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 9 Sep 2020 15:00:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548100 - in head/games/funnyboat: . files X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: in head/games/funnyboat: . files X-SVN-Commit-Revision: 548100 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Sep 2020 15:00:34 -0000 Author: amdmi3 Date: Wed Sep 9 15:00:33 2020 New Revision: 548100 URL: https://svnweb.freebsd.org/changeset/ports/548100 Log: - Update to local version with python3 support Added: head/games/funnyboat/files/funnyboat.sh.in - copied, changed from r548099, head/games/funnyboat/files/funnyboat_.in Deleted: head/games/funnyboat/files/funnyboat_.in head/games/funnyboat/pkg-plist Modified: head/games/funnyboat/Makefile head/games/funnyboat/distinfo head/games/funnyboat/pkg-descr Modified: head/games/funnyboat/Makefile ============================================================================== --- head/games/funnyboat/Makefile Wed Sep 9 15:00:00 2020 (r548099) +++ head/games/funnyboat/Makefile Wed Sep 9 15:00:33 2020 (r548100) @@ -2,11 +2,8 @@ # $FreeBSD$ PORTNAME= funnyboat -PORTVERSION= 1.5 -PORTREVISION= 10 +PORTVERSION= 1.6 CATEGORIES= games -MASTER_SITES= SF -DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= amdmi3@FreeBSD.org COMMENT= Side scrolling shooter game starring a steamboat on the sea @@ -16,27 +13,27 @@ LICENSE_COMB= multi LICENSE_FILE_GPLv2= ${WRKSRC}/LICENSE-CODE.txt LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MEDIA.txt -DEPRECATED= Uses deprecated version of python -EXPIRATION_DATE= 2020-09-15 +USE_GITHUB= yes +GH_ACCOUNT= AMDmi3 RUN_DEPENDS= ${PYGAME} -WRKSRC= ${WRKDIR}/${PORTNAME} - -USES= python:2.7,run zip +USES= python:run NO_BUILD= yes NO_ARCH= yes -SUB_FILES= funnyboat_ -SUB_LIST= PROGRAM_DIR="${PREFIX}/lib/${PORTNAME}" PYTHON_CMD="${PYTHON_CMD}" +SUB_FILES= funnyboat.sh +SUB_LIST= DATADIR="${DATADIR}" PYTHON_CMD="${PYTHON_CMD}" PORTDOCS= * +PORTDATA= * +PLIST_FILES= bin/funnyboat OPTIONS_DEFINE= DOCS do-install: - @cd ${WRKSRC} && ${COPYTREE_SHARE} "*.py data" ${STAGEDIR}${PREFIX}/lib/${PORTNAME} - ${INSTALL_SCRIPT} ${WRKDIR}/funnyboat_ ${STAGEDIR}${PREFIX}/bin/funnyboat + @cd ${WRKSRC} && ${COPYTREE_SHARE} "*.py data" ${STAGEDIR}${DATADIR} + ${INSTALL_SCRIPT} ${WRKDIR}/funnyboat.sh ${STAGEDIR}${PREFIX}/bin/funnyboat do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/ Modified: head/games/funnyboat/distinfo ============================================================================== --- head/games/funnyboat/distinfo Wed Sep 9 15:00:00 2020 (r548099) +++ head/games/funnyboat/distinfo Wed Sep 9 15:00:33 2020 (r548100) @@ -1,2 +1,3 @@ -SHA256 (funnyboat-1.5-src.zip) = de001d17f0e380df89bf5000392db75b385851a3cd200b3b87a8a9b66502f016 -SIZE (funnyboat-1.5-src.zip) = 3839990 +TIMESTAMP = 1599600731 +SHA256 (AMDmi3-funnyboat-1.6_GH0.tar.gz) = 5ec1d2b1a6bf14015c2792a6d9715edf8aeb03ac4d86c640b99882d2d9b95ed8 +SIZE (AMDmi3-funnyboat-1.6_GH0.tar.gz) = 3822458 Copied and modified: head/games/funnyboat/files/funnyboat.sh.in (from r548099, head/games/funnyboat/files/funnyboat_.in) ============================================================================== --- head/games/funnyboat/files/funnyboat_.in Wed Sep 9 15:00:00 2020 (r548099, copy source) +++ head/games/funnyboat/files/funnyboat.sh.in Wed Sep 9 15:00:33 2020 (r548100) @@ -1,16 +1,3 @@ -#!%%PYTHON_CMD%% +#!/bin/sh -import sys -import os.path - -#Program path -package_dir = os.path.join("%%PROGRAM_DIR%%") - -#Change current work directory -os.chdir(package_dir) - -#Add package_dir to python path -sys.path.append(package_dir) - -#Launch the program! -execfile(os.path.join(package_dir, "main.py")) +cd %%DATADIR%% && exec %%PYTHON_CMD%% main.py "$@" Modified: head/games/funnyboat/pkg-descr ============================================================================== --- head/games/funnyboat/pkg-descr Wed Sep 9 15:00:00 2020 (r548099) +++ head/games/funnyboat/pkg-descr Wed Sep 9 15:00:33 2020 (r548100) @@ -5,4 +5,5 @@ hazards. This game was originally made for the second PyWeek competition during the week from 25.3.2006 to 2.4.2006. -WWW: http://funnyboat.sourceforge.net +WWW: https://funnyboat.sourceforge.net/ +WWW: https://github.com/AMDmi3/funnyboat