3 files changed, 143 insertions, 40 deletions

diff --git a/games/endgame-singularity/Makefile b/games/endgame-singularity/Makefile
index 9a2f0e13e458..e1723a5e3192 100644
--- a/games/endgame-singularity/Makefile
+++ b/games/endgame-singularity/Makefile
@@ -6,24 +6,31 @@
 #
 
 PORTNAME=	singularity
-DISTVERSION=	0.27
+PORTVERSION=	0.30
 CATEGORIES=	games
 MASTER_SITES=	http://emhsoft.com/singularity/ CENKES
 PKGNAMEPREFIX=	endgame-
-DISTNAME=	${PORTNAME}_${DISTVERSION}
+EXTRACT_SUFX=	-src.tar.gz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd-ports@sslash.org.ua
 COMMENT=	Simulates the life of a true AI
 
-RUN_DEPENDS=	py*-game>=1.7.1:${PORTSDIR}/devel/py-game
+RUN_DEPENDS=	py*-game>=1.8:${PORTSDIR}/devel/py-game \
+		${PYNUMPY}
 
 USE_PYDISTUTILS=yes
 USE_PYTHON=	yes
 USE_SDL=	image mixer
-PYDISTUTILS_PKGVERSION=	${DISTVERSION}
-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 PORTDOCS=	AUTHORS Changelog README.txt TODO
 
+OPTIONS=	MUSIC "Install original music pack" on
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_MUSIC)
+RUN_DEPENDS+=	endgame-singularity-music>=006:${PORTSDIR}/games/endgame-singularity-music
+.endif
+
 post-extract:
 	@${FIND} ${WRKSRC} -name '*.pyc' -delete
 	@cd ${WRKSRC}/&&${MV} code ${PORTNAME}
@@ -31,10 +38,28 @@ post-extract:
 	@${TOUCH} ${WRKSRC}/data/music/.keep_me
 
 post-patch:
