version bump

10 files changed, 367 insertions, 1 deletions

diff --git a/games-roguelike/nethack/ChangeLog b/games-roguelike/nethack/ChangeLog
index 0ecb15641e2f..3b6e02b8c644 100644
--- a/games-roguelike/nethack/ChangeLog
+++ b/games-roguelike/nethack/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-roguelike/nethack
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/ChangeLog,v 1.2 2003/09/10 15:54:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/ChangeLog,v 1.3 2003/09/15 06:55:29 vapier Exp $
+
+*nethack-3.4.2 (15 Sep 2003)
+
+  15 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #27875 + saved games fix #28104 + new qt ver #23149.
 
 *nethack-3.4.1-r1 (07 Aug 2003)
 
diff --git a/games-roguelike/nethack/files/3.4.2-GNOME-support.patch b/games-roguelike/nethack/files/3.4.2-GNOME-support.patch
new file mode 100644
index 000000000000..3a18fae409ad
--- /dev/null
+++ b/games-roguelike/nethack/files/3.4.2-GNOME-support.patch
@@ -0,0 +1,28 @@
+--- include/config.h.orig	2003-06-21 21:06:38.000000000 -0400
++++ include/config.h	2003-06-21 21:12:00.000000000 -0400
+@@ -48 +48 @@
+-/* #define GNOME_GRAPHICS */	/* Gnome interface */
++#define GNOME_GRAPHICS
+@@ -96 +95,0 @@
+-# define USE_XPM		/* Use XPM format for images (required) */
+--- Makefile.orig	2003-06-21 21:06:38.000000000 -0400
++++ Makefile	2003-06-21 21:13:02.000000000 -0400
+@@ -43 +43 @@
+-VARDATND =  x11tiles pet_mark.xbm rip.xpm
++VARDATND =  x11tiles pet_mark.xbm rip.xpm mapbg.xpm
+--- src/Makefile.orig	2003-06-21 21:06:38.000000000 -0400
++++ src/Makefile	2003-06-21 21:17:33.000000000 -0400
+@@ -142 +142 @@
+-GNOMEINC=-I/usr/lib/glib/include -I/usr/lib/gnome-libs/include -I../win/gnome
++GNOMEINC=-I/usr/lib/glib/include -I/usr/lib/gnome-libs/include -I../win/gnome -I/usr/include/gnome-1.0 -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include
+@@ -191 +191 @@
+-	gnyesno.o gnworn.o tile.o
++	gnyesno.o gnworn.o
+@@ -207,2 +207,2 @@
+-WINSRC = $(WINTTYSRC) $(WINX11SRC)
+-WINOBJ = $(WINTTYOBJ) $(WINX11OBJ)
++WINSRC = $(WINTTYSRC) $(WINX11SRC) $(WINGNOMESRC)
++WINOBJ = $(WINTTYOBJ) $(WINX11OBJ) $(WINGNOMEOBJ)
+@@ -248 +248 @@
+-WINLIB = $(WINTTYLIB) $(WINX11LIB)
++WINLIB = $(WINTTYLIB) $(WINX11LIB) $(WINGNOMELIB)
diff --git a/games-roguelike/nethack/files/3.4.2-QT-GNOME-support.patch b/games-roguelike/nethack/files/3.4.2-QT-GNOME-support.patch
new file mode 100644
index 000000000000..2a610d61764f
--- /dev/null
+++ b/games-roguelike/nethack/files/3.4.2-QT-GNOME-support.patch
@@ -0,0 +1,30 @@
+--- include/config.h.orig	2003-06-21 21:06:38.000000000 -0400
++++ include/config.h	2003-06-21 21:12:00.000000000 -0400
+@@ -48 +48 @@
+-/* #define GNOME_GRAPHICS */	/* Gnome interface */
++#define GNOME_GRAPHICS
+--- Makefile.orig	2003-06-21 21:06:38.000000000 -0400
++++ Makefile	2003-06-21 21:13:02.000000000 -0400
+@@ -43 +43 @@
+-VARDATND =  x11tiles pet_mark.xbm rip.xpm
++VARDATND =  x11tiles pet_mark.xbm rip.xpm mapbg.xpm
+--- src/Makefile.orig	2003-06-21 21:06:38.000000000 -0400
++++ src/Makefile	2003-06-21 21:17:33.000000000 -0400
+@@ -142 +142 @@
+-GNOMEINC=-I/usr/lib/glib/include -I/usr/lib/gnome-libs/include -I../win/gnome
++GNOMEINC=-I/usr/lib/glib/include -I/usr/lib/gnome-libs/include -I../win/gnome -I/usr/include/gnome-1.0 -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include
+@@ -191 +191 @@
+-	gnyesno.o gnworn.o tile.o
++	gnyesno.o gnworn.o
+@@ -207,2 +207,2 @@
+-WINSRC = $(WINTTYSRC) $(WINX11SRC) $(WINQTSRC)
+-WINOBJ = $(WINTTYOBJ) $(WINX11OBJ) $(WINQTOBJ)
++WINSRC = $(WINTTYSRC) $(WINX11SRC) $(WINQTSRC) $(WINGNOMESRC)
++WINOBJ = $(WINTTYOBJ) $(WINX11OBJ) $(WINQTOBJ) $(WINGNOMEOBJ)
+@@ -248 +248 @@
+-WINLIB = $(WINTTYLIB) $(WINX11LIB) $(WINQTLIB)
++WINLIB = $(WINTTYLIB) $(WINX11LIB) $(WINQTLIB) $(WINGNOMELIB)
+--- include/config.h.orig	2003-06-21 22:04:25.000000000 -0400
++++ include/config.h	2003-06-21 22:04:31.000000000 -0400
+@@ -96 +95,0 @@
+-# define USE_XPM		/* Use XPM format for images (required) */
diff --git a/games-roguelike/nethack/files/3.4.2-QT-support.patch b/games-roguelike/nethack/files/3.4.2-QT-support.patch
new file mode 100644
index 000000000000..22cfe1a354c8
--- /dev/null
+++ b/games-roguelike/nethack/files/3.4.2-QT-support.patch
@@ -0,0 +1,20 @@
+--- include/config.h.orig	2003-06-21 21:03:14.000000000 -0400
++++ include/config.h	2003-06-21 21:03:20.000000000 -0400
+@@ -47 +47 @@
+-/* #define QT_GRAPHICS */	/* Qt interface */
++#define QT_GRAPHICS
+@@ -89 +88,0 @@
+-# define USE_XPM		/* Use XPM format for images (required) */
+--- src/Makefile.orig	2003-06-21 21:04:41.000000000 -0400
++++ src/Makefile	2003-06-21 21:04:58.000000000 -0400
+@@ -179 +179 @@
+-WINQTOBJ = qt_win.o qt_clust.o qttableview.o tile.o
++WINQTOBJ = qt_win.o qt_clust.o qttableview.o
+@@ -207,2 +207,2 @@
+-WINSRC = $(WINTTYSRC) $(WINX11SRC)
+-WINOBJ = $(WINTTYOBJ) $(WINX11OBJ)
++WINSRC = $(WINTTYSRC) $(WINX11SRC) $(WINQTSRC)
++WINOBJ = $(WINTTYOBJ) $(WINX11OBJ) $(WINQTOBJ)
+@@ -248 +248 @@
+-WINLIB = $(WINTTYLIB) $(WINX11LIB)
++WINLIB = $(WINTTYLIB) $(WINX11LIB) $(WINQTLIB)
diff --git a/games-roguelike/nethack/files/3.4.2-X-support.patch b/games-roguelike/nethack/files/3.4.2-X-support.patch
new file mode 100644
index 000000000000..6687f8865509
--- /dev/null
+++ b/games-roguelike/nethack/files/3.4.2-X-support.patch
@@ -0,0 +1,26 @@
+--- include/config.h.orig	2003-06-21 20:58:57.000000000 -0400
++++ include/config.h	2003-06-21 20:59:44.000000000 -0400
+@@ -46 +46 @@
+-/* #define X11_GRAPHICS */	/* X11 interface */
++#define X11_GRAPHICS 1
+@@ -127 +127 @@
+-/* # define USE_XPM */		/* Disable if you do not have the XPM library */
++# define USE_XPM 1
+--- Makefile.orig	2003-06-21 21:01:03.000000000 -0400
++++ Makefile	2003-06-21 21:01:16.000000000 -0400
+@@ -43 +43 @@
+-VARDATND = 
++VARDATND =  x11tiles pet_mark.xbm rip.xpm
+--- src/Makefile.orig	2003-06-21 21:02:01.000000000 -0400
++++ src/Makefile	2003-06-21 21:02:11.000000000 -0400
+@@ -207,2 +207,2 @@
+-WINSRC = $(WINTTYSRC)
+-WINOBJ = $(WINTTYOBJ)
++WINSRC = $(WINTTYSRC) $(WINX11SRC)
++WINOBJ = $(WINTTYOBJ) $(WINX11OBJ)
+@@ -228 +228 @@
+-WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
++WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11 -lXpm
+@@ -248 +248 @@
+-WINLIB = $(WINTTYLIB)
++WINLIB = $(WINTTYLIB) $(WINX11LIB)
diff --git a/games-roguelike/nethack/files/3.4.2-default-options.patch b/games-roguelike/nethack/files/3.4.2-default-options.patch
new file mode 100644
index 000000000000..03a904c118c7
--- /dev/null
+++ b/games-roguelike/nethack/files/3.4.2-default-options.patch
@@ -0,0 +1,29 @@
+--- include/config.h.orig	2003-06-21 20:44:00.000000000 -0400
++++ include/config.h	2003-06-21 20:46:42.000000000 -0400
+@@ -170,2 +170,2 @@
+-#define COMPRESS "/usr/bin/compress"	/* Lempel-Ziv compression */
+-#define COMPRESS_EXTENSION ".Z"		/* compress's extension */
++#define COMPRESS "/bin/bzip2"	/* Lempel-Ziv compression */
++#define COMPRESS_EXTENSION ".bz2"		/* compress's extension */
+@@ -186 +186 @@
+-/* #define DLB */	/* not supported on all platforms */
++#define DLB 1	/* not supported on all platforms */
+@@ -208 +208 @@
+-#    define HACKDIR "/usr/games/lib/nethackdir"
++#    define HACKDIR "GENTOO_HACKDIR"
+@@ -305 +305 @@
+-/* #define VISION_TABLES */ /* use vision tables generated at compile time */
++#define VISION_TABLES 1 /* use vision tables generated at compile time */
+--- include/unixconf.h.orig	2003-06-21 20:47:54.000000000 -0400
++++ include/unixconf.h	2003-06-21 20:48:39.000000000 -0400
+@@ -40 +40 @@
+-/* #define LINUX */	/* Another Unix clone */
++#define LINUX 1	/* Another Unix clone */
+@@ -135 +135 @@
+-/* #define TIMED_DELAY */	/* usleep() */
++#define TIMED_DELAY 1
+--- src/Makefile.orig	2003-06-21 20:55:36.000000000 -0400
++++ src/Makefile	2003-06-21 20:55:49.000000000 -0400
+@@ -224 +224 @@
+-WINTTYLIB = -ltermlib
++WINTTYLIB = -lncurses
diff --git a/games-roguelike/nethack/files/3.4.2-errno.patch b/games-roguelike/nethack/files/3.4.2-errno.patch
new file mode 100644
index 000000000000..60dcb65b2765
--- /dev/null
+++ b/games-roguelike/nethack/files/3.4.2-errno.patch
@@ -0,0 +1,68 @@
+--- ./src/files.c        2003-03-03 08:29:00.000000000 +0000
++++ ./src/files.c     2003-03-03 08:29:24.000000000 +0000
+@@ -25,7 +25,7 @@
+ # ifdef _DCC
+ const
+ # endif
+-extern int errno;
++#include <errno.h>
+ #endif
+
+ #if defined(UNIX) && defined(QT_GRAPHICS)
+--- ./sys/amiga/winchar.c.orig	2003-02-27 07:23:36.000000000 -0500
++++ ./sys/amiga/winchar.c	2003-02-27 07:24:34.000000000 -0500
+@@ -4,6 +4,7 @@
+ /*    Copyright (c) Gregg Wonderly, Naperville Illinois, 1994.		*/
+ /*    NetHack may be freely redistributed.  See license for details.	*/
+ 
++#include <errno.h>
+ #include <exec/types.h>
+ #include <libraries/iffparse.h>
+ #include <graphics/scale.h>
+@@ -206,7 +207,7 @@
+ {
+     BitMapHeader *bmhd = NULL, bmhds;
+     unsigned char *cmap;
+-    extern int errno;
++
+     register int i, j;
+     struct IFFHandle *iff;
+     struct StoredProperty *prop;
+--- ./sys/unix/cpp2.shr.orig	2003-02-27 07:23:36.000000000 -0500
++++ ./sys/unix/cpp2.shr	2003-02-27 07:25:28.000000000 -0500
+@@ -348,6 +348,7 @@
+ X#endif
+ X
+ X#include	<stdio.h>
++X#include	<errno.h>
+ X#include	<ctype.h>
+ X#include	"cppdef.h"
+ X#include	"cpp.h"
+@@ -1113,7 +1114,6 @@
+ X	int			i;	/* argv[] index		*/
+ X	int			j;	/* Output index		*/
+ X	int			file;	/* File_descriptor 	*/
+-X	extern int		errno;	/* Last vms i/o error 	*/
+ X
+ X	for (j = i = 1; i < argc; i++) {   /* Do all arguments	*/
+ X	    switch (*(ap = argv[i])) {
+--- ./sys/unix/unixunix.c.orig	2003-02-27 07:23:36.000000000 -0500
++++ ./sys/unix/unixunix.c	2003-02-27 07:25:59.000000000 -0500
+@@ -41,9 +41,6 @@
+ 	(void) time(&date);
+ #endif
+ 	if(date - buf.st_mtime < 3L*24L*60L*60L) {	/* recent */
+-#ifndef NETWORK
+-		extern int errno;
+-#endif
+ 		int lockedpid;	/* should be the same size as hackpid */
+ 
+ 		if(read(fd, (genericptr_t)&lockedpid, sizeof(lockedpid)) !=
+@@ -88,7 +85,6 @@
+ void
+ getlock()
+ {
+-	extern int errno;
+ 	register int i = 0, fd, c;
+ 	const char *fq_lock;
+ 
diff --git a/games-roguelike/nethack/files/3.4.2-gentoo-paths.patch b/games-roguelike/nethack/files/3.4.2-gentoo-paths.patch
new file mode 100644
index 000000000000..af86cd1fe637
--- /dev/null
+++ b/games-roguelike/nethack/files/3.4.2-gentoo-paths.patch
@@ -0,0 +1,18 @@
+--- include/unixconf.h.orig	2003-08-07 23:18:03.070299152 -0400
++++ include/unixconf.h	2003-08-07 23:18:39.699730632 -0400
+@@ -96,13 +96,13 @@
+  */
+ 
+ /* #define NO_FILE_LINKS */	/* if no hard links */
+-/* #define LOCKDIR "/usr/games/lib/nethackdir" */	/* where to put locks */
++#define LOCKDIR "GENTOO_STATEDIR"
+ 
+ /*
+  * If you want the static parts of your playground on a read-only file
+  * system, define VAR_PLAYGROUND to be where the variable parts are kept.
+  */
+-/* #define VAR_PLAYGROUND "/var/lib/games/nethack" */
++#define VAR_PLAYGROUND "GENTOO_STATEDIR"
+ 
+ 
+ /*
diff --git a/games-roguelike/nethack/files/digest-nethack-3.4.2 b/games-roguelike/nethack/files/digest-nethack-3.4.2
new file mode 100644
index 000000000000..a4ec600f1de8
--- /dev/null
+++ b/games-roguelike/nethack/files/digest-nethack-3.4.2
@@ -0,0 +1 @@
+MD5 90e971dbaee2f05f6a2ed3454851903a nethack-342.tgz 3475583
diff --git a/games-roguelike/nethack/nethack-3.4.2.ebuild b/games-roguelike/nethack/nethack-3.4.2.ebuild
new file mode 100644
index 000000000000..964553723c5a
--- /dev/null
+++ b/games-roguelike/nethack/nethack-3.4.2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/nethack-3.4.2.ebuild,v 1.1 2003/09/15 06:55:29 vapier Exp $
+
+inherit games eutils flag-o-matic gcc
+append-flags -I../include
+
+MY_PV=${PV//.}
+
+DESCRIPTION="The ultimate old-school single player dungeon exploration game"
+HOMEPAGE="http://www.nethack.org/"
+SRC_URI="mirror://sourceforge/nethack/${PN}-${MY_PV}.tgz"
+#SRC_URI="ftp://ftp.nethack.org/pub/nethack/nh340/src/nethack-340.tgz"
+
+KEYWORDS="x86 ppc"
+SLOT="0"
+LICENSE="nethack"
+IUSE="X qt gnome"
+
+DEPEND="virtual/glibc
+	dev-util/yacc
+	>=sys-libs/ncurses-5.2-r5
+	X? ( x11-base/xfree )
+	qt? ( x11-libs/qt )
+	gnome? ( >=gnome-base/gnome-libs-1.4.1.4-r2 )"
+
+HACKDIR=${GAMES_DATADIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+
+	# This copies the /sys/unix Makefile.*s to their correct places for 
+	# seding and compiling.
+	cd ${S}/sys/unix
+	source setup.sh || die
+
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-gentoo-paths.patch
+	epatch ${FILESDIR}/${PV}-errno.patch
+	epatch ${FILESDIR}/${PV}-default-options.patch
+
+	sed -i "s:GENTOO_STATEDIR:${GAMES_STATEDIR}/${PN}:" include/unixconf.h || die "setting statedir"
+	sed -i "s:GENTOO_HACKDIR:${HACKDIR}:" include/config.h || die "seting hackdir"
+
+	if [ `use X` ] ; then
+		epatch ${FILESDIR}/${PV}-X-support.patch
+		if [ `use qt` ] ; then
+			epatch ${FILESDIR}/${PV}-QT-support.patch
+			[ `use gnome` ] && epatch ${FILESDIR}/${PV}-QT-GNOME-support.patch
+		elif [ `use gnome` ] ; then
+			epatch ${FILESDIR}/${PV}-GNOME-support.patch
+		fi
+	fi
+}
+
+src_compile() {
+	local qtver=
+	has_version =x11-libs/qt-3* \
+		&& qtver=3 \
+		|| qtver=2
+	cd ${S}/src
+	make \
+		QTDIR=/usr/qt/${qtver} \
+		CC="$(gcc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LFLAGS="-L/usr/X11R6/lib" \
+		|| die
+	cd ${S}/util
+	make CFLAGS="${CFLAGS}" recover || die
+}
+
+src_install() {
+	make \
+		CC="$(gcc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LFLAGS="-L/usr/X11R6/lib" \
+		GAMEPERM=0755 \
+		PREFIX=${D}/usr \
+		GAMEDIR=${D}${HACKDIR} \
+		SHELLDIR=${D}/${GAMES_BINDIR} \
+		install \
+		|| die "make install failed"
+	newgamesbin util/recover recover-nethack
+
+	# The final nethack is a sh script.  This fixes the hard-coded
+	# HACKDIR directory so it doesn't point to ${D}/usr/share/nethackdir
+	dosed "s:^\(HACKDIR=\).*:\1${HACKDIR}:" ${GAMES_BINDIR}/nethack
+
+	doman doc/*.6
+	dodoc doc/*.txt
+
+	# Can be copied to ~/.nethackrc to set options
+	# Add this to /etc/.skel as well, thats the place for default configs
+	insinto ${HACKDIR}
+	doins ${FILESDIR}/dot.nethackrc
+	local windowtypes="tty"
+	[ `use gnome` ] && windowtypes="${windowtypes} gnome"
+	[ `use qt` ] && windowtypes="${windowtypes} qt"
+	[ `use X` ] && windowtypes="${windowtypes} x11"
+	set -- ${windowtypes}
+	dosed "s:GENTOO_WINDOWTYPES:${windowtypes}:" ${HACKDIR}/dot.nethackrc
+	dosed "s:GENTOO_DEFWINDOWTYPE:$1:" ${HACKDIR}/dot.nethackrc
+	insinto /etc/skel
+	newins ${D}/${HACKDIR}/dot.nethackrc .nethackrc
+
+	if [ `use X` ] ; then
+		# install nethack fonts
+		cd ${S}/win/X11
+		bdftopcf -o nh10.pcf nh10.bdf || die "Converting fonts failed"
+		bdftopcf -o ibm.pcf ibm.bdf || die "Converting fonts failed"
+		insinto ${HACKDIR}/fonts
+		doins *.pcf
+		cd ${D}/${HACKDIR}/fonts
+		mkfontdir || die "The action mkfontdir ${D}${HACKDIR}/fonts failed"
+
+		# copy nethack x application defaults
+		cd ${S}/win/X11
+		insinto /etc/X11/app-defaults
+		newins NetHack.ad NetHack || die "Failed to install NetHack X app defaults"
+		dosed 's:^!\(NetHack.tile_file.*\):\1:' /etc/X11/app-defaults/NetHack
+	fi
+
+	# make sure we dont overwrite previous settings #16428
+	local statedir=${GAMES_STATEDIR}/${PN}
+	dodir ${statedir}
+	mv ${D}/${HACKDIR}/{record,logfile,perm} ${D}/${statedir}/
+	for f in record logfile perm ; do
+		[ ! -e ${statedir}/${f} ] && continue
+		mv ${D}/${statedir}/${f}{,.sample}
+	done
+	keepdir ${statedir}/save
+
+	prepgamesdirs
+	chmod -R 660 ${D}/${statedir}
+	chmod 770 ${D}/${statedir} ${D}/${statedir}/save
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	einfo "you may want to look at /etc/skel/.nethackrc for interesting options"
+}