summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--games-roguelike/nethack/files/3.4.2-GNOME-support.patch28
-rw-r--r--games-roguelike/nethack/files/3.4.2-QT-GNOME-support.patch30
-rw-r--r--games-roguelike/nethack/files/3.4.2-QT-support.patch31
-rw-r--r--games-roguelike/nethack/files/3.4.2-X-support.patch26
-rw-r--r--games-roguelike/nethack/files/3.4.2-default-options.patch29
-rw-r--r--games-roguelike/nethack/files/3.4.2-errno.patch68
-rw-r--r--games-roguelike/nethack/files/3.4.2-gentoo-paths.patch18
7 files changed, 0 insertions, 230 deletions
diff --git a/games-roguelike/nethack/files/3.4.2-GNOME-support.patch b/games-roguelike/nethack/files/3.4.2-GNOME-support.patch
deleted file mode 100644
index 3a18fae409ad..000000000000
--- a/games-roguelike/nethack/files/3.4.2-GNOME-support.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- 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
deleted file mode 100644
index 2a610d61764f..000000000000
--- a/games-roguelike/nethack/files/3.4.2-QT-GNOME-support.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- 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
deleted file mode 100644
index 93014af91ae8..000000000000
--- a/games-roguelike/nethack/files/3.4.2-QT-support.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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 -ur nethack-3.4.2/win/Qt/qt_win.cpp nethack-3.4.2-gentoo/win/Qt/qt_win.cpp
---- win/Qt/qt_win.cpp.orig 2003-09-30 01:47:32.000000000 +1200
-+++ win/Qt/qt_win.cpp 2003-09-30 02:16:34.000000000 +1200
-@@ -57,6 +57,7 @@
- #include "dlb.h"
- #include "patchlevel.h"
- #include "tile2x11.h"
-+#undef Invisible
- #undef Warning
- #undef red
- #undef green
diff --git a/games-roguelike/nethack/files/3.4.2-X-support.patch b/games-roguelike/nethack/files/3.4.2-X-support.patch
deleted file mode 100644
index 6687f8865509..000000000000
--- a/games-roguelike/nethack/files/3.4.2-X-support.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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
deleted file mode 100644
index 03a904c118c7..000000000000
--- a/games-roguelike/nethack/files/3.4.2-default-options.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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
deleted file mode 100644
index 60dcb65b2765..000000000000
--- a/games-roguelike/nethack/files/3.4.2-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.2-gentoo-paths.patch b/games-roguelike/nethack/files/3.4.2-gentoo-paths.patch
deleted file mode 100644
index af86cd1fe637..000000000000
--- a/games-roguelike/nethack/files/3.4.2-gentoo-paths.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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"
-
-
- /*