components/games/nethack/patches/Makefile.top.patch

   1 diff -Nru NetHack-3.6.7.orig/sys/unix/Makefile.top NetHack-3.6.7/sys/unix/Makefile.top
   2 --- NetHack-3.6.7.orig/sys/unix/Makefile.top    2023-02-15 22:52:57.000000000 +0100
   3 +++ NetHack-3.6.7/sys/unix/Makefile.top 2023-10-08 15:09:43.658440386 +0200
   4 @@ -19,20 +19,20 @@
   5  # MAKE = make
   6
   7  # make NetHack
   8 -#PREFIX         = /usr
   9 +PREFIX  = /usr
  10  GAME     = nethack
  11  # GAME     = nethack.prg
  12 -#GAMEUID  = games
  13 -#GAMEGRP  = bin
  14 +GAMEUID  = bin
  15 +GAMEGRP  = games
  16
  17  # Permissions - some places use setgid instead of setuid, for instance
  18  # See also the option "SECURE" in include/config.h
  19 -#GAMEPERM = 04755
  20 +GAMEPERM = 02755
  21  FILEPERM = 0644
  22 -# VARFILEPERM = 0644
  23 +VARFILEPERM = 0644
  24  EXEPERM  = 0755
  25  DIRPERM  = 0755
  26 -# VARDIRPERM = 0755
  27 +VARDIRPERM = 0755
  28
  29  # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else HACKDIR
  30  #
  31 @@ -41,15 +41,17 @@
  32  # therefore there should not be anything in HACKDIR that you want to keep
  33  # (if there is, you'll have to do the installation by hand or modify the
  34  # instructions)
  35 -#HACKDIR  = $(PREFIX)/games/lib/$(GAME)dir
  36 -#VARDIR  = $(HACKDIR)
  37 +HACKDIR  = $(ROOT)/$(PREFIX)/lib/$(GAME)
  38 +CLIENT_HACKDIR = $(PREFIX)/lib/$(GAME)
  39 +VARDIR  = $(ROOT)/var/games/nethack
  40 +INSTDIR = $(HACKDIR)
  41  # Where nethack.sh in installed.  If this is not defined, the wrapper is not used.
  42 -#SHELLDIR = $(PREFIX)/games
  43 +SHELLDIR = $(ROOT)/$(PREFIX)/bin
  44
  45  # per discussion in Install.X11 and Install.Qt
  46  #VARDATND =
  47  # VARDATND = x11tiles NetHack.ad pet_mark.xbm pilemark.xbm
  48 -# VARDATND = x11tiles NetHack.ad pet_mark.xbm pilemark.xbm rip.xpm
  49 +VARDATND = x11tiles NetHack.ad pet_mark.xbm pilemark.xbm rip.xpm
  50  # for Atari/Gem
  51  # VARDATND = nh16.img title.img GEM_RSC.RSC rip.img
  52  # for BeOS
  53 @@ -207,7 +209,7 @@
  54         cp util/recover $(INSTDIR)
  55         -if test -n '$(SHELLDIR)'; then rm -f $(SHELLDIR)/$(GAME); fi
  56         if test -n '$(SHELLDIR)'; then \
  57 -               sed -e 's;/usr/games/lib/nethackdir;$(HACKDIR);' \
  58 +               sed -e 's;/usr/games/lib/nethackdir;$(CLIENT_HACKDIR);' \
  59                 -e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \
  60                 < sys/unix/nethack.sh \
  61                 > $(SHELLDIR)/$(GAME) ; fi