svn commit: r359727 - head/games/nethack33/files

Sun Jun 29 05:34:01 UTC 2014

Author: glewis
Date: Sun Jun 29 05:33:59 2014
New Revision: 359727
URL: http://svnweb.freebsd.org/changeset/ports/359727
QAT: https://qat.redports.org/buildarchive/r359727/

Log:
  . Rename patch files to use a less antique naming convention.

Added:
  head/games/nethack33/files/patch-include-config.h
     - copied unchanged from r359639, head/games/nethack33/files/patch-aa
  head/games/nethack33/files/patch-include-unixconf.h
     - copied unchanged from r359639, head/games/nethack33/files/patch-ac
  head/games/nethack33/files/patch-sys-unix-Makefile.doc
     - copied unchanged from r359639, head/games/nethack33/files/patch-af
  head/games/nethack33/files/patch-sys-unix-Makefile.src
     - copied unchanged from r359639, head/games/nethack33/files/patch-ad
  head/games/nethack33/files/patch-sys-unix-Makefile.top
     - copied unchanged from r359639, head/games/nethack33/files/patch-ae
  head/games/nethack33/files/patch-sys-unix-Makefile.utl
     - copied unchanged from r359639, head/games/nethack33/files/patch-ag
  head/games/nethack33/files/patch-win-gnome-gnmain.c
     - copied unchanged from r359639, head/games/nethack33/files/patch-ah
Deleted:
  head/games/nethack33/files/patch-aa
  head/games/nethack33/files/patch-ac
  head/games/nethack33/files/patch-ad
  head/games/nethack33/files/patch-ae
  head/games/nethack33/files/patch-af
  head/games/nethack33/files/patch-ag
  head/games/nethack33/files/patch-ah

Copied: head/games/nethack33/files/patch-include-config.h (from r359639, head/games/nethack33/files/patch-aa)
==============================================================================

