version bump

(Portage version: 2.0.51.22-r2)

5 files changed, 176 insertions, 1 deletions

diff --git a/games-misc/bsd-games/ChangeLog b/games-misc/bsd-games/ChangeLog
index 731de7741297..4b0c22004b0c 100644
--- a/games-misc/bsd-games/ChangeLog
+++ b/games-misc/bsd-games/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-misc/bsd-games
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/bsd-games/ChangeLog,v 1.12 2005/08/13 04:04:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/bsd-games/ChangeLog,v 1.13 2005/08/15 02:32:49 mr_bones_ Exp $
+
+*bsd-games-2.17 (15 Aug 2005)
+
+  15 Aug 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/bsd-games-2.17-gcc4.patch, +files/2.17-64bit.patch,
+  +bsd-games-2.17.ebuild:
+  version bump
 
   13 Aug 2005; Mike Frysinger <vapier@gentoo.org>
   +files/bsd-games-2.13-gcc4.patch, bsd-games-2.13-r1.ebuild:
diff --git a/games-misc/bsd-games/bsd-games-2.17.ebuild b/games-misc/bsd-games/bsd-games-2.17.ebuild
new file mode 100644
index 000000000000..e14075787cc5
--- /dev/null
+++ b/games-misc/bsd-games/bsd-games-2.17.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-misc/bsd-games/bsd-games-2.17.ebuild,v 1.1 2005/08/15 02:32:49 mr_bones_ Exp $
+
+inherit eutils games
+
+DESCRIPTION="collection of games from NetBSD"
+HOMEPAGE="http://www.advogato.org/proj/bsd-games/"
+SRC_URI="ftp://metalab.unc.edu/pub/Linux/games/${P}.tar.gz
+	mirror://debian/pool/main/b/bsdgames/bsdgames_${PV}-2.diff.gz
+	nonfree? ( ftp://metalab.unc.edu/pub/Linux/games/${PN}-non-free-${PV}.tar.gz )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="!games-misc/wtf
+	sys-libs/ncurses
+	sys-apps/miscfiles
+	sys-apps/less
+	sys-devel/flex"
+DEPEND="${RDEPEND}
+	sys-devel/bison"
+
+# Set GAMES_TO_BUILD variable to whatever you want
+export GAMES_TO_BUILD=${GAMES_TO_BUILD:="adventure arithmetic atc
+backgammon banner battlestar bcd boggle caesar canfield countmail cribbage
+dab dm factor fish fortune gomoku hack hangman hunt mille monop morse
+number phantasia pig pom ppt primes quiz rain random robots sail snake
+tetris trek wargames worm worms wtf wump"}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch \
+		"${DISTDIR}/bsdgames_${PV}-2.diff.gz" \
+		"${FILESDIR}"/${PV}-64bit.patch \
+		"${FILESDIR}"/${P}-gcc4.patch
+
+	sed -i \
+		-e "s:/usr/games:${GAMES_BINDIR}:" \
+		wargames/wargames \
+		|| die "sed wargames failed"
+
+	cp "${FILESDIR}"/config.params-gentoo config.params
+	echo bsd_games_cfg_build_dirs=\"${GAMES_TO_BUILD}\" >> ./config.params
+}
+
+src_compile() {
+	./configure || die
+	emake OPTIMIZE="${CFLAGS}" || die "emake failed"
+}
+
+build_game() {
+	has ${1} ${GAMES_TO_BUILD}
+}
+
+do_statefile() {
+	touch "${D}/${GAMES_STATEDIR}/${1}"
+	chmod ug+rw "${D}/${GAMES_STATEDIR}/${1}"
+}
+
+src_install() {
+	dodir "${GAMES_BINDIR}" "${GAMES_STATEDIR}" /usr/share/man/man{1,6}
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS BUGS ChangeLog ChangeLog.0 \
+		README PACKAGING SECURITY THANKS TODO YEAR2000
+
+	# set some binaries to run as games group (+S)
+	build_game atc && fperms g+s "${GAMES_BINDIR}"/atc
+	build_game battlestar && fperms g+s "${GAMES_BINDIR}"/battlestar
+	build_game canfield && fperms g+s "${GAMES_BINDIR}"/canfield
+	build_game cribbage && fperms g+s "${GAMES_BINDIR}"/cribbage
+	build_game phantasia && fperms g+s "${GAMES_BINDIR}"/phantasia
+	build_game robots && fperms g+s "${GAMES_BINDIR}"/robots
+	build_game sail && fperms g+s "${GAMES_BINDIR}"/sail
+	build_game snake && fperms g+s "${GAMES_BINDIR}"/snake
+	build_game tetris && fperms g+s "${GAMES_BINDIR}"/tetris-bsd
+
+	# state files
+	build_game atc && do_statefile atc_score
+	build_game battlestar && do_statefile battlestar.log
+	build_game canfield && do_statefile cfscores
+	build_game cribbage && do_statefile criblog
+	build_game robots && do_statefile robots_roll
+	build_game sail && do_statefile saillog
+	build_game snake && do_statefile snake.log && do_statefile snakerawscores
+	build_game tetris && do_statefile tetris-bsd.scores
+	# state dirs
+	chmod -R ug+rw "${D}/${GAMES_STATEDIR}"/*
+
+	# extra docs
+	build_game atc && { docinto atc ; dodoc atc/BUGS; }
+	build_game boggle && { docinto boggle ; dodoc boggle/README{,.linux}; }
+	build_game hunt && { docinto hunt ; dodoc hunt/README{,.linux}; }
+	build_game phantasia && { docinto phantasia ; dodoc phantasia/{OWNER,README}; }
+	build_game trek && { docinto trek ; dodoc trek/USD.doc/trek.me; }
+
+	# Since factor is usually not installed, and primes.6 is a symlink to
+	# factor.6, make sure that primes.6 is ok ...
+	if build_game primes && [ ! $(build_game factor) ] ; then
+		rm -f "${D}"/usr/share/man/man6/{factor,primes}.6
+		newman factor/factor.6 primes.6
+	fi
+
+	prepalldocs
+	prepgamesdirs
+}
diff --git a/games-misc/bsd-games/files/2.17-64bit.patch b/games-misc/bsd-games/files/2.17-64bit.patch
new file mode 100644
index 000000000000..1457c7ef5413
--- /dev/null
+++ b/games-misc/bsd-games/files/2.17-64bit.patch
@@ -0,0 +1,21 @@
+David Leverton writes:
+
+The 'adventure' game from the games-misc/bsd-games-2.13 package crashes 
+when saving the game on AMD64 (and probably other 64-bit systems, but I 
+haven't checked).  Find attached to fix this.
+
+http://bugs.gentoo.org/show_bug.cgi?id=77032
+
+--- bsd-games-2.13/adventure/crc.c~	1999-04-04 12:49:03.000000000 +0100
++++ bsd-games-2.13/adventure/crc.c	2005-01-07 02:42:07.027698064 +0000
+@@ -134,7 +134,8 @@
+ 				if (step >= sizeof(crctab) / sizeof(crctab[0]))
+ 					step = 0;
+ 			}
+-			crcval = (crcval << 8) ^ crctab[i];
++			/* Mask to 32 bits. */
++			crcval = ((crcval << 8) ^ crctab[i]) & 0xffffffff;
+ 		}
+-	return crcval & 0xffffffff;	/* Mask to 32 bits. */
++	return crcval;
+ }
diff --git a/games-misc/bsd-games/files/bsd-games-2.17-gcc4.patch b/games-misc/bsd-games/files/bsd-games-2.17-gcc4.patch
new file mode 100644
index 000000000000..7de07effc25d
--- /dev/null
+++ b/games-misc/bsd-games/files/bsd-games-2.17-gcc4.patch
@@ -0,0 +1,34 @@
+--- trek/getpar.h.orig	2005-08-14 19:45:29.000000000 -0400
++++ trek/getpar.h	2005-08-14 19:46:33.000000000 -0400
+@@ -31,6 +31,9 @@
+  *	@(#)getpar.h	8.1 (Berkeley) 5/31/93
+  */
+ 
++#ifndef __GETPAR_H_
++#define __GETPAR_H_
++
+ typedef void (*cmdfun)(int);
+ struct cvntab		/* used for getcodpar() parameter list */
+ {
+@@ -51,3 +54,5 @@
+ int testnl(void);
+ void skiptonl(int);
+ int readdelim(int);
++
++#endif /*__GETPAR_H_*/
+--- trek/trek.h.orig	2005-08-14 19:45:37.000000000 -0400
++++ trek/trek.h	2005-08-14 19:48:17.000000000 -0400
+@@ -31,6 +31,13 @@
+  *	@(#)trek.h	8.1 (Berkeley) 5/31/93
+  */
+ 
++/* For struct cvntab definition, which is now required for
++ * Skitab and Lentab below.  gcc 4.0 and later will emit
++ * "array type has incomplete element type" errors otherwise.
++ * -- Jason Bucata (jbucata@tulsaconnect.com), 12-AUG-2005
++ */
++#include "getpar.h"
++
+ /*
+ **  Global Declarations
+ **
diff --git a/games-misc/bsd-games/files/digest-bsd-games-2.17 b/games-misc/bsd-games/files/digest-bsd-games-2.17
new file mode 100644
index 000000000000..cc1c0d46eb9d
--- /dev/null
+++ b/games-misc/bsd-games/files/digest-bsd-games-2.17
@@ -0,0 +1,3 @@
+MD5 238a38a3a017ca9b216fc42bde405639 bsd-games-2.17.tar.gz 2563311
+MD5 ea3dd69c30858bcfe1bb086af998dba1 bsdgames_2.17-2.diff.gz 11373
+MD5 f70b5fe38c3dd82b44024263819621f9 bsd-games-non-free-2.17.tar.gz 181134