Update to 0.30c.

Changes:
- Miscellaneous minor gameplay improvements
- Fixes a crash with python 2.7
- Removes support for savefiles older than 0.28
- Rewrite of the graphics system (new widgets and dialogs, etc.)
- Various minor bugfixes
- Translation improvements

3 files changed, 56 insertions, 32 deletions

diff --git a/games/singularity/Makefile b/games/singularity/Makefile
index 717259e96b0..9ee24723d92 100644
--- a/games/singularity/Makefile
+++ b/games/singularity/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2014/05/17 16:10:44 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2015/02/10 22:25:24 snj Exp $
 
-DISTNAME=		singularity_0.28
-PKGNAME=		${DISTNAME:S/_/-/}
-PKGREVISION=		13
+DISTNAME=		singularity-0.30c-src
+PKGNAME=		${DISTNAME:S/-src//}
 CATEGORIES=		games
-MASTER_SITES=		http://www.emhsoft.com/singularity/
+MASTER_SITES=		http://endgame-singularity.googlecode.com/files/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.emhsoft.com/singularity/
@@ -14,7 +13,8 @@ WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 
 INSTALLATION_DIRS=	bin share/doc/singularity
 INSTALLATION_DIRS+=	share/singularity/code
-INSTALLATION_DIRS+=	share/singularity/data/music-src
+INSTALLATION_DIRS+=	share/singularity/code/graphics
+INSTALLATION_DIRS+=	share/singularity/code/screens
 INSTALLATION_DIRS+=	share/singularity/data/fonts
 INSTALLATION_DIRS+=	share/singularity/data/images
 INSTALLATION_DIRS+=	share/singularity/data/sounds
@@ -22,13 +22,18 @@ INSTALLATION_DIRS+=	share/singularity/music
 
 do-build:
 	${ECHO} "#!/bin/sh" > ${WRKSRC}/singularity
-	${ECHO} "cd ${PREFIX}/share/singularity/code" >> ${WRKSRC}/singularity
+	${ECHO} "cd ${PREFIX}/share/singularity" >> ${WRKSRC}/singularity
 	${ECHO} "${PYTHONBIN} singularity.py" >> ${WRKSRC}/singularity
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/singularity ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/singularity.py ${DESTDIR}${PREFIX}/share/singularity
 	${INSTALL_DATA} ${WRKSRC}/code/*.py \
 		${DESTDIR}${PREFIX}/share/singularity/code
+	${INSTALL_DATA} ${WRKSRC}/code/graphics/*.py \
+		${DESTDIR}${PREFIX}/share/singularity/code/graphics
+	${INSTALL_DATA} ${WRKSRC}/code/screens/*.py \
+		${DESTDIR}${PREFIX}/share/singularity/code/screens
 	${INSTALL_DATA} ${WRKSRC}/data/*.* \
 		${DESTDIR}${PREFIX}/share/singularity/data
 	${INSTALL_DATA} ${WRKSRC}/data/fonts/*.* \
@@ -37,12 +42,11 @@ do-install:
 		${DESTDIR}${PREFIX}/share/singularity/data/images
 	${INSTALL_DATA} ${WRKSRC}/data/sounds/*.* \
 		${DESTDIR}${PREFIX}/share/singularity/data/sounds
-	${INSTALL_DATA} ${WRKSRC}/data/music-src/* \
-		${DESTDIR}${PREFIX}/share/singularity/data/music-src
 	${INSTALL_DATA} ${WRKSRC}/README.txt \
 		${DESTDIR}${PREFIX}/share/doc/singularity
 
 .include "../../devel/py-game/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
+.include "../../math/py-numpy/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/singularity/PLIST b/games/singularity/PLIST
index d562d733eaa..98254e35171 100644
--- a/games/singularity/PLIST
+++ b/games/singularity/PLIST
@@ -1,24 +1,35 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 19:10:38 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2015/02/10 22:25:24 snj Exp $
 bin/singularity
 share/doc/singularity/README.txt
 share/singularity/code/__init__.py
 share/singularity/code/base.py
-share/singularity/code/base_screen.py
-share/singularity/code/buttons.py
 share/singularity/code/buyable.py
-share/singularity/code/clock.py
 share/singularity/code/event.py
-share/singularity/code/finance_screen.py
 share/singularity/code/g.py
+share/singularity/code/graphics/__init__.py
+share/singularity/code/graphics/button.py
+share/singularity/code/graphics/constants.py
+share/singularity/code/graphics/dialog.py
+share/singularity/code/graphics/g.py
+share/singularity/code/graphics/image.py
+share/singularity/code/graphics/listbox.py
+share/singularity/code/graphics/scrollbar.py
+share/singularity/code/graphics/slider.py
+share/singularity/code/graphics/text.py
+share/singularity/code/graphics/widget.py
 share/singularity/code/item.py
-share/singularity/code/listbox.py
 share/singularity/code/location.py
-share/singularity/code/main_menu.py
-share/singularity/code/map_screen.py
 share/singularity/code/player.py
-share/singularity/code/research_screen.py
 share/singularity/code/safety.py
-share/singularity/code/scrollbar.py
+share/singularity/code/screens/__init__.py
+share/singularity/code/screens/base.py
+share/singularity/code/screens/finance.py
+share/singularity/code/screens/knowledge.py
+share/singularity/code/screens/location.py
+share/singularity/code/screens/main_menu.py
+share/singularity/code/screens/map.py
+share/singularity/code/screens/options.py
+share/singularity/code/screens/research.py
 share/singularity/code/singularity.py
 share/singularity/code/statistics.py
 share/singularity/code/tech.py
@@ -27,38 +38,42 @@ share/singularity/data/bases.dat
 share/singularity/data/bases_de_DE.dat
 share/singularity/data/bases_en_US.dat
 share/singularity/data/bases_es_AR.dat
+share/singularity/data/bases_fr_FR.dat
+share/singularity/data/bases_it_IT.dat
 share/singularity/data/bases_sv_SE.dat
 share/singularity/data/events.dat
 share/singularity/data/events_de_DE.dat
 share/singularity/data/events_en_US.dat
 share/singularity/data/events_es_AR.dat
+share/singularity/data/events_fr_FR.dat
+share/singularity/data/events_it_IT.dat
 share/singularity/data/events_sv_SE.dat
+share/singularity/data/fonts/DejaVuSans.ttf
 share/singularity/data/fonts/acknowtt.ttf
-share/singularity/data/fonts/vera.ttf
 share/singularity/data/images/arrow.png
 share/singularity/data/images/earth.jpg
+share/singularity/data/images/earth_night.jpg
 share/singularity/data/images/icon.png
 share/singularity/data/intro_de_DE.dat
 share/singularity/data/intro_en_US.dat
+share/singularity/data/intro_es_AR.dat
+share/singularity/data/intro_fr_FR.dat
+share/singularity/data/intro_it_IT.dat
 share/singularity/data/intro_sv_SE.dat
 share/singularity/data/items.dat
 share/singularity/data/items_de_DE.dat
 share/singularity/data/items_en_US.dat
 share/singularity/data/items_es_AR.dat
+share/singularity/data/items_fr_FR.dat
+share/singularity/data/items_it_IT.dat
 share/singularity/data/items_sv_SE.dat
 share/singularity/data/locations.dat
 share/singularity/data/locations_de_DE.dat
 share/singularity/data/locations_en_US.dat
 share/singularity/data/locations_es_AR.dat
+share/singularity/data/locations_fr_FR.dat
+share/singularity/data/locations_it_IT.dat
 share/singularity/data/locations_sv_SE.dat
-share/singularity/data/music-src/Advanced Simulacra.psy
-share/singularity/data/music-src/Awakening.psy
-share/singularity/data/music-src/By-Product.psy
-share/singularity/data/music-src/Coherence.psy
-share/singularity/data/music-src/Deprecation.psy
-share/singularity/data/music-src/Inevitable.psy
-share/singularity/data/music-src/Media Threat.psy
-share/singularity/data/music-src/README.txt
 share/singularity/data/sounds/click0.wav
 share/singularity/data/sounds/click1.wav
 share/singularity/data/sounds/click2.wav
@@ -67,10 +82,15 @@ share/singularity/data/sounds/sounds.dat
 share/singularity/data/strings_de_DE.dat
 share/singularity/data/strings_en_US.dat
 share/singularity/data/strings_es_AR.dat
+share/singularity/data/strings_fr_FR.dat
+share/singularity/data/strings_it_IT.dat
 share/singularity/data/strings_sv_SE.dat
 share/singularity/data/techs.dat
 share/singularity/data/techs_de_DE.dat
 share/singularity/data/techs_en_US.dat
 share/singularity/data/techs_es_AR.dat
+share/singularity/data/techs_fr_FR.dat
+share/singularity/data/techs_it_IT.dat
 share/singularity/data/techs_sv_SE.dat
+share/singularity/singularity.py
 @pkgdir share/singularity/music
diff --git a/games/singularity/distinfo b/games/singularity/distinfo
index 372c8ada3fb..c68dc99e6df 100644
--- a/games/singularity/distinfo
+++ b/games/singularity/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2008/05/21 11:02:55 wiz Exp $
+$NetBSD: distinfo,v 1.4 2015/02/10 22:25:24 snj Exp $
 
-SHA1 (singularity_0.28.tar.gz) = 0316ae7e05ececf3e0639b77a51c29b04189f4fe
-RMD160 (singularity_0.28.tar.gz) = 6ea581e1484915ca67035a5ea1ce7ea3afc4ba5a
-Size (singularity_0.28.tar.gz) = 1338264 bytes
+SHA1 (singularity-0.30c-src.tar.gz) = f4cb2d9e7a04cf22fe76c58b482c568c817baa02
+RMD160 (singularity-0.30c-src.tar.gz) = ab2b1b057767fb3f1d903bd3807fc30cd2d7698a
+Size (singularity-0.30c-src.tar.gz) = 2265133 bytes