--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/nethack33/files/patch-include-config.h	Sun Jun 29 05:33:59 2014	(r359727, copy of r359639, head/games/nethack33/files/patch-aa)
@@ -0,0 +1,38 @@
+$FreeBSD$
+
+--- include/config.h.orig	Sat Jul 22 10:13:51 2000
++++ include/config.h	Sat May 18 06:27:54 2002
+@@ -110,7 +110,7 @@
+  * would allow:
+  *  xpmtoppm <x11tiles.xpm | pnmscale 1.25 | ppmquant 90 >x11tiles_big.xpm
+  */
+-/* # define USE_XPM */		/* Disable if you do not have the XPM library */
++# define USE_XPM 		/* Disable if you do not have the XPM library */
+ # ifdef USE_XPM
+ #  define GRAPHIC_TOMBSTONE	/* Use graphical tombstone (rip.xpm) */
+ # endif
+@@ -151,11 +151,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 */
+ /* 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_EXTENSION ".gz" 		/* normal gzip extension */
+ #endif
+ 
+ #ifndef COMPRESS
+@@ -186,7 +186,7 @@
+  * otherwise it will be the current directory.
+  */
+ # ifndef HACKDIR
+-#  define HACKDIR "/usr/games/lib/nethackdir"	/* nethack directory */
++#  define HACKDIR "%%HACKDIR%%"	/* nethack directory */
+ # endif
+ 
+ /*

Copied: head/games/nethack33/files/patch-include-unixconf.h (from r359639, head/games/nethack33/files/patch-ac)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/nethack33/files/patch-include-unixconf.h	Sun Jun 29 05:33:59 2014	(r359727, copy of r359639, head/games/nethack33/files/patch-ac)
@@ -0,0 +1,20 @@
+--- include/unixconf.h.orig	Mon Jul 17 11:03:51 2000
++++ include/unixconf.h	Fri Oct 13 10:06:57 2000
+@@ -47,7 +47,7 @@
+ 			 * job control (note that AIX is SYSV otherwise)
+ 			 * Also define this for AIX 3.2 */
+ 
+-#define TERMINFO	/* uses terminfo rather than termcap */
++/* #define TERMINFO */	/* uses terminfo rather than termcap */
+ 			/* Should be defined for most SYSV, SVR4 (including
+ 			 * Solaris 2+), HPUX, and Linux systems.  In
+ 			 * particular, it should NOT be defined for the UNIXPC
+@@ -143,7 +143,7 @@
+  * A stat system call is done on the mailbox every MAILCKFREQ moves.
+  */
+ 
+-#define MAIL			/* Deliver mail during the game */
++/* #define MAIL */			/* Deliver mail during the game */
+ 
+ /* The Andrew Message System does mail a little differently from normal
+  * UNIX.  Mail is deposited in the user's own directory in ~/Mailbox

Copied: head/games/nethack33/files/patch-sys-unix-Makefile.doc (from r359639, head/games/nethack33/files/patch-af)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/nethack33/files/patch-sys-unix-Makefile.doc	Sun Jun 29 05:33:59 2014	(r359727, copy of r359639, head/games/nethack33/files/patch-af)
@@ -0,0 +1,43 @@
+$FreeBSD$
+
+--- sys/unix/Makefile.doc.orig	Fri Jan 14 13:49:48 2000
++++ sys/unix/Makefile.doc	Mon Apr 19 14:29:46 2004
+@@ -34,15 +34,15 @@
+ 
+ 
+ GAME	= nethack
+-MANDIR	= /usr/man/man6
++MANDIR	= ${MANPREFIX}/man/man
+ MANEXT	= 6
+ 
+ # manual installation for most BSD-style systems
+-GAMEMANCREATE = cp nethack.6
+-LEVMANCREATE = cp lev_comp.6
+-DGNMANCREATE = cp dgn_comp.6
+-RCVRMANCREATE = cp recover.6
+-DLBMANCREATE = cp dlb.6
++GAMEMANCREATE = ${BSD_INSTALL_MAN} nethack.6
++LEVMANCREATE = ${BSD_INSTALL_MAN} lev_comp.6
++DGNMANCREATE = ${BSD_INSTALL_MAN} dgn_comp.6
++RCVRMANCREATE = ${BSD_INSTALL_MAN} recover.6
++DLBMANCREATE = ${BSD_INSTALL_MAN} dlb.6
+ # manual installation for most SYSV-style systems
+ # GAMEMANCREATE = nroff -man nethack.6 >
+ # LEVMANCREATE = nroff -man lev_comp.6 >
+@@ -51,11 +51,11 @@
+ # DLBMANCREATE = nroff -man dlb.6 >
+ 
+ manpages:
+-	-$(GAMEMANCREATE) $(MANDIR)/$(GAME).$(MANEXT)
+-	-$(LEVMANCREATE) $(MANDIR)/lev_comp.$(MANEXT)
+-	-$(DGNMANCREATE) $(MANDIR)/dgn_comp.$(MANEXT)
+-	-$(RCVRMANCREATE) $(MANDIR)/recover.$(MANEXT)
+-	-$(DLBMANCREATE) $(MANDIR)/dlb.$(MANEXT)
++	-$(GAMEMANCREATE) $(MANDIR)$(MANEXT)/%%HACKNAME%%.$(MANEXT)
++	-$(LEVMANCREATE) $(MANDIR)$(MANEXT)/lev_comp%%HACKEXT%%.$(MANEXT)
++	-$(DGNMANCREATE) $(MANDIR)$(MANEXT)/dgn_comp%%HACKEXT%%.$(MANEXT)
++	-$(RCVRMANCREATE) $(MANDIR)$(MANEXT)/recover%%HACKEXT%%.$(MANEXT)
++	-$(DLBMANCREATE) $(MANDIR)$(MANEXT)/dlb%%HACKEXT%%.$(MANEXT)
+ 
+ # manual creation for distribution
+ DISTRIB = Guidebook.txt nethack.txt lev_comp.txt dgn_comp.txt recover.txt dlb.txt

Copied: head/games/nethack33/files/patch-sys-unix-Makefile.src (from r359639, head/games/nethack33/files/patch-ad)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/nethack33/files/patch-sys-unix-Makefile.src	Sun Jun 29 05:33:59 2014	(r359727, copy of r359639, head/games/nethack33/files/patch-ad)
@@ -0,0 +1,114 @@
+--- sys/unix/Makefile.src.orig	Sat Aug  5 19:52:57 2000
++++ sys/unix/Makefile.src	Sat May 18 01:19:31 2002
+@@ -139,19 +139,28 @@
+ # directories.  The ones given below is the usual spot for linux systems.
+ # The paths are for glibconfig.h and gnomesupport.h respectively.
+ #
+-GNOMEINC=-I/usr/lib/glib/include -I/usr/lib/gnome-libs/include -I../win/gnome
++GNOMEINC= $(shell ${GNOME_CONFIG} --cflags gnomeui)
+ 
+ # flags for debugging:
+ # CFLAGS = -g -I../include
++CFLAGS += -I../include
++ifeq ("$(GRAPHICS)","X11_GRAPHICS")
++CFLAGS += -DX11_GRAPHICS -I${LOCALBASE}/include
++endif
++ifeq ("$(GRAPHICS)","QT_GRAPHICS")
++CFLAGS += -DQT_GRAPHICS
++endif
++ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
++CFLAGS += -DGNOME_GRAPHICS
++endif
+ 
+-CFLAGS = -O -I../include
+ LFLAGS =
+ 
+ # The Qt and Be window systems are written in C++, while the rest of
+ # NetHack is standard C.  If using Qt, uncomment the LD line here to get
+ # the C++ libraries linked in.
+-CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include
+-CXX=g++
++CXXFLAGS += -I. -I../include ${QTCPPFLAGS}
++#CXX=g++
+ #LD=g++
+ 
+ # Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired
+@@ -204,7 +213,26 @@
+ #
+ #
+ WINSRC = $(WINTTYSRC)
++ifeq ("$(GRAPHICS)","X11_GRAPHICS")
++WINSRC += $(WINX11SRC)
++endif
++ifeq ("$(GRAPHICS)","QT_GRAPHICS")
++WINSRC += $(WINQTSRC)
++endif
++ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
++WINSRC += $(WINGNOMESRC)
++endif
++
+ WINOBJ = $(WINTTYOBJ)
++ifeq ("$(GRAPHICS)","X11_GRAPHICS")
++WINOBJ += $(WINX11OBJ)
++endif
++ifeq ("$(GRAPHICS)","QT_GRAPHICS")
++WINOBJ += $(WINQTOBJ)
++endif
++ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
++WINOBJ += $(WINGNOMEOBJ)
++endif
+ 
+ # on some systems the termcap library is in -ltermcap or -lcurses
+ # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
+@@ -224,19 +252,19 @@
+ #
+ # libraries for X11
+ # If USE_XPM is defined in config.h, you will also need -lXpm here.
+-WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
++WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -L${LOCALBASE}/lib
+ # WINX11LIB = -lXaw -lXmu -lXt -lX11
+ # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
+ # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
+ #
+ # libraries for Qt
+-WINQTLIB = -L$(QTDIR)/lib -lqt
++WINQTLIB = ${QTCFGLIBS} ${LIBQT}
+ #
+ # libraries for KDE (with Qt)
+ WINKDELIB = -lkdecore -lkdeui -lXext
+ #
+ # libraries for Gnome
+-WINGNOMELIB = -lgnomeui -lgnome -lart_lgpl -lgtk -lgdk -lpopt
++WINGNOMELIB = $(shell ${GNOME_CONFIG} --libs gnomeui) ${LDFLAGS}
+ #
+ # libraries for Gem port
+ WINGEMLIB = -le_gem -lgem
+@@ -245,6 +273,15 @@
+ WINBELIB = -lbe
+ 
+ WINLIB = $(WINTTYLIB)
++ifeq ("$(GRAPHICS)","X11_GRAPHICS")
++WINLIB += $(WINX11LIB)
++endif
++ifeq ("$(GRAPHICS)","QT_GRAPHICS")
++WINLIB += $(WINQTLIB)
++endif
++ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
++WINLIB += $(WINGNOMELIB)
++endif
+ 
+ # any other strange libraries your system needs (for Sysunix only -- the more
+ # specialized targets should already be right)
+@@ -445,10 +482,10 @@
+ 
+ # Qt windowport meta-object-compiler output
+ qt_kde0.moc: ../include/qt_kde0.h
+-	$(QTDIR)/bin/moc ../include/qt_kde0.h > qt_kde0.moc
++	${MOC} ../include/qt_kde0.h > qt_kde0.moc
+ 
+ qt_win.moc: ../include/qt_win.h
+-	$(QTDIR)/bin/moc ../include/qt_win.h > qt_win.moc
++	${MOC} ../include/qt_win.h > qt_win.moc
+ 
+ $(MAKEDEFS): ../util/makedefs.c  $(CONFIG_H) ../include/permonst.h \
+ 		../include/objclass.h ../include/monsym.h \

Copied: head/games/nethack33/files/patch-sys-unix-Makefile.top (from r359639, head/games/nethack33/files/patch-ae)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/nethack33/files/patch-sys-unix-Makefile.top	Sun Jun 29 05:33:59 2014	(r359727, copy of r359639, head/games/nethack33/files/patch-ae)
@@ -0,0 +1,117 @@
+$FreeBSD$
+
+--- sys/unix/Makefile.top.orig	Mon Jul  3 18:42:05 2000
++++ sys/unix/Makefile.top	Mon Apr 19 14:42:45 2004
+@@ -14,18 +14,17 @@
+ # MAKE = make
+ 
+ # make NetHack
+-PREFIX	 = /usr
+-GAME     = nethack
++GAME     = %%HACKNAME%%
+ # GAME     = nethack.prg
+ GAMEUID  = games
+-GAMEGRP  = bin
++GAMEGRP  = games
+ 
+ # Permissions - some places use setgid instead of setuid, for instance
+ # See also the option "SECURE" in include/config.h
+-GAMEPERM = 04755
+-FILEPERM = 0644
++GAMEPERM = 02755
++FILEPERM = 0664
+ EXEPERM  = 0755
+-DIRPERM  = 0755
++DIRPERM  = 0775
+ 
+ # GAMEDIR also appears in config.h as "HACKDIR".
+ # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else GAMEDIR
+@@ -35,12 +34,12 @@
+ # therefore there should not be anything in GAMEDIR that you want to keep
+ # (if there is, you'll have to do the installation by hand or modify the
+ # instructions)
+-GAMEDIR  = $(PREFIX)/games/lib/$(GAME)dir
++GAMEDIR  = %%HACKDIR%%
+ VARDIR  = $(GAMEDIR)
+-SHELLDIR = $(PREFIX)/games
++SHELLDIR = $(PREFIX)/bin
+ 
+ # per discussion in Install.X11 and Install.Qt
+-VARDATND = 
++# VARDATND = 
+ # VARDATND = x11tiles pet_mark.xbm
+ # VARDATND = x11tiles pet_mark.xbm rip.xpm
+ # for Atari/Gem
+@@ -48,7 +47,7 @@
+ # for BeOS
+ # VARDATND = beostiles
+ # for Gnome
+-# VARDATND = x11tiles pet_mark.xbm rip.xpm mapbg.xpm
++VARDATND = x11tiles pet_mark.xbm rip.xpm mapbg.xpm
+ 
+ VARDATD = data oracles options quest.dat rumors
+ VARDAT = $(VARDATD) $(VARDATND)
+@@ -87,7 +86,7 @@
+ $(GAME):
+ 	( cd src ; $(MAKE) )
+ 
+-all:	$(GAME) Guidebook $(VARDAT) dungeon spec_levs check-dlb
++all:	$(GAME) recover Guidebook $(VARDAT) dungeon spec_levs check-dlb
+ 	@echo "Done."
+ 
+ Guidebook:
+@@ -156,6 +155,8 @@
+ 	( cd util ; $(MAKE) dlb )
+ 	( cd dat ; ../util/dlb cf nhdat $(DATDLB) )
+ 
++recover:
++	( cd util ; $(MAKE) recover )
+ 
+ dofiles:
+ 	target=`sed -n					\
+@@ -165,16 +166,18 @@
+ 		-e '}' 					\
+ 	  	-e '$$s/.*/nodlb/p' < dat/options` ;	\
+ 	$(MAKE) dofiles-$${target-nodlb}
+-	cp src/$(GAME) $(GAMEDIR)
++	cp src/nethack $(GAMEDIR)/$(GAME)
++	cp util/recover $(GAMEDIR)
+ 	-rm -f $(SHELLDIR)/$(GAME)
+ 	sed -e 's;/usr/games/lib/nethackdir;$(GAMEDIR);' \
+ 		-e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \
+ 		< sys/unix/nethack.sh \
+ 		> $(SHELLDIR)/$(GAME)
+ # set up their permissions
+-	-( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(GAME) ; \
+-			$(CHGRP) $(GAMEGRP) $(GAME) )
++	-( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(GAME) recover ; \
++			$(CHGRP) $(GAMEGRP) $(GAME) recover )
+ 	chmod $(GAMEPERM) $(GAMEDIR)/$(GAME)
++	chmod $(GAMEPERM) $(GAMEDIR)/recover
+ 	-$(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME)
+ 	$(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME)
+ 	chmod $(EXEPERM) $(SHELLDIR)/$(GAME)
+@@ -194,7 +197,7 @@
+ 			$(CHGRP) $(GAMEGRP) $(DAT) ; \
+ 			chmod $(FILEPERM) $(DAT) )
+ 
+-update: $(GAME) $(VARDAT) dungeon spec_levs
++update: $(GAME) recover $(VARDAT) dungeon spec_levs
+ #	(don't yank the old version out from under people who're playing it)
+ 	-mv $(GAMEDIR)/$(GAME) $(GAMEDIR)/$(GAME).old
+ #	quest.dat is also kept open and has the same problems over NFS
+@@ -210,11 +213,12 @@
+ # and a reminder
+ 	@echo You may also want to install the man pages via the doc Makefile.
+ 
+-install: $(GAME) $(VARDAT) dungeon spec_levs
++install: $(GAME) recover $(VARDAT) dungeon spec_levs
+ # set up the directories
+ # not all mkdirs have -p; those that don't will create a -p directory
+ 	-mkdir -p $(SHELLDIR)
+-	-rm -rf $(GAMEDIR) $(VARDIR)
++	-rmdir $(GAMEDIR)
++	-rmdir $(VARDIR)
+ 	-mkdir -p $(GAMEDIR) $(VARDIR) $(VARDIR)/save
+ 	-rmdir ./-p
+ 	-$(CHOWN) $(GAMEUID) $(GAMEDIR) $(VARDIR) $(VARDIR)/save