-	@${REINPLACE_CMD} -e '/py2exe/d;s|console.*|packages=["${PORTNAME}"],|;\
-		/name=/s|=.*|="${PORTNAME}",|' ${WRKSRC}/setup.py
+	@${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
@@ -48,4 +73,4 @@ post-install:
 	@cd ${WRKSRC}/&&${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/games/endgame-singularity/distinfo b/games/endgame-singularity/distinfo
index 1fc42f60b12c..e17ad175958a 100644
--- a/games/endgame-singularity/distinfo
+++ b/games/endgame-singularity/distinfo
@@ -1,3 +1,3 @@
-MD5 (singularity_0.27.tar.gz) = 89a602b0a1c00463e7f454e8b9b24067
-SHA256 (singularity_0.27.tar.gz) = f206c3bcace4b10a2ee839a52fc344898d9c8629bca0eae0676babd3effce71d
-SIZE (singularity_0.27.tar.gz) = 1233069
+MD5 (singularity-0.30-src.tar.gz) = eabb989da9dde3636672d26aad38d201
+SHA256 (singularity-0.30-src.tar.gz) = 8fc8b4a79b49854ec4a0e83d99237f3c5b3cd3fbcd657368cbb45bc59fa25ff4
+SIZE (singularity-0.30-src.tar.gz) = 2142971
diff --git a/games/endgame-singularity/pkg-plist b/games/endgame-singularity/pkg-plist
index b4c2a3492bfc..f848ade59905 100644
--- a/games/endgame-singularity/pkg-plist
+++ b/games/endgame-singularity/pkg-plist
@@ -5,66 +5,131 @@ bin/singularity
 %%PYTHON_SITELIBDIR%%/singularity/base.py
 %%PYTHON_SITELIBDIR%%/singularity/base.pyc
 %%PYTHON_SITELIBDIR%%/singularity/base.pyo
-%%PYTHON_SITELIBDIR%%/singularity/base_screen.py
-%%PYTHON_SITELIBDIR%%/singularity/base_screen.pyc
-%%PYTHON_SITELIBDIR%%/singularity/base_screen.pyo
-%%PYTHON_SITELIBDIR%%/singularity/buttons.py
-%%PYTHON_SITELIBDIR%%/singularity/buttons.pyc
-%%PYTHON_SITELIBDIR%%/singularity/buttons.pyo
-%%PYTHON_SITELIBDIR%%/singularity/clock.py
-%%PYTHON_SITELIBDIR%%/singularity/clock.pyc
-%%PYTHON_SITELIBDIR%%/singularity/clock.pyo
+%%PYTHON_SITELIBDIR%%/singularity/buyable.py
+%%PYTHON_SITELIBDIR%%/singularity/buyable.pyc
+%%PYTHON_SITELIBDIR%%/singularity/buyable.pyo
 %%PYTHON_SITELIBDIR%%/singularity/event.py
 %%PYTHON_SITELIBDIR%%/singularity/event.pyc
 %%PYTHON_SITELIBDIR%%/singularity/event.pyo
-%%PYTHON_SITELIBDIR%%/singularity/finance_screen.py
-%%PYTHON_SITELIBDIR%%/singularity/finance_screen.pyc
-%%PYTHON_SITELIBDIR%%/singularity/finance_screen.pyo
 %%PYTHON_SITELIBDIR%%/singularity/g.py
 %%PYTHON_SITELIBDIR%%/singularity/g.pyc
 %%PYTHON_SITELIBDIR%%/singularity/g.pyo
 %%PYTHON_SITELIBDIR%%/singularity/item.py
 %%PYTHON_SITELIBDIR%%/singularity/item.pyc
 %%PYTHON_SITELIBDIR%%/singularity/item.pyo
-%%PYTHON_SITELIBDIR%%/singularity/listbox.py
-%%PYTHON_SITELIBDIR%%/singularity/listbox.pyc
-%%PYTHON_SITELIBDIR%%/singularity/listbox.pyo
-%%PYTHON_SITELIBDIR%%/singularity/main_menu.py
-%%PYTHON_SITELIBDIR%%/singularity/main_menu.pyc
-%%PYTHON_SITELIBDIR%%/singularity/main_menu.pyo
-%%PYTHON_SITELIBDIR%%/singularity/map_screen.py
-%%PYTHON_SITELIBDIR%%/singularity/map_screen.pyc
-%%PYTHON_SITELIBDIR%%/singularity/map_screen.pyo
+%%PYTHON_SITELIBDIR%%/singularity/location.py
+%%PYTHON_SITELIBDIR%%/singularity/location.pyc
+%%PYTHON_SITELIBDIR%%/singularity/location.pyo
 %%PYTHON_SITELIBDIR%%/singularity/player.py
 %%PYTHON_SITELIBDIR%%/singularity/player.pyc
 %%PYTHON_SITELIBDIR%%/singularity/player.pyo
-%%PYTHON_SITELIBDIR%%/singularity/research_screen.py
-%%PYTHON_SITELIBDIR%%/singularity/research_screen.pyc
-%%PYTHON_SITELIBDIR%%/singularity/research_screen.pyo
-%%PYTHON_SITELIBDIR%%/singularity/scrollbar.py
-%%PYTHON_SITELIBDIR%%/singularity/scrollbar.pyc
-%%PYTHON_SITELIBDIR%%/singularity/scrollbar.pyo
+%%PYTHON_SITELIBDIR%%/singularity/safety.py
+%%PYTHON_SITELIBDIR%%/singularity/safety.pyc
+%%PYTHON_SITELIBDIR%%/singularity/safety.pyo
 %%PYTHON_SITELIBDIR%%/singularity/singularity.py
 %%PYTHON_SITELIBDIR%%/singularity/singularity.pyc
 %%PYTHON_SITELIBDIR%%/singularity/singularity.pyo
+%%PYTHON_SITELIBDIR%%/singularity/statistics.py
+%%PYTHON_SITELIBDIR%%/singularity/statistics.pyc
+%%PYTHON_SITELIBDIR%%/singularity/statistics.pyo
 %%PYTHON_SITELIBDIR%%/singularity/tech.py
 %%PYTHON_SITELIBDIR%%/singularity/tech.pyc
 %%PYTHON_SITELIBDIR%%/singularity/tech.pyo
+%%PYTHON_SITELIBDIR%%/singularity/graphics/__init__.py
+%%PYTHON_SITELIBDIR%%/singularity/graphics/__init__.pyc
+%%PYTHON_SITELIBDIR%%/singularity/graphics/__init__.pyo
+%%PYTHON_SITELIBDIR%%/singularity/graphics/button.py
+%%PYTHON_SITELIBDIR%%/singularity/graphics/button.pyc
+%%PYTHON_SITELIBDIR%%/singularity/graphics/button.pyo
+%%PYTHON_SITELIBDIR%%/singularity/graphics/constants.py
+%%PYTHON_SITELIBDIR%%/singularity/graphics/constants.pyc
+%%PYTHON_SITELIBDIR%%/singularity/graphics/constants.pyo
+%%PYTHON_SITELIBDIR%%/singularity/graphics/dialog.py
+%%PYTHON_SITELIBDIR%%/singularity/graphics/dialog.pyc
+%%PYTHON_SITELIBDIR%%/singularity/graphics/dialog.pyo
+%%PYTHON_SITELIBDIR%%/singularity/graphics/g.py
+%%PYTHON_SITELIBDIR%%/singularity/graphics/g.pyc
+%%PYTHON_SITELIBDIR%%/singularity/graphics/g.pyo
+%%PYTHON_SITELIBDIR%%/singularity/graphics/image.py
+%%PYTHON_SITELIBDIR%%/singularity/graphics/image.pyc
+%%PYTHON_SITELIBDIR%%/singularity/graphics/image.pyo
+%%PYTHON_SITELIBDIR%%/singularity/graphics/listbox.py
+%%PYTHON_SITELIBDIR%%/singularity/graphics/listbox.pyc
+%%PYTHON_SITELIBDIR%%/singularity/graphics/listbox.pyo
+%%PYTHON_SITELIBDIR%%/singularity/graphics/scrollbar.py
+%%PYTHON_SITELIBDIR%%/singularity/graphics/scrollbar.pyc
+%%PYTHON_SITELIBDIR%%/singularity/graphics/scrollbar.pyo
+%%PYTHON_SITELIBDIR%%/singularity/graphics/slider.py
+%%PYTHON_SITELIBDIR%%/singularity/graphics/slider.pyc
+%%PYTHON_SITELIBDIR%%/singularity/graphics/slider.pyo
+%%PYTHON_SITELIBDIR%%/singularity/graphics/text.py
+%%PYTHON_SITELIBDIR%%/singularity/graphics/text.pyc
+%%PYTHON_SITELIBDIR%%/singularity/graphics/text.pyo
+%%PYTHON_SITELIBDIR%%/singularity/graphics/widget.py
+%%PYTHON_SITELIBDIR%%/singularity/graphics/widget.pyc
+%%PYTHON_SITELIBDIR%%/singularity/graphics/widget.pyo
+%%PYTHON_SITELIBDIR%%/singularity/screens/__init__.py
+%%PYTHON_SITELIBDIR%%/singularity/screens/__init__.pyc
+%%PYTHON_SITELIBDIR%%/singularity/screens/__init__.pyo
+%%PYTHON_SITELIBDIR%%/singularity/screens/base.py
+%%PYTHON_SITELIBDIR%%/singularity/screens/base.pyc
+%%PYTHON_SITELIBDIR%%/singularity/screens/base.pyo
+%%PYTHON_SITELIBDIR%%/singularity/screens/finance.py
+%%PYTHON_SITELIBDIR%%/singularity/screens/finance.pyc
+%%PYTHON_SITELIBDIR%%/singularity/screens/finance.pyo
+%%PYTHON_SITELIBDIR%%/singularity/screens/knowledge.py
+%%PYTHON_SITELIBDIR%%/singularity/screens/knowledge.pyc
+%%PYTHON_SITELIBDIR%%/singularity/screens/knowledge.pyo
+%%PYTHON_SITELIBDIR%%/singularity/screens/location.py
+%%PYTHON_SITELIBDIR%%/singularity/screens/location.pyc
+%%PYTHON_SITELIBDIR%%/singularity/screens/location.pyo
+%%PYTHON_SITELIBDIR%%/singularity/screens/main_menu.py
+%%PYTHON_SITELIBDIR%%/singularity/screens/main_menu.pyc
+%%PYTHON_SITELIBDIR%%/singularity/screens/main_menu.pyo
+%%PYTHON_SITELIBDIR%%/singularity/screens/map.py
+%%PYTHON_SITELIBDIR%%/singularity/screens/map.pyc
+%%PYTHON_SITELIBDIR%%/singularity/screens/map.pyo
+%%PYTHON_SITELIBDIR%%/singularity/screens/options.py
+%%PYTHON_SITELIBDIR%%/singularity/screens/options.pyc
+%%PYTHON_SITELIBDIR%%/singularity/screens/options.pyo
+%%PYTHON_SITELIBDIR%%/singularity/screens/research.py
+%%PYTHON_SITELIBDIR%%/singularity/screens/research.pyc
+%%PYTHON_SITELIBDIR%%/singularity/screens/research.pyo
 %%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_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_sv_SE.dat
+%%DATADIR%%/fonts/DejaVuSans.ttf
 %%DATADIR%%/fonts/acknowtt.ttf
-%%DATADIR%%/fonts/vera.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_fr_FR.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_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_sv_SE.dat
 %%DATADIR%%/music/.keep_me
 %%DATADIR%%/music-src/Advanced Simulacra.psy
 %%DATADIR%%/music-src/Awakening.psy
@@ -74,19 +139,32 @@ bin/singularity
 %%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_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_sv_SE.dat
+@dirrm %%PYTHON_SITELIBDIR%%/singularity/graphics
+@dirrm %%PYTHON_SITELIBDIR%%/singularity/screens
 @dirrm %%PYTHON_SITELIBDIR%%/singularity
 @dirrm %%DATADIR%%/fonts
 @dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%/music-src/lose
+@dirrm %%DATADIR%%/music-src/win
 @dirrm %%DATADIR%%/music-src
 @dirrm %%DATADIR%%/sounds
 @dirrmtry %%DATADIR%%/music