version bump - ebuild and patch supplied by Aaron Walker via bug #48477

5 files changed, 213 insertions, 3 deletions

diff --git a/games-arcade/njam/ChangeLog b/games-arcade/njam/ChangeLog
index 540cb86be6ff..ecd43d4ca955 100644
--- a/games-arcade/njam/ChangeLog
+++ b/games-arcade/njam/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-arcade/njam
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/njam/ChangeLog,v 1.5 2004/06/24 22:09:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/njam/ChangeLog,v 1.6 2004/09/11 07:22:55 mr_bones_ Exp $
+
+*njam-1.21 (11 Sep 2004)
+
+  11 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org> +files/1.21-conf.patch,
+  +njam-1.21.ebuild:
+  version bump - ebuild and patch supplied by Aaron Walker via bug #48477
 
   07 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> njam-1.00.ebuild:
   add eutils for epatch
diff --git a/games-arcade/njam/Manifest b/games-arcade/njam/Manifest
index 0695643cb293..e3fc703b29f9 100644
--- a/games-arcade/njam/Manifest
+++ b/games-arcade/njam/Manifest
@@ -1,9 +1,12 @@
-MD5 6d7475bbb8f42e23e37690f2f499c1b1 ChangeLog 688
+MD5 d77b7c39c2c9b2c96ffe0340c1a2d2fd ChangeLog 890
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 fffcf4f14c241a1cf17510d983d63b9e njam-0.96.ebuild 1008
 MD5 214dc735bfa597e82eebe8f8ee84875c njam-1.00.ebuild 1930
-MD5 39dee9ea7a61dbef098f3a7421758fef files/njam-1.00-conf.patch 3136
+MD5 f19c0794c42c7f166f17b8ff6b0350ab njam-1.21.ebuild 1814
 MD5 959b0cda2752af90309b81d91e8984fb files/digest-njam-0.96 66
 MD5 8fa83f62f9156efb50d3e66e8b1dba2a files/digest-njam-1.00 66
+MD5 39dee9ea7a61dbef098f3a7421758fef files/njam-1.00-conf.patch 3136
+MD5 d997203b1f58b2e497d17e7f9c670f5c files/digest-njam-1.21 66
+MD5 87cb7d4a12739db2f6f737e7dbed52ab files/1.21-conf.patch 3420
 MD5 cd9bb343d66a3e25ae8edd50bef223de files/0.96/njam.diff 7257
 MD5 136cbe591908936157d78aa9858ea054 files/0.96/njamgame.diff 980
diff --git a/games-arcade/njam/files/1.21-conf.patch b/games-arcade/njam/files/1.21-conf.patch
new file mode 100644
index 000000000000..e3ee74547ec3
--- /dev/null
+++ b/games-arcade/njam/files/1.21-conf.patch
@@ -0,0 +1,136 @@
+--- njam.cpp.orig	2004-08-31 23:08:03.911280616 -0400
++++ njam.cpp	2004-08-31 23:57:05.560082024 -0400
+@@ -33,6 +33,9 @@
+ // needed for chdir

+ #ifdef __linux__

+ #include <unistd.h>

++// for mkdir

++#include <sys/stat.h>

++#include <sys/types.h>

+ #endif

+ 

+ #include <stdio.h>

+@@ -215,15 +218,31 @@
+ 		SDLNet_Quit();

+ 

+ 	// write configuration options

+-	char filename[] = "njam.conf";

+-	FILE *fp = fopen(filename, "w+");

+-	if (fp)

