Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 9 Sep 2020 15:00:33 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r548100 - in head/games/funnyboat: . files
Message-ID:  <202009091500.089F0Xme037815@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009091500.089F0Xme037815>