components/nethack/patches/nethack.patch

   1 --- include/config.h.old        Sun Dec  7 15:39:13 2003
   2 +++ include/config.h    Sun Mar 30 12:37:01 2008
   3 @@ -43,7 +43,7 @@
   4   * Some combinations make no sense.  See the installation document.
   5   */
   6  #define TTY_GRAPHICS   /* good old tty based graphics */
   7 -/* #define X11_GRAPHICS */     /* X11 interface */
   8 +#define X11_GRAPHICS   /* X11 interface */
   9  /* #define QT_GRAPHICS */      /* Qt interface */
  10  /* #define GNOME_GRAPHICS */   /* Gnome interface */
  11  /* #define MSWIN_GRAPHICS */   /* Windows NT, CE, Graphics */
  12 @@ -126,7 +126,7 @@
  13   * would allow:
  14   *  xpmtoppm <x11tiles.xpm | pnmscale 1.25 | ppmquant 90 >x11tiles_big.xpm
  15   */
  16 -/* # define USE_XPM */         /* Disable if you do not have the XPM library */
  17 +# define USE_XPM               /* Disable if you do not have the XPM library */
  18  # ifdef USE_XPM
  19  #  define GRAPHIC_TOMBSTONE    /* Use graphical tombstone (rip.xpm) */
  20  # endif
  21 @@ -169,11 +169,11 @@
  22
  23  #ifdef UNIX
  24  /* path and file name extension for compression program */
  25 -#define COMPRESS "/usr/bin/compress"   /* Lempel-Ziv compression */
  26 -#define COMPRESS_EXTENSION ".Z"                /* compress's extension */
  27 +/* #define COMPRESS "/usr/bin/compress"        /* Lempel-Ziv compression */
  28 +/* #define COMPRESS_EXTENSION ".Z"             /* compress's extension */
  29  /* An example of one alternative you might want to use: */
  30 -/* #define COMPRESS "/usr/local/bin/gzip" */   /* FSF gzip compression */
  31 -/* #define COMPRESS_EXTENSION ".gz" */         /* normal gzip extension */
  32 +#define COMPRESS "/usr/bin/gzip"       /* FSF gzip compression */
  33 +#define COMPRESS_EXTENSION ".gz"               /* normal gzip extension */
  34  #endif
  35
  36  #ifndef COMPRESS
  37 @@ -204,7 +204,7 @@
  38   * otherwise it will be the current directory.
  39   */
  40  # ifndef HACKDIR
  41 -#  define HACKDIR "/usr/games/lib/nethackdir"
  42 +#  define HACKDIR "/usr/lib/nethack"
  43  # endif
  44
  45  /*
  46 @@ -300,7 +300,7 @@
  47   * functions that have been macroized.
  48   */
  49
  50 -/* #define VISION_TABLES */ /* use vision tables generated at compile time */
  51 +#define VISION_TABLES 1 /* use vision tables generated at compile time */
  52  #ifndef VISION_TABLES
  53  # ifndef NO_MACRO_CPATH
  54  #  define MACRO_CPATH  /* use clear_path macros instead of functions */
  55 --- include/unixconf.h.old      2003-12-07 15:39:13.000000000 -0800
  56 +++ include/unixconf.h  2007-09-27 09:12:36.692549857 -0700
  57 @@ -96,13 +96,13 @@
  58   */
  59
  60  /* #define NO_FILE_LINKS */    /* if no hard links */
  61 -/* #define LOCKDIR "/usr/games/lib/nethackdir" */      /* where to put locks */
  62 +#define LOCKDIR "/var/games/nethack" /* where to put locks */
  63
  64  /*
  65   * If you want the static parts of your playground on a read-only file
  66   * system, define VAR_PLAYGROUND to be where the variable parts are kept.
  67   */
  68 -/* #define VAR_PLAYGROUND "/var/lib/games/nethack" */
  69 +#define VAR_PLAYGROUND "/var/games/nethack"
  70
  71
  72  /*
  73 @@ -132,7 +132,7 @@
  74   * "extra output" method is used, but not all systems provide access to
  75   * a fine-grained timer.
  76   */
  77 -/* #define TIMED_DELAY */      /* usleep() */
  78 +#define TIMED_DELAY 1  /* usleep() */
  79  #endif
  80
  81  /*
  82 --- sys/unix/Makefile.src.old   Sun Dec  7 15:39:13 2003
  83 +++ sys/unix/Makefile.src       Sun Mar 30 12:38:36 2008
  84 @@ -214,8 +214,8 @@
  85
  86  #
  87  #
  88 -WINSRC = $(WINTTYSRC)
  89 -WINOBJ = $(WINTTYOBJ)
  90 +WINSRC = $(WINTTYSRC) $(WINX11SRC)
  91 +WINOBJ = $(WINTTYOBJ) $(WINX11OBJ)
  92
  93  # on some systems the termcap library is in -ltermcap or -lcurses
  94  # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
  95 @@ -235,7 +235,7 @@
  96  #
  97  # libraries for X11
  98  # If USE_XPM is defined in config.h, you will also need -lXpm here.
  99 -WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
 100 +WINX11LIB = -L/usr/openwin/lib -R/usr/openwin/lib -lXaw -lXmu -lXext -lXt -lX11 -lXpm
 101  # WINX11LIB = -lXaw -lXmu -lXt -lX11
 102  # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
 103  # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
 104 @@ -255,7 +255,7 @@
 105  # libraries for BeOS
 106  WINBELIB = -lbe
 107
 108 -WINLIB = $(WINTTYLIB)
 109 +WINLIB = -Wl,-zignore $(WINTTYLIB) $(WINX11LIB)
 110
 111  # any other strange libraries your system needs (for Sysunix only -- the more
 112  # specialized targets should already be right)
 113 --- sys/unix/Makefile.top.old   Sun Dec  7 15:39:13 2003
 114 +++ sys/unix/Makefile.top       Sun Mar 30 12:42:20 2008
 115 @@ -22,7 +22,7 @@
 116
 117  # Permissions - some places use setgid instead of setuid, for instance
 118  # See also the option "SECURE" in include/config.h
 119 -GAMEPERM = 04755
 120 +GAMEPERM = 02755
 121  FILEPERM = 0644
 122  EXEPERM  = 0755
 123  DIRPERM  = 0755
 124 @@ -35,14 +35,15 @@
 125  # therefore there should not be anything in GAMEDIR that you want to keep
 126  # (if there is, you'll have to do the installation by hand or modify the
 127  # instructions)
 128 -GAMEDIR  = $(PREFIX)/games/lib/$(GAME)dir
 129 -VARDIR  = $(GAMEDIR)
 130 -SHELLDIR = $(PREFIX)/games
 131 +GAMEDIR  = $(ROOT)/$(PREFIX)/lib/$(GAME)
 132 +CLIENT_GAMEDIR = $(PREFIX)/lib/$(GAME)
 133 +VARDIR  = $(ROOT)/var/games/nethack
 134 +SHELLDIR = $(ROOT)/$(PREFIX)/bin
 135
 136  # per discussion in Install.X11 and Install.Qt
 137  VARDATND =
 138  # VARDATND = x11tiles NetHack.ad pet_mark.xbm
 139 -# VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
 140 +VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
 141  # for Atari/Gem
 142  # VARDATND = nh16.img title.img GEM_RSC.RSC rip.img
 143  # for BeOS
 144 @@ -186,7 +187,7 @@
 145         cp src/$(GAME) $(GAMEDIR)
 146         cp util/recover $(GAMEDIR)
 147         -rm -f $(SHELLDIR)/$(GAME)
 148 -       sed -e 's;/usr/games/lib/nethackdir;$(GAMEDIR);' \
 149 +       sed -e 's;/usr/games/lib/nethackdir;$(CLIENT_GAMEDIR);' \
 150                 -e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \
 151                 < sys/unix/nethack.sh \
 152                 > $(SHELLDIR)/$(GAME)