Update to nethack 3.3.1
This commit is contained in:
espie
parent
68c377e5e2
commit
edb2208d26
@ -1,12 +1,14 @@
|
||||
# $OpenBSD: Makefile,v 1.2 2000/10/10 00:40:31 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.3 2001/03/23 16:11:10 espie Exp $
|
||||
|
||||
DISTNAME= nethack-3.3.0
|
||||
COMMENT= 'common data for the nethack/slash ports'
|
||||
DISTNAME= nethack-3.3.1
|
||||
PKGNAME= hackdata
|
||||
CATEGORIES= games
|
||||
NEED_VERSION= 1.250
|
||||
MASTER_SITES= ftp://ftp.nethack.org/pub/nethack/src/ \
|
||||
NEED_VERSION= 1.363
|
||||
MASTER_SITES= ftp://ftp.nethack.org/pub/nethack/nh331/src/ \
|
||||
ftp://ftp.uu.net/pub/games/nethack/sources/ \
|
||||
${MASTER_SITE_GNU}
|
||||
DISTFILES= nethack-331.tgz
|
||||
MASTER_SITE_SUBDIR= nethack
|
||||
|
||||
MAINTAINER= Marc Espie <espie@openbsd.org>
|
||||
@ -21,9 +23,9 @@ EXTRACT_ONLY=
|
||||
|
||||
post-extract:
|
||||
@cd ${WRKDIR} && tar zxqf ${FULLDISTDIR}/${DISTFILES} \
|
||||
nethack-3.3.0/win/X11/ibm.bdf \
|
||||
nethack-3.3.0/win/X11/nh10.bdf \
|
||||
nethack-3.3.0/doc/Guidebook.txt
|
||||
nethack-3.3.1/win/X11/ibm.bdf \
|
||||
nethack-3.3.1/win/X11/nh10.bdf \
|
||||
nethack-3.3.1/doc/Guidebook.txt
|
||||
|
||||
do-build:
|
||||
cd ${WRKSRC}/win/X11 && \
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (nethack-3.3.0.tar.gz) = cf9f4039408321f39c3ef733455cb73a
|
||||
RMD160 (nethack-3.3.0.tar.gz) = 2ed0bc8e0e18ff3ecb2477b8509fc46f1e0480e3
|
||||
SHA1 (nethack-3.3.0.tar.gz) = 40956396fcdc65bd4020e68660188d388d264470
|
||||
MD5 (nethack-331.tgz) = d0600ce4698c80e5ad1f917ded1c36d2
|
||||
RMD160 (nethack-331.tgz) = 04824fed36d341b14a5c17e2a075842cccd2524c
|
||||
SHA1 (nethack-331.tgz) = e3d07efc81c9aeb85fadc268d1d4976ab3a0f7e9
|
||||
|
||||
@ -1 +0,0 @@
|
||||
common data for the nethack/slash ports
|
||||
@ -1,12 +1,16 @@
|
||||
# $OpenBSD: Makefile,v 1.17 2001/03/22 22:06:37 brad Exp $
|
||||
# $OpenBSD: Makefile,v 1.18 2001/03/23 16:11:10 espie Exp $
|
||||
# $FreeBSD: Makefile,v 1.13 1997/12/25 22:29:17 asami Exp $
|
||||
|
||||
DISTNAME= nethack-3.3.0
|
||||
COMMENT= "dungeon explorin', hackin', game. Piece of cake"
|
||||
DISTNAME= nethack-3.3.1
|
||||
CATEGORIES= games
|
||||
NEED_VERSION= 1.191
|
||||
MASTER_SITES= ftp://ftp.nethack.org/pub/nethack/src/ \
|
||||
NEED_VERSION= 1.363
|
||||
MASTER_SITES= ftp://ftp.nethack.org/pub/nethack/nh331/src/ \
|
||||
ftp://ftp.uu.net/pub/games/nethack/sources/ \
|
||||
${MASTER_SITE_GNU}
|
||||
DISTFILES= nethack-331.tgz
|
||||
|
||||
HOMEPAGE= http://nethack.org/
|
||||
|
||||
MASTER_SITE_SUBDIR= nethack
|
||||
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (nethack-3.3.0.tar.gz) = cf9f4039408321f39c3ef733455cb73a
|
||||
RMD160 (nethack-3.3.0.tar.gz) = 2ed0bc8e0e18ff3ecb2477b8509fc46f1e0480e3
|
||||
SHA1 (nethack-3.3.0.tar.gz) = 40956396fcdc65bd4020e68660188d388d264470
|
||||
MD5 (nethack-331.tgz) = d0600ce4698c80e5ad1f917ded1c36d2
|
||||
RMD160 (nethack-331.tgz) = 04824fed36d341b14a5c17e2a075842cccd2524c
|
||||
SHA1 (nethack-331.tgz) = e3d07efc81c9aeb85fadc268d1d4976ab3a0f7e9
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-include_config_h,v 1.1 2000/04/16 20:49:00 espie Exp $
|
||||
--- include/config.h.orig Sat Dec 11 06:20:49 1999
|
||||
+++ include/config.h Fri Apr 14 14:13:19 2000
|
||||
@@ -92,7 +92,7 @@
|
||||
$OpenBSD: patch-include_config_h,v 1.2 2001/03/23 16:11:11 espie Exp $
|
||||
--- include/config.h.orig Sat Jul 22 03:13:51 2000
|
||||
+++ include/config.h Fri Mar 23 03:03:25 2001
|
||||
@@ -110,7 +110,7 @@
|
||||
* would allow:
|
||||
* xpmtoppm <x11tiles.xpm | pnmscale 1.25 | ppmquant 90 >x11tiles_big.xpm
|
||||
*/
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-include_config_h,v 1.1 2000/04/16 20:49:00 espie Exp $
|
||||
# ifdef USE_XPM
|
||||
# define GRAPHIC_TOMBSTONE /* Use graphical tombstone (rip.xpm) */
|
||||
# endif
|
||||
@@ -106,6 +106,7 @@
|
||||
@@ -124,6 +124,7 @@
|
||||
* LOGFILE and NEWS refer to files in the playground.
|
||||
*/
|
||||
|
||||
@ -18,7 +18,7 @@ $OpenBSD: patch-include_config_h,v 1.1 2000/04/16 20:49:00 espie Exp $
|
||||
#ifndef WIZARD /* allow for compile-time or Makefile changes */
|
||||
# ifndef KR1ED
|
||||
# define WIZARD "wizard" /* the person allowed to use the -D option */
|
||||
@@ -133,11 +134,13 @@
|
||||
@@ -151,11 +152,13 @@
|
||||
|
||||
#ifdef UNIX
|
||||
/* path and file name extension for compression program */
|
||||
@ -34,7 +34,7 @@ $OpenBSD: patch-include_config_h,v 1.1 2000/04/16 20:49:00 espie Exp $
|
||||
#endif
|
||||
|
||||
#ifndef COMPRESS
|
||||
@@ -264,7 +267,7 @@ typedef unsigned char uchar;
|
||||
@@ -282,7 +285,7 @@ typedef unsigned char uchar;
|
||||
* functions that have been macroized.
|
||||
*/
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-include_unixconf_h,v 1.1 2000/04/16 20:49:00 espie Exp $
|
||||
--- include/unixconf.h.orig Sat Dec 11 06:20:51 1999
|
||||
+++ include/unixconf.h Fri Apr 14 14:13:19 2000
|
||||
$OpenBSD: patch-include_unixconf_h,v 1.2 2001/03/23 16:11:11 espie Exp $
|
||||
--- include/unixconf.h.orig Mon Jul 17 03:03:51 2000
|
||||
+++ include/unixconf.h Fri Mar 23 03:04:26 2001
|
||||
@@ -19,7 +19,12 @@
|
||||
*/
|
||||
|
||||
@ -24,15 +24,15 @@ $OpenBSD: patch-include_unixconf_h,v 1.1 2000/04/16 20:49:00 espie Exp $
|
||||
/* including Solaris 2+ */
|
||||
#define NETWORK /* if running on a networked system */
|
||||
/* e.g. Suns sharing a playground through NFS */
|
||||
@@ -45,6 +50,7 @@
|
||||
/* #define AIX_31 */ /* In AIX 3.1 (IBM RS/6000) use BSD ioctl's to gain
|
||||
@@ -47,6 +52,7 @@
|
||||
* job control (note that AIX is SYSV otherwise)
|
||||
* Also define this for AIX 3.2 */
|
||||
|
||||
+#define TERMLIB
|
||||
#define TERMINFO /* uses terminfo rather than termcap */
|
||||
/* Should be defined for most SYSV, SVR4 (including
|
||||
* Solaris 2+), HPUX, and Linux systems. In
|
||||
@@ -124,7 +130,7 @@
|
||||
@@ -132,7 +138,7 @@
|
||||
* "extra output" method is used, but not all systems provide access to
|
||||
* a fine-grained timer.
|
||||
*/
|
||||
@ -41,7 +41,7 @@ $OpenBSD: patch-include_unixconf_h,v 1.1 2000/04/16 20:49:00 espie Exp $
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -135,7 +141,7 @@
|
||||
@@ -143,7 +149,7 @@
|
||||
* A stat system call is done on the mailbox every MAILCKFREQ moves.
|
||||
*/
|
||||
|
||||
@ -50,7 +50,7 @@ $OpenBSD: patch-include_unixconf_h,v 1.1 2000/04/16 20:49:00 espie Exp $
|
||||
|
||||
/* The Andrew Message System does mail a little differently from normal
|
||||
* UNIX. Mail is deposited in the user's own directory in ~/Mailbox
|
||||
@@ -296,7 +302,7 @@
|
||||
@@ -304,7 +310,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef TIMED_DELAY
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-sys_unix_Makefile_doc,v 1.1 2000/04/16 20:49:00 espie Exp $
|
||||
--- sys/unix/Makefile.doc.orig Sat Dec 11 06:21:05 1999
|
||||
+++ sys/unix/Makefile.doc Fri Apr 14 14:13:19 2000
|
||||
@@ -31,15 +31,15 @@ Guidebook.dvi: Guidebook.tex
|
||||
$OpenBSD: patch-sys_unix_Makefile_doc,v 1.2 2001/03/23 16:11:11 espie Exp $
|
||||
--- sys/unix/Makefile.doc.orig Fri Jan 14 21:49:48 2000
|
||||
+++ sys/unix/Makefile.doc Fri Mar 23 03:03:25 2001
|
||||
@@ -34,15 +34,15 @@ Guidebook.dvi: Guidebook.tex
|
||||
|
||||
|
||||
GAME = nethack
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-sys_unix_Makefile_src,v 1.1 2000/04/16 20:49:00 espie Exp $
|
||||
--- sys/unix/Makefile.src.orig Sat Dec 11 06:21:05 1999
|
||||
+++ sys/unix/Makefile.src Fri Apr 14 14:13:19 2000
|
||||
$OpenBSD: patch-sys_unix_Makefile_src,v 1.2 2001/03/23 16:11:11 espie Exp $
|
||||
--- sys/unix/Makefile.src.orig Sat Aug 5 12:52:57 2000
|
||||
+++ sys/unix/Makefile.src Fri Mar 23 03:06:08 2001
|
||||
@@ -1,6 +1,7 @@
|
||||
# NetHack Makefile.
|
||||
# SCCS Id: @(#)Makefile.src 3.3 97/04/17
|
||||
@ -9,31 +9,26 @@ $OpenBSD: patch-sys_unix_Makefile_src,v 1.1 2000/04/16 20:49:00 espie Exp $
|
||||
# newer makes predefine $(MAKE) to 'make' and do smarter processing of
|
||||
# recursive make calls if $(MAKE) is used
|
||||
# these makes allow $(MAKE) to be overridden by the environment if someone
|
||||
@@ -132,11 +133,10 @@ SYSOBJ = ioctl.o unixmain.o unixtty.o un
|
||||
@@ -144,8 +145,7 @@ GNOMEINC=-I/usr/lib/glib/include -I/usr/
|
||||
# flags for debugging:
|
||||
# CFLAGS = -g -I../include
|
||||
|
||||
-CFLAGS = -O -I../include
|
||||
-LFLAGS =
|
||||
-LFLAGS =
|
||||
+CFLAGS += -DHACKDIR=\"${NHDIR}\" -DHAVE_SYS_PARAM_H -I../include
|
||||
|
||||
# Only used for Qt interface (other interfaces are standard C)
|
||||
-CXXFLAGS = -g $(CFLAGS) -I. -I$(QTDIR)/include
|
||||
+CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include
|
||||
# Qt is C++, so define the compiler and linker thus required:
|
||||
#CXX=g++
|
||||
#LD=g++
|
||||
@@ -165,9 +165,6 @@ WINQTOBJ = qt_win.o qt_clust.o tile.o
|
||||
# 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
|
||||
@@ -203,8 +203,6 @@ WINBEOBJ =
|
||||
|
||||
#
|
||||
#
|
||||
#
|
||||
-WINSRC = $(WINTTYSRC)
|
||||
-WINOBJ = $(WINTTYOBJ)
|
||||
-
|
||||
|
||||
# on some systems the termcap library is in -ltermcap or -lcurses
|
||||
# on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
|
||||
# Sysatt uses shared library in lieu of this option
|
||||
@@ -186,7 +183,7 @@ WINTTYLIB = -ltermlib
|
||||
@@ -224,7 +222,7 @@ WINTTYLIB = -ltermlib
|
||||
#
|
||||
# libraries for X11
|
||||
# If USE_XPM is defined in config.h, you will also need -lXpm here.
|
||||
@ -42,25 +37,12 @@ $OpenBSD: patch-sys_unix_Makefile_src,v 1.1 2000/04/16 20:49:00 espie Exp $
|
||||
# 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
|
||||
@@ -199,8 +196,6 @@ WINKDELIB = -lkdecore -lkdeui -lXext
|
||||
@@ -243,8 +241,6 @@ WINGEMLIB = -le_gem -lgem
|
||||
#
|
||||
#
|
||||
|
||||
-WINLIB = $(WINTTYLIB)
|
||||
# libraries for BeOS
|
||||
WINBELIB = -lbe
|
||||
-
|
||||
-WINLIB = $(WINTTYLIB)
|
||||
|
||||
# any other strange libraries your system needs (for Sysunix only -- the more
|
||||
# specialized targets should already be right)
|
||||
#
|
||||
@@ -394,10 +389,10 @@ objects.o:
|
||||
|
||||
# Qt windowport meta-object-compiler output
|
||||
qt_kde0.moc: ../include/qt_kde0.h
|
||||
- moc $< >$@
|
||||
+ moc $> >$@
|
||||
|
||||
qt_win.moc: ../include/qt_win.h
|
||||
- moc $< >$@
|
||||
+ moc $> >$@
|
||||
|
||||
$(MAKEDEFS): ../util/makedefs.c $(CONFIG_H) ../include/permonst.h \
|
||||
../include/objclass.h ../include/monsym.h \
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-sys_unix_Makefile_top,v 1.1 2000/04/16 20:49:00 espie Exp $
|
||||
--- sys/unix/Makefile.top.orig Sat Dec 11 06:21:05 1999
|
||||
+++ sys/unix/Makefile.top Fri Apr 14 14:13:19 2000
|
||||
@@ -13,18 +13,19 @@
|
||||
$OpenBSD: patch-sys_unix_Makefile_top,v 1.2 2001/03/23 16:11:11 espie Exp $
|
||||
--- sys/unix/Makefile.top.orig Tue Jul 4 02:42:05 2000
|
||||
+++ sys/unix/Makefile.top Fri Mar 23 03:09:00 2001
|
||||
@@ -13,19 +13,19 @@
|
||||
# execute things like 'data' and 'rumors')
|
||||
# MAKE = make
|
||||
|
||||
@ -10,6 +10,7 @@ $OpenBSD: patch-sys_unix_Makefile_top,v 1.1 2000/04/16 20:49:00 espie Exp $
|
||||
# make NetHack
|
||||
-PREFIX = /usr
|
||||
GAME = nethack
|
||||
-# GAME = nethack.prg
|
||||
-GAMEUID = games
|
||||
-GAMEGRP = bin
|
||||
+GAMEUID = bin
|
||||
@ -26,24 +27,25 @@ $OpenBSD: patch-sys_unix_Makefile_top,v 1.1 2000/04/16 20:49:00 espie Exp $
|
||||
+DIRPERM = 0775
|
||||
|
||||
# GAMEDIR also appears in config.h as "HACKDIR".
|
||||
#
|
||||
@@ -33,11 +34,12 @@ DIRPERM = 0755
|
||||
# VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else GAMEDIR
|
||||
@@ -35,12 +35,13 @@ DIRPERM = 0755
|
||||
# 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
|
||||
+REALGAMEDIR = $(PREFIX)/lib/$(GAME)dir
|
||||
+GAMEDIR = $(DESTDIR)${REALGAMEDIR}
|
||||
VARDIR = $(GAMEDIR)
|
||||
-SHELLDIR = $(PREFIX)/games
|
||||
+REALGAMEDIR = ${PREFIX}/lib/$(GAME)dir
|
||||
+GAMEDIR = ${DESTDIR}${REALGAMEDIR}
|
||||
+SHELLDIR = $(DESTDIR)$(PREFIX)/bin
|
||||
+SHELLDIR = ${DESTDIR}$(PREFIX)/bin
|
||||
|
||||
# per discussion in Install.X11 and Install.Qt
|
||||
-VARDATND =
|
||||
+# VARDATND =
|
||||
# VARDATND = x11tiles pet_mark.xbm
|
||||
# VARDATND = x11tiles pet_mark.xbm rip.xpm
|
||||
|
||||
@@ -139,7 +141,7 @@ dofiles:
|
||||
# for Atari/Gem
|
||||
@@ -167,7 +168,7 @@ dofiles:
|
||||
$(MAKE) dofiles-$${target-nodlb}
|
||||
cp src/$(GAME) $(GAMEDIR)
|
||||
-rm -f $(SHELLDIR)/$(GAME)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-sys_unix_Makefile_utl,v 1.1 2000/04/16 20:49:00 espie Exp $
|
||||
--- sys/unix/Makefile.utl.orig Sat Dec 11 06:21:05 1999
|
||||
+++ sys/unix/Makefile.utl Fri Apr 14 14:13:19 2000
|
||||
$OpenBSD: patch-sys_unix_Makefile_utl,v 1.2 2001/03/23 16:11:11 espie Exp $
|
||||
--- sys/unix/Makefile.utl.orig Mon Apr 17 15:36:44 2000
|
||||
+++ sys/unix/Makefile.utl Fri Mar 23 03:09:23 2001
|
||||
@@ -1,6 +1,7 @@
|
||||
# Makefile for NetHack's utility programs.
|
||||
# SCCS Id: @(#)Makefile.utl 3.3 97/04/19
|
||||
@ -9,14 +9,13 @@ $OpenBSD: patch-sys_unix_Makefile_utl,v 1.1 2000/04/16 20:49:00 espie Exp $
|
||||
# newer makes predefine $(MAKE) to 'make' and do smarter processing of
|
||||
# recursive make calls if $(MAKE) is used
|
||||
# these makes allow $(MAKE) to be overridden by the environment if someone
|
||||
@@ -84,9 +85,7 @@
|
||||
@@ -89,8 +90,7 @@
|
||||
# flags for debugging:
|
||||
# CFLAGS = -g -I../include
|
||||
|
||||
-CFLAGS = -O -I../include
|
||||
-LFLAGS =
|
||||
-
|
||||
+CFLAGS += -I../include
|
||||
|
||||
# yacc/lex programs to use to generate *_comp.h, *_lex.c, and *_yacc.c.
|
||||
# if, instead of yacc/lex you have bison/flex, comment/uncomment the following.
|
||||
LIBS =
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-sys_unix_unixunix_c,v 1.1 2000/04/16 20:49:00 espie Exp $
|
||||
--- sys/unix/unixunix.c.orig Sat Dec 11 06:21:05 1999
|
||||
+++ sys/unix/unixunix.c Fri Apr 14 14:13:19 2000
|
||||
@@ -38,7 +38,9 @@ gethdate(name)
|
||||
$OpenBSD: patch-sys_unix_unixunix_c,v 1.2 2001/03/23 16:11:11 espie Exp $
|
||||
--- sys/unix/unixunix.c.orig Wed Aug 9 19:56:45 2000
|
||||
+++ sys/unix/unixunix.c Fri Mar 23 03:03:25 2001
|
||||
@@ -42,7 +42,9 @@ gethdate(name)
|
||||
* does not exist on all systems, and moreover, that it sometimes includes
|
||||
* <sys/types.h> again, so that the compiler sees these typedefs twice.
|
||||
*/
|
||||
|
||||
@ -1 +0,0 @@
|
||||
dungeon explorin', hackin', game. Piece of cake
|
||||
Loading…
Reference in New Issue
Block a user