summaryrefslogtreecommitdiff
path: root/games/nethack-qt/patches/patch-aa
diff options
context:
space:
mode:
Diffstat (limited to 'games/nethack-qt/patches/patch-aa')
-rw-r--r--games/nethack-qt/patches/patch-aa55
1 files changed, 22 insertions, 33 deletions
diff --git a/games/nethack-qt/patches/patch-aa b/games/nethack-qt/patches/patch-aa
index 442fa597945..029edf71a06 100644
--- a/games/nethack-qt/patches/patch-aa
+++ b/games/nethack-qt/patches/patch-aa
@@ -1,65 +1,54 @@
-$NetBSD: patch-aa,v 1.10 2003/10/14 11:06:35 pooka Exp $
+$NetBSD: patch-aa,v 1.11 2004/03/05 15:21:01 pooka Exp $
---- include/config.h.orig 2003-02-23 16:43:19.000000000 +0200
-+++ include/config.h 2003-03-01 22:54:41.000000000 +0200
+--- include/config.h.old 2003-12-08 01:39:13.000000000 +0200
++++ include/config.h 2004-03-05 17:00:59.000000000 +0200
@@ -42,9 +42,9 @@
* Define all of those you want supported in your binary.
* Some combinations make no sense. See the installation document.
*/
-#define TTY_GRAPHICS /* good old tty based graphics */
-+/* #define TTY_GRAPHICS /* good old tty based graphics */
++/* #define TTY_GRAPHICS */ /* good old tty based graphics */
/* #define X11_GRAPHICS */ /* X11 interface */
-/* #define QT_GRAPHICS */ /* Qt interface */
+#define QT_GRAPHICS /* Qt interface */
/* #define GNOME_GRAPHICS */ /* Gnome interface */
/* #define MSWIN_GRAPHICS */ /* Windows NT, CE, Graphics */
-@@ -84,8 +84,8 @@
-
+@@ -85,7 +85,7 @@
#ifdef QT_GRAPHICS
# define DEFAULT_WC_TILED_MAP /* Default to tiles if users doesn't say wc_ascii_map */
--# define USER_SOUNDS /* Use sounds */
--# define USER_SOUNDS_REGEX
-+/* # define USER_SOUNDS Use sounds */
-+/* # define USER_SOUNDS_REGEX */
+ # define USER_SOUNDS /* Use sounds */
+-# ifndef __APPLE__
++# if !(defined(__APPLE__) || defined(__NetBSD__))
+ # define USER_SOUNDS_REGEX
+ # endif
# define USE_XPM /* Use XPM format for images (required) */
- # define GRAPHIC_TOMBSTONE /* Use graphical tombstone (rip.ppm) */
- # ifndef DEFAULT_WINDOW_SYS
-@@ -112,7 +112,7 @@
- #endif
-
- #ifndef DEFAULT_WINDOW_SYS
--# define DEFAULT_WINDOW_SYS "tty"
-+# define DEFAULT_WINDOW_SYS "Qt"
- #endif
-
- #ifdef X11_GRAPHICS
-@@ -167,11 +167,11 @@
+@@ -169,11 +169,11 @@
#ifdef UNIX
/* path and file name extension for compression program */
-#define COMPRESS "/usr/bin/compress" /* Lempel-Ziv compression */
-#define COMPRESS_EXTENSION ".Z" /* compress's extension */
-+/* #define COMPRESS "/usr/bin/compress" /* Lempel-Ziv compression */
-+/* #define COMPRESS_EXTENSION ".Z" /* compress's extension */
++/* #define COMPRESS "/usr/bin/compress" */ /* Lempel-Ziv compression */
++/* #define COMPRESS_EXTENSION ".Z" */ /* compress's extension */
/* An example of one alternative you might want to use: */
-/* #define COMPRESS "/usr/local/bin/gzip" */ /* FSF gzip compression */
-/* #define COMPRESS_EXTENSION ".gz" */ /* normal gzip extension */
-+#define COMPRESS "/usr/bin/gzip" /* FSF gzip compression */
++#define COMPRESS "@GZIP_PROGRAM@" /* FSF gzip compression */
+#define COMPRESS_EXTENSION ".gz" /* normal gzip extension */
#endif
#ifndef COMPRESS
-@@ -205,7 +205,7 @@
- # ifdef __APPLE__
- # define HACKDIR "nethackdir" /* nethack directory */
- # else
--# define HACKDIR "/usr/games/lib/nethackdir"
-+# define HACKDIR "XXXPREFIXXXX/share/nethackdir340"
- # endif
+@@ -204,7 +204,7 @@
+ * otherwise it will be the current directory.
+ */
+ # ifndef HACKDIR
+-# define HACKDIR "/usr/games/lib/nethackdir"
++# define HACKDIR "XXXPREFIXXXX/share/nethackdir340"
# endif
-@@ -302,7 +302,7 @@
+ /*
+@@ -300,7 +300,7 @@
* functions that have been macroized.
*/