- Update to local version with python3 support

6 files changed, 18 insertions, 82 deletions

diff --git a/games/funnyboat/Makefile b/games/funnyboat/Makefile
index b3c8fdf996b1..fd2f6771364e 100644
--- a/games/funnyboat/Makefile
+++ b/games/funnyboat/Makefile
@@ -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}/
diff --git a/games/funnyboat/distinfo b/games/funnyboat/distinfo
index 5b02f806a707..e574e9da3579 100644
--- a/games/funnyboat/distinfo
+++ b/games/funnyboat/distinfo
@@ -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
diff --git a/games/funnyboat/files/funnyboat.sh.in b/games/funnyboat/files/funnyboat.sh.in
new file mode 100644
index 000000000000..7fd1346c949c
--- /dev/null
+++ b/games/funnyboat/files/funnyboat.sh.in
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+cd %%DATADIR%% && exec %%PYTHON_CMD%% main.py "$@"
diff --git a/games/funnyboat/files/funnyboat_.in b/games/funnyboat/files/funnyboat_.in
deleted file mode 100644
index 05d19341b969..000000000000
--- a/games/funnyboat/files/funnyboat_.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#!%%PYTHON_CMD%%
-
-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"))
diff --git a/games/funnyboat/pkg-descr b/games/funnyboat/pkg-descr
index 2bf5a0a68659..8953b3c01d65 100644
--- a/games/funnyboat/pkg-descr
+++ b/games/funnyboat/pkg-descr
@@ -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
diff --git a/games/funnyboat/pkg-plist b/games/funnyboat/pkg-plist
deleted file mode 100644
index 395f2c49409f..000000000000
--- a/games/funnyboat/pkg-plist
+++ /dev/null
@@ -1,50 +0,0 @@
-bin/funnyboat
-lib/funnyboat/PixelPerfect.py
-lib/funnyboat/cannonball.py
-lib/funnyboat/cloud.py
-lib/funnyboat/data/JDruid-Trip_on_the_Funny_Boat.ogg
-lib/funnyboat/data/Vera.ttf
-lib/funnyboat/data/blub.ogg
-lib/funnyboat/data/cloud1.png
-lib/funnyboat/data/cloud2.png
-lib/funnyboat/data/cloud3.png
-lib/funnyboat/data/cloud4.png
-lib/funnyboat/data/hai.png
-lib/funnyboat/data/kraah.ogg
-lib/funnyboat/data/kuti.png
-lib/funnyboat/data/kuvake.png
-lib/funnyboat/data/laiva.png
-lib/funnyboat/data/logo.png
-lib/funnyboat/data/lokki1.png
-lib/funnyboat/data/lokki2.png
-lib/funnyboat/data/lokki3.png
-lib/funnyboat/data/merkkari.png
-lib/funnyboat/data/miina.png
-lib/funnyboat/data/pam.ogg
-lib/funnyboat/data/poks.ogg
-lib/funnyboat/data/rasteri.png
-lib/funnyboat/data/sydan-rikki.png
-lib/funnyboat/data/sydan-tyhja.png
-lib/funnyboat/data/sydan.png
-lib/funnyboat/data/taivas.png
-lib/funnyboat/data/titanic.png
-lib/funnyboat/enemy.py
-lib/funnyboat/game.py
-lib/funnyboat/health.py
-lib/funnyboat/highscores.py
-lib/funnyboat/level.py
-lib/funnyboat/locals.py
-lib/funnyboat/main.py
-lib/funnyboat/menu.py
-lib/funnyboat/mine.py
-lib/funnyboat/options.py
-lib/funnyboat/particles.py
-lib/funnyboat/pirateboat.py
-lib/funnyboat/powerup.py
-lib/funnyboat/score.py
-lib/funnyboat/seagull.py
-lib/funnyboat/shark.py
-lib/funnyboat/steamboat.py
-lib/funnyboat/titanic.py
-lib/funnyboat/util.py
-lib/funnyboat/water.py