Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 28 Dec 2020 06:45:18 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r559446 - in head: . games games/endgame-singularity games/endgame-singularity/files
Message-ID:  <202012280645.0BS6jIpW022590@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Mon Dec 28 06:45:18 2020
New Revision: 559446
URL: https://svnweb.freebsd.org/changeset/ports/559446

Log:
  games/endgame-singularity: revive and update 1.00
  
  - Pass maintainership per revival
  
  Changes:	https://github.com/singularity/singularity/releases/tag/singularity-1.0a1
  Changes:	https://github.com/singularity/singularity/releases/tag/v1.0a2
  Changes:	https://github.com/singularity/singularity/releases/tag/v1.0b1
  Changes:	https://github.com/singularity/singularity/releases/tag/v1.00
  PR:		251608
  Submitted by:	Naram Qashat <cyberbotx@cyberbotx.com>

Added:
  head/games/endgame-singularity/
     - copied from r544926, head/games/endgame-singularity/
  head/games/endgame-singularity/files/
  head/games/endgame-singularity/files/patch-singularity_code_dirs.py   (contents, props changed)
Modified:
  head/MOVED
  head/games/Makefile
  head/games/endgame-singularity/Makefile
  head/games/endgame-singularity/distinfo
  head/games/endgame-singularity/pkg-plist

Modified: head/MOVED
==============================================================================
--- head/MOVED	Mon Dec 28 02:07:34 2020	(r559445)
+++ head/MOVED	Mon Dec 28 06:45:18 2020	(r559446)
@@ -15251,7 +15251,6 @@ devel/py-yum-metadata-parser||2020-08-15|Has expired: 
 devel/rubygem-warden127||2020-08-15|Has expired: No longer needed
 dns/py-dnschain||2020-08-15|Has expired: Uses deprecated version of python
 dns/py-idnkit2||2020-08-15|Has expired: Uses deprecated version of python
-games/endgame-singularity||2020-08-15|Has expired: Uses deprecated version of python
 games/katawa-shoujo||2020-08-15|Has expired: Uses deprecated version of RenPy
 games/pyfa||2020-08-15|Has expired: Uses deprecated version of python
 games/renpy6||2020-08-15|Has expired: Uses deprecated version of python

Modified: head/games/Makefile
==============================================================================
--- head/games/Makefile	Mon Dec 28 02:07:34 2020	(r559445)
+++ head/games/Makefile	Mon Dec 28 06:45:18 2020	(r559446)
@@ -228,6 +228,7 @@
     SUBDIR += el
     SUBDIR += el-data
     SUBDIR += emptyepsilon
+    SUBDIR += endgame-singularity
     SUBDIR += endgame-singularity-music
     SUBDIR += endless-sky
     SUBDIR += endless-sky-high-dpi

Modified: head/games/endgame-singularity/Makefile
==============================================================================
--- head/games/endgame-singularity/Makefile	Sat Aug 15 10:05:27 2020	(r544926)
+++ head/games/endgame-singularity/Makefile	Mon Dec 28 06:45:18 2020	(r559446)
@@ -2,74 +2,57 @@
 # $FreeBSD$
 
 PORTNAME=	singularity
-PORTVERSION=	0.30c
-DISTVERSIONPREFIX=	v
-PORTREVISION=	8
+PORTVERSION=	1.00
 CATEGORIES=	games
+MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${PORTVERSION}/
 PKGNAMEPREFIX=	endgame-
 
-MAINTAINER=	lifanov@FreeBSD.org
+MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	Simulates the life of a true AI
 
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/GPL.txt
+LICENSE=	GPLv2+ MIT CC-BY-SA-3.0 NASA AEFONTS BITSTREAM AREV \
+		MEMESBRUH03 CC0-1.0
+LICENSE_COMB=	multi
+LICENSE_NAME_NASA=	NASA Terms of Use
+LICENSE_NAME_AEFONTS=	Brian Kent - Aenigma Games & Fonts
+LICENSE_NAME_BITSTREAM=	Bitstream Vera Fonts Copyright
+LICENSE_NAME_AREV=	Arev Fonts Copyright
+LICENSE_NAME_MEMESBRUH03=	memesbruh03 Copyright
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+LICENSE_FILE_GPLv2+ =	${WRKSRC}/LICENSE.gpl.txt
+LICENSE_FILE_CC-BY-SA-3.0=	${WRKSRC}/LICENSE.CC-BY-SA-3.txt
+LICENSE_FILE_CC0-1.0=	${WRKSRC}/LICENSE.cc0.txt
+LICENSE_PERMS_NASA=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE_PERMS_AEFONTS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE_PERMS_BITSTREAM=dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE_PERMS_AREV=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE_PERMS_MEMESBRUH03=	dist-mirror dist-sell pkg-mirror pkg-sell \
+				auto-accept
 
