Date: Sun, 22 Jun 2014 04:10:53 +0000 (UTC) From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358764 - head/games/nethack32/files Message-ID: <201406220410.s5M4Ar7j094463@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Sun Jun 22 04:10:53 2014 New Revision: 358764 URL: http://svnweb.freebsd.org/changeset/ports/358764 QAT: https://qat.redports.org/buildarchive/r358764/ Log: . Rename patch files to use a less antique naming convention. Added: head/games/nethack32/files/patch-include-config.h - copied unchanged from r358661, head/games/nethack32/files/patch-ac head/games/nethack32/files/patch-include-system.h - copied unchanged from r358661, head/games/nethack32/files/patch-ad head/games/nethack32/files/patch-include-unixconf.h - copied unchanged from r358661, head/games/nethack32/files/patch-ae head/games/nethack32/files/patch-sys-unix-Makefile.doc - copied unchanged from r358661, head/games/nethack32/files/patch-af head/games/nethack32/files/patch-sys-unix-Makefile.src - copied unchanged from r358661, head/games/nethack32/files/patch-ab head/games/nethack32/files/patch-sys-unix-Makefile.top - copied unchanged from r358661, head/games/nethack32/files/patch-ag Deleted: head/games/nethack32/files/patch-ab head/games/nethack32/files/patch-ac head/games/nethack32/files/patch-ad head/games/nethack32/files/patch-ae head/games/nethack32/files/patch-af head/games/nethack32/files/patch-ag Copied: head/games/nethack32/files/patch-include-config.h (from r358661, head/games/nethack32/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/nethack32/files/patch-include-config.h Sun Jun 22 04:10:53 2014 (r358764, copy of r358661, head/games/nethack32/files/patch-ac) @@ -0,0 +1,48 @@ +$FreeBSD$ + +--- include/config.h.orig Tue Dec 10 13:20:07 1996 ++++ include/config.h Sat Apr 10 01:01:28 2004 +@@ -211,7 +211,7 @@ + * Some combinations make no sense. See the installation document. + */ + #define TTY_GRAPHICS /* good old tty based graphics */ +-/* #define X11_GRAPHICS /* X11 interface */ ++#define X11_GRAPHICS /* X11 interface */ + + /* + * Define the default window system. This should be one that is compiled +@@ -256,7 +256,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 +@@ -296,12 +296,12 @@ + + #ifdef UNIX + /* path and file name extension for compression program */ +-# define COMPRESS "/usr/ucb/compress" /* Lempel-Ziv compression */ +-# define COMPRESS_EXTENSION ".Z" /* compress's extension */ ++/* # define COMPRESS "/usr/ucb/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 + # define INTERNAL_COMP /* control use of NetHack's compression routines */ +@@ -331,7 +331,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/nethack32/files/patch-include-system.h (from r358661, head/games/nethack32/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/nethack32/files/patch-include-system.h Sun Jun 22 04:10:53 2014 (r358764, copy of r358661, head/games/nethack32/files/patch-ad) @@ -0,0 +1,20 @@ +--- include/system.h.orig Mon Nov 4 08:01:25 1996 ++++ include/system.h Sat Jun 19 16:18:02 1999 +@@ -80,7 +80,7 @@ + # if !defined(SUNOS4) || defined(RANDOM) + E void FDECL(srandom, (unsigned int)); + # else +-# ifndef bsdi ++# if !defined(bsdi) && !defined(__FreeBSD__) + E int FDECL(srandom, (unsigned int)); + # endif + # endif +@@ -510,7 +510,7 @@ + # if defined(ULTRIX) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) + E time_t FDECL(time, (time_t *)); + # else +-E long FDECL(time, (time_t *)); ++E time_t FDECL(time, (time_t *)); + # endif /* ULTRIX */ + + #ifdef VMS Copied: head/games/nethack32/files/patch-include-unixconf.h (from r358661, head/games/nethack32/files/patch-ae) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/nethack32/files/patch-include-unixconf.h Sun Jun 22 04:10:53 2014 (r358764, copy of r358661, head/games/nethack32/files/patch-ae) @@ -0,0 +1,37 @@ +diff -ruN ./include/unixconf.h ../nethack-3.2.2/include/unixconf.h +--- ./include/unixconf.h Wed Dec 11 05:20:08 1996 ++++ ../nethack-3.2.2/include/unixconf.h Sun Mar 21 17:25:02 1999 +@@ -31,7 +31,7 @@ + + /* define any of the following that are appropriate */ + /* #define SVR4 /* use in addition to SYSV for System V Release 4 */ +-#define NETWORK /* if running on a networked system */ ++/* #define NETWORK /* if running on a networked system */ + /* e.g. Suns sharing a playground through NFS */ + #define SUNOS4 /* SunOS 4.x */ + /* #define LINUX /* Another Unix clone */ +@@ -42,12 +42,12 @@ + /* #define AIX_31 /* In AIX 3.1 (IBM RS/6000) use BSD ioctl's to gain + * job control (note that AIX is SYSV otherwise) + * Also define this for AIX 3.2 */ +-/* #define TEXTCOLOR /* Use System V r3.2 terminfo color support */ ++#define TEXTCOLOR /* Use System V r3.2 terminfo color support */ + /* and/or ANSI color support on termcap systems */ + /* and/or X11 color */ +-/* #define POSIX_JOB_CONTROL /* use System V / POSIX job control ++#define POSIX_JOB_CONTROL /* use System V / POSIX job control + * (e.g., VSUSP) */ +-/* #define POSIX_TYPES /* use POSIX types for system calls and termios */ ++#define POSIX_TYPES /* use POSIX types for system calls and termios */ + /* define for many recent OS releases, including + * those with specific defines (since types are + * changing toward the standard from earlier chaos). +@@ -125,7 +125,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/nethack32/files/patch-sys-unix-Makefile.doc (from r358661, head/games/nethack32/files/patch-af) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/nethack32/files/patch-sys-unix-Makefile.doc Sun Jun 22 04:10:53 2014 (r358764, copy of r358661, head/games/nethack32/files/patch-af) @@ -0,0 +1,43 @@ +$FreeBSD$ + +--- sys/unix/Makefile.doc.orig Tue Dec 10 13:20:08 1996 ++++ sys/unix/Makefile.doc Sun Apr 11 23:08:20 2004 +@@ -31,15 +31,15 @@ + + + GAME = nethack +-MANDIR = /usr/man/man6 ++MANDIR = ${MANPREFIX}/man/man6 + 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 > +@@ -48,11 +48,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)/%%HACKNAME%%.$(MANEXT) ++ -$(LEVMANCREATE) $(MANDIR)/lev_comp%%HACKEXT%%.$(MANEXT) ++ -$(DGNMANCREATE) $(MANDIR)/dgn_comp%%HACKEXT%%.$(MANEXT) ++ -$(RCVRMANCREATE) $(MANDIR)/recover%%HACKEXT%%.$(MANEXT) ++ -$(DLBMANCREATE) $(MANDIR)/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/nethack32/files/patch-sys-unix-Makefile.src (from r358661, head/games/nethack32/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/nethack32/files/patch-sys-unix-Makefile.src Sun Jun 22 04:10:53 2014 (r358764, copy of r358661, head/games/nethack32/files/patch-ab) @@ -0,0 +1,49 @@ +--- sys/unix/Makefile.src.orig Wed Dec 11 05:20:09 1996 ++++ sys/unix/Makefile.src Sun Mar 21 17:50:08 1999 +@@ -124,8 +124,8 @@ + # flags for debugging: + # CFLAGS = -g -I../include + +-CFLAGS = -O -I../include +-LFLAGS = ++CFLAGS += -O -I../include -I${LOCALBASE}/include ++LFLAGS = -L${LOCALBASE}/lib + + + # Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired +@@ -146,8 +146,8 @@ + winmisc.o winstat.o wintext.o winval.o tile.o + # + # +-WINSRC = $(WINTTYSRC) +-WINOBJ = $(WINTTYOBJ) ++WINSRC = $(WINTTYSRC) $(WINX11SRC) ++WINOBJ = $(WINTTYOBJ) $(WINX11OBJ) + + # on some systems the termcap library is in -ltermcap or -lcurses + # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead +@@ -167,13 +167,13 @@ + # + # 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 -lXext -lXt -lX11 -lXpm + # 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 + # + # +-WINLIB = $(WINTTYLIB) ++WINLIB = $(WINTTYLIB) $(WINX11LIB) + + # any other strange libraries your system needs (for Sysunix only -- the more + # specialized targets should already be right) +@@ -197,7 +197,7 @@ + # IRIX 4.0.x needs -lsun if NIS (YP) is being used for passwd file lookup + # LIBS = -lsun + # +-LIBS = ++LIBS = -lSM -lICE + + # make NetHack + GAME = nethack Copied: head/games/nethack32/files/patch-sys-unix-Makefile.top (from r358661, head/games/nethack32/files/patch-ag) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/nethack32/files/patch-sys-unix-Makefile.top Sun Jun 22 04:10:53 2014 (r358764, copy of r358661, head/games/nethack32/files/patch-ag) @@ -0,0 +1,106 @@ +$FreeBSD$ + +--- sys/unix/Makefile.top.orig Tue Dec 10 13:20:10 1996 ++++ sys/unix/Makefile.top Sun Apr 11 23:25:22 2004 +@@ -14,16 +14,16 @@ + # MAKE = make + + # make NetHack +-GAME = nethack ++GAME = %%HACKNAME%% + 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". + # +@@ -32,13 +32,13 @@ + # 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 = /usr/games/lib/$(GAME)dir +-SHELLDIR = /usr/games ++GAMEDIR = %%HACKDIR%% ++SHELLDIR = ${PREFIX}/bin + + # per discussion in Install.X11 +-VARDATND = ++# VARDATND = + # VARDATND = x11tiles pet_mark.xbm +-# VARDATND = x11tiles pet_mark.xbm rip.xpm ++VARDATND = x11tiles pet_mark.xbm rip.xpm + + VARDATD = data oracles options quest.dat rumors + VARDAT = $(VARDATD) $(VARDATND) +@@ -74,7 +74,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: +@@ -126,6 +126,8 @@ + ( cd util ; $(MAKE) dlb ) + ( cd dat ; ../util/dlb cf nhdat $(DATDLB) ) + ++recover: ++ ( cd util ; $(MAKE) recover ) + + dofiles: + target=`sed -n \ +@@ -135,16 +137,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) +@@ -164,7 +168,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 +@@ -180,10 +184,10 @@ + # 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 + -mkdir $(SHELLDIR) +- -rm -rf $(GAMEDIR) ++ -rmdir $(GAMEDIR) + -mkdir $(GAMEDIR) $(GAMEDIR)/save + -$(CHOWN) $(GAMEUID) $(GAMEDIR) $(GAMEDIR)/save + $(CHGRP) $(GAMEGRP) $(GAMEDIR) $(GAMEDIR)/save
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406220410.s5M4Ar7j094463>