+-	{

+-		fprintf(fp, "M=%d\n", (m_GameOptions.PlayMusic ? 1 : 0));

+-		fprintf(fp, "S=%d\n", (m_GameOptions.PlaySound ? 1 : 0));

+-		fprintf(fp, "U=%d\n", m_GameOptions.UsedSkin);

+-		fprintf(fp, "I=%s\n", m_GameOptions.ServerIP);

+-		fclose(fp);

++	FILE *fp;

++	

++	if(getenv("HOME") && (chdir(getenv("HOME")) == 0))

++	{

++		mkdir(".njam", 0774);

++		

++		if(chdir(".njam") == 0)

++		{

++			char filename[] = "njam.conf";

++			fp = fopen(filename, "w+");

++			

++			if(fp)

++			{

++				fprintf(fp,

++					"M=%d\n",

++					"S=%d\n",

++					"U=%d\n",

++					"I=%d\n",

++					(m_GameOptions.PlayMusic ? 1 : 0),

++					(m_GameOptions.PlaySound ? 1 : 0),

++					m_GameOptions.UsedSkin,

++					m_GameOptions.ServerIP);

++				fclose(fp);

++			}

++		}

+ 	}

+ 

+ 		// format: NAME#POINTS#LEVEL#

+@@ -599,37 +618,52 @@
+ 	m_FontYellow = new NjamFont("data/font-yellow.bmp", 10, 15);

+ 

+ 	// Load user settings from .conf file

+-	char filename[] = "njam.conf";

+-	FILE *fp = fopen(filename, "r");

+-	if (fp)

+-	{

+-		LogFile("Reading njam.conf file.\n");

+-		char buff[20];

+-		while (true)

++	FILE *fp;

++	

++	if(getenv("HOME") && (chdir(getenv("HOME")) == 0) &&

++		(chdir(".njam") == 0))

++	{

++		char filename[] = "njam.conf";

++		fp = fopen(filename, "r");

++		

++		if(fp)

+ 		{

+-			fgets(buff, 20, fp);

+-			if (feof(fp))

+-				break;

++			LogFile("Reading njam.conf file.\n");

++			char buff[20];

+ 

+-			if (buff[1] == '=')

++			while (true)

+ 			{

+-				int i;

+-				switch (buff[0])

++				fgets(buff, 20, fp);

++				if (feof(fp))

++					break;

++

++				if (buff[1] == '=')

+ 				{

+-					case 'M':	m_GameOptions.PlayMusic = (buff[2] == '1');		break;

+-					case 'S':	m_GameOptions.PlaySound = (buff[2] == '1');		break;

+-					case 'U':	m_GameOptions.UsedSkin = (buff[2] - '0');	break;

+-					case 'I':	// serverIP

+-						for (i=2; buff[i] != '\n' && buff[i] && i<17; i++)

+-							m_GameOptions.ServerIP[i-2] = buff[i];

+-						m_GameOptions.ServerIP[i] = '\0';

+-						break;

+-					default:

+-						printf("Unknown configuration file option: %c\n", buff[0]);

++					int i;

++					switch (buff[0])

++					{

++						case 'M':	

++							m_GameOptions.PlayMusic = (buff[2] == '1');

++							break;

++						case 'S':

++							m_GameOptions.PlaySound = (buff[2] == '1');

++							break;

++						case 'U':

++							m_GameOptions.UsedSkin = (buff[2] - '0');

++							break;

++						case 'I':	// serverIP

++							for (i=2; buff[i] != '\n' && buff[i] && i<17; i++)

++								m_GameOptions.ServerIP[i-2] = buff[i];

++							m_GameOptions.ServerIP[i] = '\0';

++							break;

++						default:

++							printf("Unknown configuration file option: %c\n", 

++								buff[0]);

++					}

+ 				}

+ 			}

++			fclose(fp);

+ 		}

+-		fclose(fp);

+ 	}

+ 

+ 	// create default hiscore

+@@ -992,4 +1026,4 @@
+ 		SDL_Flip(m_Screen);

+ 	}

+ }

+-//---------------------------------------------------------------------------

++//---------------------------------------------------------------------------
diff --git a/games-arcade/njam/files/digest-njam-1.21 b/games-arcade/njam/files/digest-njam-1.21
new file mode 100644
index 000000000000..716e4acc14d3
--- /dev/null
+++ b/games-arcade/njam/files/digest-njam-1.21
@@ -0,0 +1 @@
+MD5 aa1889ea750fabff3029b95ad21ad1fa njam-1.21-src.tar.gz 1438351
diff --git a/games-arcade/njam/njam-1.21.ebuild b/games-arcade/njam/njam-1.21.ebuild
new file mode 100644
index 000000000000..5321eefba1b8
--- /dev/null
+++ b/games-arcade/njam/njam-1.21.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/njam/njam-1.21.ebuild,v 1.1 2004/09/11 07:22:55 mr_bones_ Exp $
+
+inherit eutils flag-o-matic games
+
+MY_P="${P}-src"
+DESCRIPTION="Multi or single-player network Pacman-like game in SDL"
+HOMEPAGE="http://njam.sourceforge.net/"
+SRC_URI="miqrror://sourceforge/njam/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc ~amd64"
+IUSE=""
+
+DEPEND=">=media-libs/sdl-mixer-1.2.5
+	>=media-libs/sdl-image-1.2.2
+	>=media-libs/libsdl-1.2.5
+	>=media-libs/sdl-net-1.2.4"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# store the conf file in the user's home directory.
+	epatch "${FILESDIR}/${PV}-conf.patch"
+
+	sed -i \
+		-e "s:\"data:\"${GAMES_DATADIR}/${PN}/data:" njam.cpp njamgame.cpp \
+		|| die "sed njam.cpp and njamgame.cpp failed"
+	sed -i \
+		-e "s:\"hiscore.dat:\"${GAMES_STATEDIR}/${PN}/hiscore.dat:" \
+		-e "s:\"skins:\"${GAMES_DATADIR}/${PN}/skins:" njam.cpp \
+		|| die "sed njam.cpp failed"
+	sed -i \
+		-e "s:\"levels:\"${GAMES_DATADIR}/${PN}/levels:" njamedit.cpp \
+		|| die "sed njamedit.cpp failed"
+	sed -i \
+		-e "s:\"log.txt:\"/dev/null:" njamutils.cpp \
+		|| die "sed njamutils.cpp failed"
+
+	# njam segfaults on startup with -Os
+	replace-flags "-Os" "-O2"
+
+	sed -i \
+		-e '/^PREFIX/s:=.*:=/usr/share:' \
+		-e "s:-O3:${CFLAGS}:" Makefile \
+		|| die "sed Makefile failed"
+}
+
+src_install() {
+	dogamesbin njam || die "dogamesbin failed"
+	dodoc CHANGES README TODO
+	dohtml html/*
+	dodir "${GAMES_DATADIR}/njam"
+	cp -r data/ skins/ levels/ "${D}${GAMES_DATADIR}/njam" || die "cp failed"
+	dodir "${GAMES_STATEDIR}/${PN}"
+	touch "${D}/${GAMES_STATEDIR}/${PN}/hiscore.dat"
+	fperms 664 "${GAMES_STATEDIR}/${PN}/hiscore.dat"
+	prepgamesdirs
+}