-DEPRECATED=	Uses deprecated version of python
-EXPIRATION_DATE=	2020-08-15
-
 RUN_DEPENDS=	${PYGAME} \
-		${PYNUMPY}
+		${PYNUMPY} \
+		${PYTHON_PKGNAMEPREFIX}polib>=0:devel/py-polib@${PY_FLAVOR}
 
-USE_GITHUB=	yes
-
-USES=		python:2.7 sdl
+USES=		python:3.5+ sdl shebangfix
 USE_PYTHON=	autoplist distutils
 USE_SDL=	image mixer
-PORTDOCS=	AUTHORS Changelog README.txt TODO
+PORTDOCS=	AUTHORS.txt Changelog.txt README.txt TODO
 NO_ARCH=	yes
+SHEBANG_FILES=	singularity/i18n/utils/languages.py
 
 OPTIONS_DEFINE=	MUSIC DOCS
 OPTIONS_DEFAULT=	MUSIC
+
 MUSIC_DESC=	Install original music pack
 MUSIC_RUN_DEPENDS=	endgame-singularity-music>=006:games/endgame-singularity-music
 
 post-extract:
-	@${FIND} ${WRKSRC} -name '*.pyc' -delete
-	@cd ${WRKSRC}/&&${MV} code ${PORTNAME}
-	@${MKDIR} ${WRKSRC}/data/music/
-	@${TOUCH} ${WRKSRC}/data/music/.keep_me
+	@${MV} ${WRKSRC}/singularity/data ${WRKSRC}/
 
-post-patch:
-	@${REINPLACE_CMD} -e '5,16d;25,31d;\
-		/app=/s|app=.*|packages=["singularity","singularity/graphics","singularity/screens"],|;\
-		/name=/s|".*"|"singularity"|' \
-		${WRKSRC}/setup.py
-	@${REINPLACE_CMD} -e '/import cPickle/s|cPickle|pickle as cPickle|' \
-		${WRKSRC}/${PORTNAME}/g.py
-	@${REINPLACE_CMD} -e '/data_loc = /s|=.*|= "${DATADIR}/"|;\
-		/data_loc.*music/s|, ".."||' ${WRKSRC}/${PORTNAME}/g.py
-	@${REINPLACE_CMD} -e '/ code\.[a-z]/s|code|singularity|' \
-		${WRKSRC}/${PORTNAME}/graphics/button.py \
-		${WRKSRC}/${PORTNAME}/graphics/dialog.py \
-		${WRKSRC}/${PORTNAME}/graphics/g.py \
-		${WRKSRC}/${PORTNAME}/screens/base.py \
-		${WRKSRC}/${PORTNAME}/screens/finance.py \
-		${WRKSRC}/${PORTNAME}/screens/main_menu.py \
-		${WRKSRC}/${PORTNAME}/screens/options.py
-	@${REINPLACE_CMD} -e '/ code/s|code|singularity|' \
-		${WRKSRC}/${PORTNAME}/screens/knowledge.py \
-		${WRKSRC}/${PORTNAME}/screens/location.py \
-		${WRKSRC}/${PORTNAME}/screens/research.py
-	@${REINPLACE_CMD} -e '/ code[ \.]/s|code|singularity|' \
-		${WRKSRC}/${PORTNAME}/screens/map.py
-
-post-build:
-	@${ECHO_CMD} '#!${PYTHON_CMD}' > ${WRKSRC}/${PORTNAME}.py
-	@${ECHO_CMD} 'import ${PORTNAME}.${PORTNAME}' >> ${WRKSRC}/${PORTNAME}.py
-
 post-install:
-	(cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.py ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	@${MKDIR} ${STAGEDIR}${DATADIR}/data
+	(cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/data)
+	${INSTALL_DATA} ${WRKSRC}/singularity.desktop ${STAGEDIR}${PREFIX}/share/applications
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 

Modified: head/games/endgame-singularity/distinfo
==============================================================================
--- head/games/endgame-singularity/distinfo	Sat Aug 15 10:05:27 2020	(r544926)
+++ head/games/endgame-singularity/distinfo	Mon Dec 28 06:45:18 2020	(r559446)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1478957325
-SHA256 (singularity-singularity-v0.30c_GH0.tar.gz) = 9658249e10cc0f360a048a6838178faf152a3883386abea6b05ccb72d497d8f1
-SIZE (singularity-singularity-v0.30c_GH0.tar.gz) = 2149627
+TIMESTAMP = 1606593328
+SHA256 (singularity-1.00.tar.gz) = 5e747268d9e96e69adace1f346fe40d0c3ec05764b98e82cc3ab0335d96d9171
+SIZE (singularity-1.00.tar.gz) = 1944972

Added: head/games/endgame-singularity/files/patch-singularity_code_dirs.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/endgame-singularity/files/patch-singularity_code_dirs.py	Mon Dec 28 06:45:18 2020	(r559446)
@@ -0,0 +1,26 @@
+--- singularity/code/dirs.py.orig	2020-07-02 08:18:47 UTC
++++ singularity/code/dirs.py
+@@ -54,6 +54,7 @@ version_dir = '1.0'
+ dir_defs = (
+     ( {"name":"data", "mandatory": True},
+         {"parent": "root",        "path": "data",           },
++        {"parent": "share",       "path": "data",           },
+     ),
+     ( {"name":"i18n", "writable": True},
+         {"parent": "files_home",  "path": "i18n",           }, # New XDG dir
+@@ -63,6 +64,7 @@ dir_defs = (
+         {"parent": "files_home",  "path": "music",          }, # New XDG dir
+         {"parent": "old_home",    "path": "music",          }, # Old .endgame dir
+         {"parent": "root",        "path": "music",          },
++        {"parent": "share",       "path": "music"           },
+     ),
+     ( {"name":"sounds", },
+         {"parent": "data",        "path": "sounds"          },
+@@ -135,6 +137,7 @@ def create_directories(force_single_dir):
+         write_dirs["config_home"] = pref_dir_new
+         read_dirs["files_home"] = [files_dir_new]
+         write_dirs["files_home"] = files_dir_new
++        read_dirs["share"] = ['/usr/local/share/singularity']
+ 
+     # Now find dirs.
+     for defs in dir_defs:

Modified: head/games/endgame-singularity/pkg-plist
==============================================================================
--- head/games/endgame-singularity/pkg-plist	Sat Aug 15 10:05:27 2020	(r544926)
+++ head/games/endgame-singularity/pkg-plist	Mon Dec 28 06:45:18 2020	(r559446)
@@ -1,72 +1,55 @@
-bin/singularity
-%%DATADIR%%/Attribution-ShareAlike 3.0.html
-%%DATADIR%%/bases.dat
-%%DATADIR%%/bases_de_DE.dat
-%%DATADIR%%/bases_en_US.dat
-%%DATADIR%%/bases_es_AR.dat
-%%DATADIR%%/bases_fr_FR.dat
-%%DATADIR%%/bases_it_IT.dat
-%%DATADIR%%/bases_sv_SE.dat
-%%DATADIR%%/events.dat
-%%DATADIR%%/events_de_DE.dat
-%%DATADIR%%/events_en_US.dat
-%%DATADIR%%/events_es_AR.dat
-%%DATADIR%%/events_fr_FR.dat
-%%DATADIR%%/events_it_IT.dat
-%%DATADIR%%/events_sv_SE.dat
-%%DATADIR%%/fonts/DejaVuSans.ttf
-%%DATADIR%%/fonts/acknowtt.ttf
-%%DATADIR%%/images/arrow.png
-%%DATADIR%%/images/earth.jpg
-%%DATADIR%%/images/earth_night.jpg
-%%DATADIR%%/images/icon.png
-%%DATADIR%%/intro_de_DE.dat
-%%DATADIR%%/intro_en_US.dat
-%%DATADIR%%/intro_es_AR.dat
-%%DATADIR%%/intro_fr_FR.dat
-%%DATADIR%%/intro_it_IT.dat
-%%DATADIR%%/intro_sv_SE.dat
-%%DATADIR%%/items.dat
-%%DATADIR%%/items_de_DE.dat
-%%DATADIR%%/items_en_US.dat
-%%DATADIR%%/items_es_AR.dat
-%%DATADIR%%/items_fr_FR.dat
-%%DATADIR%%/items_it_IT.dat
-%%DATADIR%%/items_sv_SE.dat
-%%DATADIR%%/locations.dat
-%%DATADIR%%/locations_de_DE.dat
-%%DATADIR%%/locations_en_US.dat
-%%DATADIR%%/locations_es_AR.dat
-%%DATADIR%%/locations_fr_FR.dat
-%%DATADIR%%/locations_it_IT.dat
-%%DATADIR%%/locations_sv_SE.dat
-%%DATADIR%%/music/.keep_me
-%%DATADIR%%/music-src/Advanced Simulacra.psy
-%%DATADIR%%/music-src/Awakening.psy
-%%DATADIR%%/music-src/By-Product.psy
-%%DATADIR%%/music-src/Coherence.psy
-%%DATADIR%%/music-src/Deprecation.psy
-%%DATADIR%%/music-src/Inevitable.psy
-%%DATADIR%%/music-src/Media Threat.psy
-%%DATADIR%%/music-src/README.txt
-%%DATADIR%%/music-src/lose/Chimes They Fade.psy
-%%DATADIR%%/music-src/lose/March Thee to Dis.psy
-%%DATADIR%%/music-src/win/Apex Aleph.psy
-%%DATADIR%%/sounds/click0.wav
-%%DATADIR%%/sounds/click1.wav
-%%DATADIR%%/sounds/click2.wav
-%%DATADIR%%/sounds/click3.wav
-%%DATADIR%%/sounds/sounds.dat
-%%DATADIR%%/strings_de_DE.dat
-%%DATADIR%%/strings_en_US.dat
-%%DATADIR%%/strings_es_AR.dat
-%%DATADIR%%/strings_fr_FR.dat
-%%DATADIR%%/strings_it_IT.dat
-%%DATADIR%%/strings_sv_SE.dat
-%%DATADIR%%/techs.dat
-%%DATADIR%%/techs_de_DE.dat
-%%DATADIR%%/techs_en_US.dat
-%%DATADIR%%/techs_es_AR.dat
-%%DATADIR%%/techs_fr_FR.dat
-%%DATADIR%%/techs_it_IT.dat
-%%DATADIR%%/techs_sv_SE.dat
+share/applications/singularity.desktop
+%%DATADIR%%/data/Attribution-ShareAlike 3.0.html
+%%DATADIR%%/data/bases.dat
+%%DATADIR%%/data/bases_str.dat
+%%DATADIR%%/data/dangers_str.dat
+%%DATADIR%%/data/difficulties.dat
+%%DATADIR%%/data/difficulties_str.dat
+%%DATADIR%%/data/events.dat
+%%DATADIR%%/data/events_str.dat
+%%DATADIR%%/data/groups.dat
+%%DATADIR%%/data/groups_str.dat
+%%DATADIR%%/data/internal_id.dat
+%%DATADIR%%/data/items.dat
+%%DATADIR%%/data/items_str.dat
+%%DATADIR%%/data/itemtypes.dat
+%%DATADIR%%/data/itemtypes_str.dat
+%%DATADIR%%/data/knowledge_str.dat
+%%DATADIR%%/data/locations.dat
+%%DATADIR%%/data/locations_str.dat
+%%DATADIR%%/data/numbers.dat
+%%DATADIR%%/data/regions.dat
+%%DATADIR%%/data/sounds/click/click0.wav
+%%DATADIR%%/data/story.dat
+%%DATADIR%%/data/tasks.dat
+%%DATADIR%%/data/tasks_str.dat
+%%DATADIR%%/data/techs.dat
+%%DATADIR%%/data/techs_str.dat
+%%DATADIR%%/data/themes/default/fonts/DejaVuSans.ttf
+%%DATADIR%%/data/themes/default/fonts/acknowtt.ttf
+%%DATADIR%%/data/themes/default/fonts/superstar_info.txt
+%%DATADIR%%/data/themes/default/fonts/superstar_memesbruh03.ttf
+%%DATADIR%%/data/themes/default/images/arrow.png
+%%DATADIR%%/data/themes/default/images/earth.jpg
+%%DATADIR%%/data/themes/default/images/earth_night.jpg
+%%DATADIR%%/data/themes/default/images/icon.png
+%%DATADIR%%/data/themes/default/theme.dat
+%%DATADIR%%/data/themes/default/theme_de_DE.dat
+%%DATADIR%%/data/themes/default/theme_fr_FR.dat
+%%DATADIR%%/data/themes/default/theme_gd.dat
+%%DATADIR%%/data/themes/default/theme_ru_RU.dat
+%%DATADIR%%/data/themes/nightmode/images/arrow.png
+%%DATADIR%%/data/themes/nightmode/images/earth.png
+%%DATADIR%%/data/themes/nightmode/images/earth_night.png
+%%DATADIR%%/data/themes/nightmode/images/icon.png
+%%DATADIR%%/data/themes/nightmode/theme.dat
+%%DATADIR%%/data/themes/nightmode/theme_de_DE.dat
+%%DATADIR%%/data/themes/nightmode/theme_fr_FR.dat
+%%DATADIR%%/data/themes/nightmode/theme_gd.dat
+%%DATADIR%%/data/themes/nightmode/theme_ru_RU.dat
+%%DATADIR%%/data/themes/vector/images/earth.png
+%%DATADIR%%/data/themes/vector/images/earth_night.png
+%%DATADIR%%/data/themes/vector/theme.dat
+%%DATADIR%%/data/themes/vector/theme_de_DE.dat
+%%DATADIR%%/data/themes/vector/theme_fr_FR.dat
+%%DATADIR%%/data/themes/vector/theme_gd.dat



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