Copied: head/games/nethack33/files/patch-sys-unix-Makefile.utl (from r359639, head/games/nethack33/files/patch-ag)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/nethack33/files/patch-sys-unix-Makefile.utl	Sun Jun 29 05:33:59 2014	(r359727, copy of r359639, head/games/nethack33/files/patch-ag)
@@ -0,0 +1,21 @@
+--- sys/unix/Makefile.utl.orig	Mon Apr 17 22:36:44 2000
++++ sys/unix/Makefile.utl	Wed Oct 10 19:48:36 2001
+@@ -89,7 +89,17 @@
+ # flags for debugging:
+ # CFLAGS = -g -I../include
+ 
+-CFLAGS = -O -I../include
++CFLAGS += -I../include
++ifeq ("$(GRAPHICS)","X11_GRAPHICS")
++CFLAGS += -DX11_GRAPHICS
++endif
++ifeq ("$(GRAPHICS)","QT_GRAPHICS")
++CFLAGS += -DQT_GRAPHICS
++endif
++ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
++CFLAGS += -DGNOME_GRAPHICS
++endif
++
+ LFLAGS =
+ 
+ LIBS =

Copied: head/games/nethack33/files/patch-win-gnome-gnmain.c (from r359639, head/games/nethack33/files/patch-ah)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/nethack33/files/patch-win-gnome-gnmain.c	Sun Jun 29 05:33:59 2014	(r359727, copy of r359639, head/games/nethack33/files/patch-ah)
@@ -0,0 +1,10 @@
+--- win/gnome/gnmain.c.orig	Sat Aug  5 19:53:33 2000
++++ win/gnome/gnmain.c	Sat May 18 03:12:16 2002
+@@ -672,6 +672,7 @@
+     euid = geteuid();
+     if (uid != euid)
+       setuid(uid);
++    setregid(getegid(), -1);
+     gnome_init ("nethack", VERSION_STRING, argc, argv);
+     parse_args (argc, argv);
+ 
