diff options
Diffstat (limited to 'games-roguelike/nethack')
-rw-r--r-- | games-roguelike/nethack/ChangeLog | 11 | ||||
-rw-r--r-- | games-roguelike/nethack/files/3.4.1-GNOME-RTLD_NEXT.patch | 26 | ||||
-rw-r--r-- | games-roguelike/nethack/files/3.4.1-errno.patch | 68 | ||||
-rw-r--r-- | games-roguelike/nethack/files/3.4.3-GNOME-support.patch (renamed from games-roguelike/nethack/files/3.4.1-GNOME-support.patch) | 0 | ||||
-rw-r--r-- | games-roguelike/nethack/files/3.4.3-QT-GNOME-support.patch (renamed from games-roguelike/nethack/files/3.4.1-QT-GNOME-support.patch) | 0 | ||||
-rw-r--r-- | games-roguelike/nethack/files/3.4.3-QT-support.patch (renamed from games-roguelike/nethack/files/3.4.1-QT-support.patch) | 11 | ||||
-rw-r--r-- | games-roguelike/nethack/files/3.4.3-X-support.patch (renamed from games-roguelike/nethack/files/3.4.1-X-support.patch) | 0 | ||||
-rw-r--r-- | games-roguelike/nethack/files/3.4.3-default-options.patch (renamed from games-roguelike/nethack/files/3.4.1-default-options.patch) | 14 | ||||
-rw-r--r-- | games-roguelike/nethack/files/3.4.3-gentoo-paths.patch (renamed from games-roguelike/nethack/files/3.4.1-gentoo-paths.patch) | 0 | ||||
-rw-r--r-- | games-roguelike/nethack/files/digest-nethack-3.4.1-r1 | 1 | ||||
-rw-r--r-- | games-roguelike/nethack/files/digest-nethack-3.4.3 | 1 | ||||
-rw-r--r-- | games-roguelike/nethack/nethack-3.4.3.ebuild (renamed from games-roguelike/nethack/nethack-3.4.1-r1.ebuild) | 47 |
12 files changed, 47 insertions, 132 deletions
diff --git a/games-roguelike/nethack/ChangeLog b/games-roguelike/nethack/ChangeLog index 703e1162535b..56aa6606868b 100644 --- a/games-roguelike/nethack/ChangeLog +++ b/games-roguelike/nethack/ChangeLog @@ -1,12 +1,17 @@ # 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.4 2003/09/17 02:37:17 zul Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/ChangeLog,v 1.5 2004/01/01 09:19:28 vapier Exp $ - 17 Sep 2003; Chuck Short <zul@gentoo.org> nethack-3.4.2.ebuild: - Marked stable for sparc, closes bug #28449. +*nethack-3.4.3 (01 Jan 2003) + + 01 Jan 2003; Mike Frysinger <vapier@gentoo.org> : + Version bump #35558. *nethack-3.4.2 (15 Sep 2003) + 17 Sep 2003; Chuck Short <zul@gentoo.org> nethack-3.4.2.ebuild: + Marked stable for sparc, closes bug #28449. + 15 Sep 2003; Mike Frysinger <vapier@gentoo.org> : Version bump #27875 + saved games fix #28104 + new qt ver #23149. diff --git a/games-roguelike/nethack/files/3.4.1-GNOME-RTLD_NEXT.patch b/games-roguelike/nethack/files/3.4.1-GNOME-RTLD_NEXT.patch deleted file mode 100644 index 728a2d6ab137..000000000000 --- a/games-roguelike/nethack/files/3.4.1-GNOME-RTLD_NEXT.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -ur base.1/sys/unix/unixres.c work/sys/unix/unixres.c ---- base.1/sys/unix/unixres.c 2003-02-23 09:43:39.000000000 -0500 -+++ work/sys/unix/unixres.c 2003-03-05 16:56:12.000000000 -0500 -@@ -14,14 +14,19 @@ - * hide them. - */ - -+/* _GNU_SOURCE has to be set before including config.h, as otherwise -+ * features.h will be included and it will be too late. -+ */ -+ -+#if defined(linux) && defined(__GNUC__) -+# define _GNU_SOURCE -+#endif -+ - #include "config.h" - - #ifdef GETRES_SUPPORT - - # if defined(LINUX) --#ifdef __GNUC__ --#define _GNU_SOURCE --#endif - - /* requires dynamic linking with libc */ - #include <dlfcn.h> diff --git a/games-roguelike/nethack/files/3.4.1-errno.patch b/games-roguelike/nethack/files/3.4.1-errno.patch deleted file mode 100644 index 60dcb65b2765..000000000000 --- a/games-roguelike/nethack/files/3.4.1-errno.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- ./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.1-GNOME-support.patch b/games-roguelike/nethack/files/3.4.3-GNOME-support.patch index 3a18fae409ad..3a18fae409ad 100644 --- a/games-roguelike/nethack/files/3.4.1-GNOME-support.patch +++ b/games-roguelike/nethack/files/3.4.3-GNOME-support.patch diff --git a/games-roguelike/nethack/files/3.4.1-QT-GNOME-support.patch b/games-roguelike/nethack/files/3.4.3-QT-GNOME-support.patch index 2a610d61764f..2a610d61764f 100644 --- a/games-roguelike/nethack/files/3.4.1-QT-GNOME-support.patch +++ b/games-roguelike/nethack/files/3.4.3-QT-GNOME-support.patch diff --git a/games-roguelike/nethack/files/3.4.1-QT-support.patch b/games-roguelike/nethack/files/3.4.3-QT-support.patch index 826aaadae6da..8f8d867be6a8 100644 --- a/games-roguelike/nethack/files/3.4.1-QT-support.patch +++ b/games-roguelike/nethack/files/3.4.3-QT-support.patch @@ -3,21 +3,18 @@ @@ -47 +47 @@ -/* #define QT_GRAPHICS */ /* Qt interface */ +#define QT_GRAPHICS -@@ -89 +88,0 @@ +@@ -91 +90,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 -@@ -155 +155 @@ --#LD=g++ -+LD=g++ -@@ -179 +179 @@ +@@ -189 +189 @@ -WINQTOBJ = qt_win.o qt_clust.o qttableview.o tile.o +WINQTOBJ = qt_win.o qt_clust.o qttableview.o -@@ -207,2 +207,2 @@ +@@ -217,2 +217,2 @@ -WINSRC = $(WINTTYSRC) $(WINX11SRC) -WINOBJ = $(WINTTYOBJ) $(WINX11OBJ) +WINSRC = $(WINTTYSRC) $(WINX11SRC) $(WINQTSRC) +WINOBJ = $(WINTTYOBJ) $(WINX11OBJ) $(WINQTOBJ) -@@ -248 +248 @@ +@@ -258 +258 @@ -WINLIB = $(WINTTYLIB) $(WINX11LIB) +WINLIB = $(WINTTYLIB) $(WINX11LIB) $(WINQTLIB) diff --git a/games-roguelike/nethack/files/3.4.1-X-support.patch b/games-roguelike/nethack/files/3.4.3-X-support.patch index 6687f8865509..6687f8865509 100644 --- a/games-roguelike/nethack/files/3.4.1-X-support.patch +++ b/games-roguelike/nethack/files/3.4.3-X-support.patch diff --git a/games-roguelike/nethack/files/3.4.1-default-options.patch b/games-roguelike/nethack/files/3.4.3-default-options.patch index 03a904c118c7..83ab94a95375 100644 --- a/games-roguelike/nethack/files/3.4.1-default-options.patch +++ b/games-roguelike/nethack/files/3.4.3-default-options.patch @@ -1,17 +1,17 @@ --- 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 @@ +@@ -172,2 +172,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 @@ +@@ -188 +188 @@ -/* #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 @@ +@@ -207 +207 @@ +-# define HACKDIR "/usr/games/lib/nethackdir" ++# define HACKDIR "GENTOO_HACKDIR" +@@ -303 +303 @@ -/* #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 @@ -24,6 +24,6 @@ +#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 @@ +@@ -234 +234 @@ -WINTTYLIB = -ltermlib +WINTTYLIB = -lncurses diff --git a/games-roguelike/nethack/files/3.4.1-gentoo-paths.patch b/games-roguelike/nethack/files/3.4.3-gentoo-paths.patch index af86cd1fe637..af86cd1fe637 100644 --- a/games-roguelike/nethack/files/3.4.1-gentoo-paths.patch +++ b/games-roguelike/nethack/files/3.4.3-gentoo-paths.patch diff --git a/games-roguelike/nethack/files/digest-nethack-3.4.1-r1 b/games-roguelike/nethack/files/digest-nethack-3.4.1-r1 deleted file mode 100644 index b4a7e712fb68..000000000000 --- a/games-roguelike/nethack/files/digest-nethack-3.4.1-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 aefcbeb20210b2d64511c84bd03c3e4e nethack-341.tgz 3492419 diff --git a/games-roguelike/nethack/files/digest-nethack-3.4.3 b/games-roguelike/nethack/files/digest-nethack-3.4.3 new file mode 100644 index 000000000000..ba80af888282 --- /dev/null +++ b/games-roguelike/nethack/files/digest-nethack-3.4.3 @@ -0,0 +1 @@ +MD5 21479c95990eefe7650df582426457f9 nethack-343-src.tgz 3497458 diff --git a/games-roguelike/nethack/nethack-3.4.1-r1.ebuild b/games-roguelike/nethack/nethack-3.4.3.ebuild index 7b7e69d2c238..b5d6e68713d1 100644 --- a/games-roguelike/nethack/nethack-3.4.1-r1.ebuild +++ b/games-roguelike/nethack/nethack-3.4.3.ebuild @@ -1,27 +1,25 @@ # 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.1-r1.ebuild,v 1.1 2003/09/10 04:59:58 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/nethack-3.4.3.ebuild,v 1.1 2004/01/01 09:19:28 vapier Exp $ -inherit games eutils flag-o-matic -append-flags -fomit-frame-pointer -I../include +inherit games eutils gcc flag-o-matic 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="mirror://sourceforge/nethack/${PN}-${MY_PV}-src.tgz" #SRC_URI="ftp://ftp.nethack.org/pub/nethack/nh340/src/nethack-340.tgz" -KEYWORDS="x86 ppc" -SLOT="0" LICENSE="nethack" +SLOT="0" +KEYWORDS="x86 ppc sparc" IUSE="X qt gnome" DEPEND="virtual/glibc dev-util/yacc >=sys-libs/ncurses-5.2-r5 X? ( x11-base/xfree ) - qt? ( =x11-libs/qt-2* ) + qt? ( x11-libs/qt ) gnome? ( >=gnome-base/gnome-libs-1.4.1.4-r2 )" HACKDIR=${GAMES_DATADIR}/${PN} @@ -36,8 +34,7 @@ src_unpack() { cd ${S} epatch ${FILESDIR}/${PV}-gentoo-paths.patch - epatch ${FILESDIR}/${PV}-errno.patch - epatch ${FILESDIR}/${PV}-GNOME-RTLD_NEXT.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" @@ -55,20 +52,25 @@ src_unpack() { } src_compile() { + local qtver= + has_version =x11-libs/qt-3* \ + && qtver=3 \ + || qtver=2 cd ${S}/src + append-flags -I../include make \ - QTDIR=/usr/qt/2 \ - CC="${CC:-gcc}" \ + QTDIR=/usr/qt/${qtver} \ + CC="$(gcc-getCC)" \ CFLAGS="${CFLAGS}" \ LFLAGS="-L/usr/X11R6/lib" \ - || die + || die "main build failed" cd ${S}/util - make CFLAGS="${CFLAGS}" recover || die + make CFLAGS="${CFLAGS}" recover || die "util build failed" } src_install() { make \ - CC="${CC:-gcc}" \ + CC="$(gcc-getCC)" \ CFLAGS="${CFLAGS}" \ LFLAGS="-L/usr/X11R6/lib" \ GAMEPERM=0755 \ @@ -125,15 +127,20 @@ src_install() { [ ! -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() { - touch ${GAMES_STATEDIR}/${PN}/{record,logfile,perm} - mkdir -p ${GAMES_STATEDIR}/${PN}/save - chmod -R 660 ${GAMES_STATEDIR}/${PN} - chmod 770 ${GAMES_STATEDIR}/${PN} ${GAMES_STATEDIR}/${PN}/save - einfo "you may want to look at /etc/skel/.nethackrc for interesting options" games_pkg_postinst + if [ `use qt` ] ; then + if has_version '=x11-libs/qt-3.1*' ; then + ewarn "the qt frontend may be a little unstable with this version of qt" + ewarn "please see Bug 32629 for more information" + fi + fi + einfo "you may want to look at /etc/skel/.nethackrc for interesting options" } |