svn commit: r359726 - head/games/nethack34/files
Greg Lewis
glewis at FreeBSD.org
Sun Jun 29 05:33:40 UTC 2014
Author: glewis
Date: Sun Jun 29 05:33:37 2014
New Revision: 359726
URL: http://svnweb.freebsd.org/changeset/ports/359726
QAT: https://qat.redports.org/buildarchive/r359726/
Log:
. Rename patch files to use a less antique naming convention.
Added:
head/games/nethack34/files/patch-include-config.h
- copied unchanged from r359639, head/games/nethack34/files/patch-aa
head/games/nethack34/files/patch-include-system.h
- copied unchanged from r359639, head/games/nethack34/files/patch-ab
head/games/nethack34/files/patch-include-unixconf.h
- copied unchanged from r359639, head/games/nethack34/files/patch-ac
head/games/nethack34/files/patch-src-files.c
- copied unchanged from r359639, head/games/nethack34/files/patch-ai
head/games/nethack34/files/patch-sys-unix-Makefile.doc
- copied unchanged from r359639, head/games/nethack34/files/patch-af
head/games/nethack34/files/patch-sys-unix-Makefile.src
- copied unchanged from r359639, head/games/nethack34/files/patch-ad
head/games/nethack34/files/patch-sys-unix-Makefile.top
- copied unchanged from r359639, head/games/nethack34/files/patch-ae
head/games/nethack34/files/patch-sys-unix-Makefile.utl
- copied unchanged from r359639, head/games/nethack34/files/patch-ag
head/games/nethack34/files/patch-win-tty-termcap.c
- copied unchanged from r359639, head/games/nethack34/files/patch-ah
Deleted:
head/games/nethack34/files/patch-aa
head/games/nethack34/files/patch-ab
head/games/nethack34/files/patch-ac
head/games/nethack34/files/patch-ad
head/games/nethack34/files/patch-ae
head/games/nethack34/files/patch-af
head/games/nethack34/files/patch-ag
head/games/nethack34/files/patch-ah
head/games/nethack34/files/patch-ai
Copied: head/games/nethack34/files/patch-include-config.h (from r359639, head/games/nethack34/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/nethack34/files/patch-include-config.h Sun Jun 29 05:33:37 2014 (r359726, copy of r359639, head/games/nethack34/files/patch-aa)
@@ -0,0 +1,46 @@
+--- include/config.h.orig Mon Dec 8 00:39:13 2003
++++ include/config.h Sun Sep 3 12:17:19 2006
+@@ -85,9 +85,6 @@
+ #ifdef QT_GRAPHICS
+ # define DEFAULT_WC_TILED_MAP /* Default to tiles if users doesn't say wc_ascii_map */
+ # define USER_SOUNDS /* Use sounds */
+-# ifndef __APPLE__
+-# 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
+@@ -126,7 +123,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
+@@ -169,11 +166,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
+@@ -204,7 +201,7 @@
+ * otherwise it will be the current directory.
+ */
+ # ifndef HACKDIR
+-# define HACKDIR "/usr/games/lib/nethackdir"
++# define HACKDIR "%%HACKDIR%%"
+ # endif
+
+ /*
Copied: head/games/nethack34/files/patch-include-system.h (from r359639, head/games/nethack34/files/patch-ab)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/nethack34/files/patch-include-system.h Sun Jun 29 05:33:37 2014 (r359726, copy of r359639, head/games/nethack34/files/patch-ab)
@@ -0,0 +1,13 @@
+--- include/system.h.orig Sat Aug 30 09:07:23 2003
++++ include/system.h Tue Sep 2 00:39:39 2003
+@@ -79,7 +79,9 @@
+ # if !defined(__SC__) && !defined(LINUX)
+ E long NDECL(random);
+ # endif
+-# if (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) || defined(RANDOM)
++# if defined(__FreeBSD__)
++E void FDECL(srandom, (unsigned long));
++# elif (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) || defined(RANDOM)
+ E void FDECL(srandom, (unsigned int));
+ # else
+ # if !defined(bsdi) && !defined(__FreeBSD__)
Copied: head/games/nethack34/files/patch-include-unixconf.h (from r359639, head/games/nethack34/files/patch-ac)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/nethack34/files/patch-include-unixconf.h Sun Jun 29 05:33:37 2014 (r359726, copy of r359639, head/games/nethack34/files/patch-ac)
@@ -0,0 +1,45 @@
+--- include/unixconf.h.orig Mon Sep 1 22:34:19 2003
++++ include/unixconf.h Mon Sep 1 22:35:16 2003
+@@ -19,13 +19,13 @@
+ */
+
+ /* define exactly one of the following four choices */
+-/* #define BSD 1 */ /* define for 4.n/Free/Open/Net BSD */
++#define BSD 1 /* define for 4.n/Free/Open/Net BSD */
+ /* also for relatives like SunOS 4.x, DG/UX, and */
+ /* older versions of Linux */
+ /* #define ULTRIX */ /* define for Ultrix v3.0 or higher (but not lower) */
+ /* Use BSD for < v3.0 */
+ /* "ULTRIX" not to be confused with "ultrix" */
+-#define SYSV /* define for System V, Solaris 2.x, newer versions */
++/* #define SYSV */ /* define for System V, Solaris 2.x, newer versions */
+ /* of Linux */
+ /* #define HPUX */ /* Hewlett-Packard's Unix, version 6.5 or higher */
+ /* use SYSV for < v6.5 */
+@@ -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
+@@ -284,7 +284,7 @@
+ #endif
+
+ #if defined(BSD) || defined(ULTRIX)
+-# if !defined(DGUX) && !defined(SUNOS4)
++# if !defined(DGUX) && !defined(SUNOS4) && !defined(__FreeBSD__)
+ #define memcpy(d, s, n) bcopy(s, d, n)
+ #define memcmp(s1, s2, n) bcmp(s2, s1, n)
+ # endif
Copied: head/games/nethack34/files/patch-src-files.c (from r359639, head/games/nethack34/files/patch-ai)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/nethack34/files/patch-src-files.c Sun Jun 29 05:33:37 2014 (r359726, copy of r359639, head/games/nethack34/files/patch-ai)
@@ -0,0 +1,10 @@
+--- src/files.c.orig Sun Feb 23 23:43:26 2003
++++ src/files.c Thu Jun 19 11:51:59 2003
+@@ -29,6 +29,7 @@
+ #endif
+
+ #if defined(UNIX) && defined(QT_GRAPHICS)
++#include <limits.h>
+ #include <dirent.h>
+ #endif
+
Copied: head/games/nethack34/files/patch-sys-unix-Makefile.doc (from r359639, head/games/nethack34/files/patch-af)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/nethack34/files/patch-sys-unix-Makefile.doc Sun Jun 29 05:33:37 2014 (r359726, copy of r359639, head/games/nethack34/files/patch-af)
@@ -0,0 +1,41 @@
+--- sys/unix/Makefile.doc.orig Sat Jan 15 05:49:48 2000
++++ sys/unix/Makefile.doc Sat Aug 11 11:08:33 2001
+@@ -34,15 +34,15 @@
+
+
+ GAME = nethack
+-MANDIR = /usr/man/man6
++MANDIR = ${PREFIX}/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)/$(GAME).$(MANEXT)
++ -$(LEVMANCREATE) $(MANDIR)$(MANEXT)/lev_comp.$(MANEXT)
++ -$(DGNMANCREATE) $(MANDIR)$(MANEXT)/dgn_comp.$(MANEXT)
++ -$(RCVRMANCREATE) $(MANDIR)$(MANEXT)/recover.$(MANEXT)
++ -$(DLBMANCREATE) $(MANDIR)$(MANEXT)/dlb.$(MANEXT)
+
+ # manual creation for distribution
+ DISTRIB = Guidebook.txt nethack.txt lev_comp.txt dgn_comp.txt recover.txt dlb.txt
Copied: head/games/nethack34/files/patch-sys-unix-Makefile.src (from r359639, head/games/nethack34/files/patch-ad)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/nethack34/files/patch-sys-unix-Makefile.src Sun Jun 29 05:33:37 2014 (r359726, copy of r359639, head/games/nethack34/files/patch-ad)
@@ -0,0 +1,124 @@
+diff -ruN sys.orig/unix/Makefile.src sys/unix/Makefile.src
+--- sys.orig/unix/Makefile.src Sun Dec 7 15:39:13 2003
++++ sys/unix/Makefile.src Wed Jun 30 08:27:32 2004
+@@ -146,19 +146,29 @@
+ # 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 = -O -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 ${CPPFLAGS}
++endif
++
+ LFLAGS =
+
+ # The Qt and Be window systems are written in C++, while the rest of
+ # NetHack is standard C. If using Qt, uncomment the LINK line here to get
+ # the C++ libraries linked in.
+-CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include
+-CXX=g++
++CXXFLAGS += -I. -I../include ${QTCPPFLAGS}
++#CXX=g++
+ #LINK=g++
+ # For cross-compiling, eg. with gcc on Linux (see also CC further up):
+ #CXX=arm-linux-g++
+@@ -215,7 +225,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
+@@ -231,23 +260,23 @@
+ # WINTTYLIB = -lcurses
+ # WINTTYLIB = -lcurses16
+ # WINTTYLIB = -lncurses
+ WINTTYLIB = -ltermlib
+ #
+ # 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
+@@ -256,6 +285,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)
+@@ -461,13 +499,13 @@
+
+ # Qt windowport meta-object-compiler output
+ qt_kde0.moc: ../include/qt_kde0.h
+- $(QTDIR)/bin/moc -o qt_kde0.moc ../include/qt_kde0.h
++ ${MOC} -o qt_kde0.moc ../include/qt_kde0.h
+
+ qt_win.moc: ../include/qt_win.h
+- $(QTDIR)/bin/moc -o qt_win.moc ../include/qt_win.h
++ ${MOC} -o qt_win.moc ../include/qt_win.h
+
+ qttableview.moc: ../include/qttableview.h
+- $(QTDIR)/bin/moc -o qttableview.moc ../include/qttableview.h
++ ${MOC} -o qttableview.moc ../include/qttableview.h
+
+ $(MAKEDEFS): ../util/makedefs.c $(CONFIG_H) ../include/permonst.h \
+ ../include/objclass.h ../include/monsym.h \
Copied: head/games/nethack34/files/patch-sys-unix-Makefile.top (from r359639, head/games/nethack34/files/patch-ae)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/nethack34/files/patch-sys-unix-Makefile.top Sun Jun 29 05:33:37 2014 (r359726, copy of r359639, head/games/nethack34/files/patch-ae)
@@ -0,0 +1,51 @@
+--- sys/unix/Makefile.top.orig Sat Aug 30 09:08:04 2003
++++ sys/unix/Makefile.top Mon Sep 1 22:38:47 2003
+@@ -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 NetHack.ad pet_mark.xbm
+ # VARDATND = x11tiles NetHack.ad 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)
Copied: head/games/nethack34/files/patch-sys-unix-Makefile.utl (from r359639, head/games/nethack34/files/patch-ag)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/nethack34/files/patch-sys-unix-Makefile.utl Sun Jun 29 05:33:37 2014 (r359726, copy of r359639, head/games/nethack34/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/nethack34/files/patch-win-tty-termcap.c (from r359639, head/games/nethack34/files/patch-ah)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/nethack34/files/patch-win-tty-termcap.c Sun Jun 29 05:33:37 2014 (r359726, copy of r359639, head/games/nethack34/files/patch-ah)
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- win/tty/termcap.c.orig Thu Jun 19 16:12:47 2003
++++ win/tty/termcap.c Thu Jun 19 16:13:00 2003
+@@ -217,10 +217,6 @@
+ error("Terminal must backspace.");
+ # else
+ if(!(BC = Tgetstr("bc"))) { /* termcap also uses bc/bs */
+-# ifndef MINIMAL_TERM
+- if(!tgetflag("bs"))
+- error("Terminal must backspace.");
+-# endif
+ BC = tbufptr;
+ tbufptr += 2;
+ *BC = '\b';
More information about the svn-ports-head
mailing list