cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revamped nethack port:

Browse Source 
- 3.3.0.
- fixed packaging.
- moved common data to hackdata port, to avoid nasty collision with slash.
- compile and install recover.
- only install manpages that correspond to stuff we run.
- remove need for GMAKE.
- include configuration files, allow for X11/plain/qt flavor
(qt is not yet ready, it needs qt 2.0).

Colors work much better, even under console if TERM is set to pcvt25.
This commit is contained in:
espie 2000-04-16 20:48:56 +00:00
parent 6386b00b72
commit 3a0ccd1fae
20 changed files with 432 additions and 395 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
games/nethack/Makefile
View File

@ -1,20 +1,13 @@
# $OpenBSD: Makefile,v 1.9 2000/03/19 19:36:53 espie Exp $
# $OpenBSD: Makefile,v 1.10 2000/04/16 20:48:56 espie Exp $
# $FreeBSD: Makefile,v 1.13 1997/12/25 22:29:17 asami Exp $
DISTNAME= nethack-3.2.3
DISTNAME= nethack-3.3.0
CATEGORIES= games
NEED_VERSION= 1.191
MASTER_SITES= ftp://ftp.nethack.org/pub/nethack/oldver/3.2.2/src/ \
MASTER_SITES= ftp://ftp.nethack.org/pub/nethack/src/ \
ftp://ftp.uu.net/pub/games/nethack/sources/ \
${MASTER_SITE_GNU}
DISTFILES= nethack-3.2.2.tar.gz
WRKDIST=${WRKDIR}/nethack-3.2.2
MASTER_SITES0= ftp://ftp.nethack.org/pub/nethack/oldver/3.2.3/src/
PATCHFILES=nh-3.2.2-3.2.3.diff:0
MASTER_SITE_SUBDIR= nethack
MAINTAINER= espie@openbsd.org
@ -25,31 +18,39 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
USE_GMAKE= Yes
USE_X11= Yes
FAKE= Yes
FAKE_FLAGS=PREFIX=${PREFIX} DESTDIR=${WRKINST}
NHDIR= ${DESTDIR}${PREFIX}/lib/nethackdir
MAKE_ENV+= NHDIR=${NHDIR}
MAKE_ENV+= NHDIR=${NHDIR} NETHACKCONFIG=${NETHACKCONFIG}
pre-configure:
@cd ${WRKSRC}/sys/unix; ${SH} setup.sh
FLAVORS=X11
# Old text interface
FLAVOR?=
.if ${FLAVOR:U} == "X11"
NETHACKCONFIG=${FILESDIR}/x-config
USE_X11= Yes
.else
NETHACKCONFIG=${FILESDIR}/simple-config
.endif
RUN_DEPENDS=${LOCALBASE}/share/doc/Guidebook.txt::games/hackdata
do-configure:
@cd ${WRKSRC}/sys/unix; ${SH} setup.sh symlinks
post-build:
@cd ${WRKSRC}/util && ${MAKE_ENV} make recover
post-install:
@mkdir -p ${PREFIX}/lib/X11/fonts/hack
@mkdir -p ${PREFIX}/share/doc/nethack
@cd ${WRKSRC}/doc; chmod 644 *.6
@cd ${WRKSRC}/doc; PREFIX='${PREFIX}' INSTALL_MAN='${INSTALL_MAN}' make manpages
${INSTALL_DATA} ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/share/doc/nethack
${INSTALL_PROGRAM} ${WRKBUILD}/util/recover ${PREFIX}/bin
@cd ${WRKSRC}/doc && \
${INSTALL_MAN} nethack.6 recover.6 ${PREFIX}/man/man6
.if ${FLAVOR:U} == "X11"
@mkdir -p ${PREFIX}/lib/X11/app-defaults
@cd ${WRKSRC}/win/X11 && \
cp NetHack.ad NetHack && \
${INSTALL_DATA} NetHack ${PREFIX}/lib/X11/app-defaults && \
/usr/X11R6/bin/bdftopcf ibm.bdf | /usr/bin/gzip > ibm.pcf.gz && \
/usr/X11R6/bin/bdftopcf nh10.bdf | /usr/bin/gzip > nh10.pcf.gz && \
${INSTALL_DATA} ibm.pcf.gz ${PREFIX}/lib/X11/fonts/hack && \
${INSTALL_DATA} nh10.pcf.gz ${PREFIX}/lib/X11/fonts/hack
/usr/X11R6/bin/mkfontdir ${PREFIX}/lib/X11/fonts/hack
@cd ${WRKSRC}/win/X11 && cp NetHack.ad NetHack && \
${INSTALL_DATA} NetHack ${PREFIX}/lib/X11/app-defaults
.endif
.include <bsd.port.mk>

9
games/nethack/files/md5
View File

@ -1,6 +1,3 @@
MD5 (nethack-3.2.2.tar.gz) = c85de4d14453b3a2d182d1dfc2ca04df
MD5 (nh-3.2.2-3.2.3.diff) = 440141990df326d5a973d890179cffae
RMD160 (nethack-3.2.2.tar.gz) = 7b4b8f1a17aeedb028f4d65f59916c47bcafb42d
RMD160 (nh-3.2.2-3.2.3.diff) = 032d0a1b286bb69e58b1c2f5b39611e3e4d4750d
SHA1 (nethack-3.2.2.tar.gz) = 0bcfa26a2aef0d39f44c6ef1c8c2468c12e69bfe
SHA1 (nh-3.2.2-3.2.3.diff) = a181b0e0feb2d86b978a63587c34075b1e7ac26d
MD5 (nethack-3.3.0.tar.gz) = cf9f4039408321f39c3ef733455cb73a
RMD160 (nethack-3.3.0.tar.gz) = 2ed0bc8e0e18ff3ecb2477b8509fc46f1e0480e3
SHA1 (nethack-3.3.0.tar.gz) = 40956396fcdc65bd4020e68660188d388d264470

54
games/nethack/patches/patch-aa
View File

@ -1,54 +0,0 @@
--- include/config.h.orig Tue Dec 10 21:20:07 1996
+++ include/config.h Fri Jul 24 17:04:34 1998
@@ -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
@@ -269,6 +269,7 @@
* LOGFILE and NEWS refer to files in the playground.
*/
+#define WIZARD "games"
#ifndef WIZARD /* allow for compile-time or Makefile changes */
# ifndef KR1ED
# define WIZARD "wizard" /* the person allowed to use the -D option */
@@ -296,12 +297,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 */
@@ -427,7 +428,7 @@
* functions that have been macroized.
*/
-/*#define VISION_TABLES /* use vision tables generated at compile time */
+#define VISION_TABLES /* use vision tables generated at compile time */
#ifndef VISION_TABLES
# ifndef NO_MACRO_CPATH
# define MACRO_CPATH /* use clear_path macros instead of functions */

28
games/nethack/patches/patch-ab
View File

@ -1,28 +0,0 @@
--- include/system.h.orig Mon Nov 4 15:01:25 1996
+++ include/system.h Fri Jul 24 18:01:25 1998
@@ -80,7 +80,7 @@
# if !defined(SUNOS4) || defined(RANDOM)
E void FDECL(srandom, (unsigned int));
# else
-# ifndef bsdi
+# if !defined(bsdi)
E int FDECL(srandom, (unsigned int));
# endif
# endif
@@ -507,11 +507,15 @@
# endif
# endif
-# if defined(ULTRIX) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC)
+#if defined(BSD)
+/* no declaration needed: it's in time.h */
+#else
+# 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 *));
# endif /* ULTRIX */
+#endif
#ifdef VMS
/* used in makedefs.c, but missing from gcc-vms's <time.h> */

67
games/nethack/patches/patch-ac
View File

@ -1,67 +0,0 @@
--- include/unixconf.h.orig Tue Dec 10 21:20:08 1996
+++ include/unixconf.h Fri Jul 24 17:19:18 1998
@@ -19,7 +19,11 @@
*/
/* define exactly one of the following four choices */
-#define BSD 1 /* define for 4.n BSD */
+/* procure the real define BSD */
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+/* #define BSD 1 /* define for 4.n BSD */
/* also for relatives like SunOS, Linux and DG/UX */
/* #define ULTRIX /* define for Ultrix v3.0 or higher (but not lower) */
/* Use BSD for < v3.0 */
@@ -33,7 +37,7 @@
/* #define SVR4 /* use in addition to SYSV for System V Release 4 */
#define NETWORK /* if running on a networked system */
/* e.g. Suns sharing a playground through NFS */
-#define SUNOS4 /* SunOS 4.x */
+/* #define SUNOS4 /* SunOS 4.x */
/* #define LINUX /* Another Unix clone */
/* #define GENIX /* Yet Another Unix Clone */
/* #define HISX /* Bull Unix for XPS Machines */
@@ -42,12 +46,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).
@@ -114,7 +118,7 @@
* "extra output" method is used, but not all systems provide access to
* a fine-grained timer.
*/
-/* #define TIMED_DELAY /* usleep() */
+#define TIMED_DELAY /* usleep() */
#endif
/*
@@ -125,7 +129,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
@@ -286,7 +290,7 @@
#endif
#ifdef TIMED_DELAY
-# if defined(SUNOS4) || defined(LINUX)
+# if defined(SUNOS4) || defined(LINUX) || (defined(BSD) && BSD >= 199103)
# define msleep(k) usleep((k)*1000)
# endif
# ifdef ULTRIX

40
games/nethack/patches/patch-af
View File

@ -1,40 +0,0 @@
--- sys/unix/Makefile.src.orig Tue Dec 10 21:20:09 1996
+++ sys/unix/Makefile.src Fri Jul 24 19:07:00 1998
@@ -124,8 +124,8 @@
# flags for debugging:
# CFLAGS = -g -I../include
-CFLAGS = -O -I../include
-LFLAGS =
+CFLAGS += -DHACKDIR=\"${NHDIR}\" -DHAVE_SYS_PARAM_H -I../include -I${X11BASE}/include
+LFLAGS = -L${X11BASE}/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)

11
games/nethack/patches/patch-ag
View File

@ -1,11 +0,0 @@
--- sys/unix/Makefile.utl.orig Fri Jul 24 18:15:35 1998
+++ sys/unix/Makefile.utl Fri Jul 24 18:15:56 1998
@@ -78,7 +78,7 @@
# flags for debugging:
# CFLAGS = -g -I../include
-CFLAGS = -O -I../include
+CFLAGS += -DHAVE_SYS_PARAM_H -I../include
LFLAGS =

45
games/nethack/patches/patch-include_config_h Normal file
View File

@ -0,0 +1,45 @@
$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 @@
* 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
@@ -106,6 +106,7 @@
* LOGFILE and NEWS refer to files in the playground.
*/
+#define WIZARD "games"
#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 @@
#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"
+#define COMPRESS_EXTENSION ".gz"
#endif
#ifndef COMPRESS
@@ -264,7 +267,7 @@ typedef unsigned char uchar;
* functions that have been macroized.
*/
-/* #define VISION_TABLES */ /* use vision tables generated at compile time */
+#define VISION_TABLES /* use vision tables generated at compile time */
#ifndef VISION_TABLES
# ifndef NO_MACRO_CPATH
# define MACRO_CPATH /* use clear_path macros instead of functions */

19
games/nethack/patches/patch-include_system_h Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-include_system_h,v 1.1 2000/04/16 20:49:00 espie Exp $
--- include/system.h.orig Sat Dec 11 06:20:51 1999
+++ include/system.h Fri Apr 14 14:13:19 2000
@@ -513,11 +513,15 @@ E struct tm *FDECL(localtime, (const tim
# endif
# endif
+# if defined(BSD)
+/* no declaration needed; it's in time.h */
+#else
# if defined(ULTRIX) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) || (defined(HPUX) && defined(_POSIX_SOURCE))
E time_t FDECL(time, (time_t *));
# else
E long FDECL(time, (time_t *));
# endif /* ULTRIX */
+#endif
#ifdef VMS
/* used in makedefs.c, but missing from gcc-vms's <time.h> */

61
games/nethack/patches/patch-include_unixconf_h Normal file
View File

@ -0,0 +1,61 @@
$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
@@ -19,7 +19,12 @@
*/
/* define exactly one of the following four choices */
-/* #define BSD 1 */ /* define for 4.n BSD */
+/* procure the real define BSD */
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+/* #define BSD 1 /* define for 4.n 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) */
@@ -32,7 +37,7 @@
/* define any of the following that are appropriate */
-#define SVR4 /* use in addition to SYSV for System V Release 4 */
+/* #define SVR4 /* use in addition to SYSV for System V Release 4 */
/* 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
* 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 @@
* "extra output" method is used, but not all systems provide access to
* a fine-grained timer.
*/
-/* #define TIMED_DELAY */ /* usleep() */
+#define TIMED_DELAY /* usleep() */
#endif
/*
@@ -135,7 +141,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
@@ -296,7 +302,7 @@
#endif
#ifdef TIMED_DELAY
-# if defined(SUNOS4) || defined(LINUX)
+# if defined(SUNOS4) || defined(LINUX) || (defined(BSD) && BSD >= 199103)
# define msleep(k) usleep((k)*1000)
# endif
# ifdef ULTRIX

7
games/nethack/patches/patch-ae → games/nethack/patches/patch-sys_unix_Makefile_doc
View File

@ -1,6 +1,7 @@
--- sys/unix/Makefile.doc.orig Tue Dec 10 21:20:08 1996
+++ sys/unix/Makefile.doc Fri Jul 24 15:21:40 1998
@@ -31,15 +31,15 @@
$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
GAME = nethack

66
games/nethack/patches/patch-sys_unix_Makefile_src Normal file
View File

@ -0,0 +1,66 @@
$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
@@ -1,6 +1,7 @@
# NetHack Makefile.
# SCCS Id: @(#)Makefile.src 3.3 97/04/17
+include ${NETHACKCONFIG}
# 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
# flags for debugging:
# CFLAGS = -g -I../include
-CFLAGS = -O -I../include
-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
#
#
-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
#
# 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
@@ -199,8 +196,6 @@ WINKDELIB = -lkdecore -lkdeui -lXext
#
#
-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 \

35
games/nethack/patches/patch-ad → games/nethack/patches/patch-sys_unix_Makefile_top
View File

@ -1,8 +1,14 @@
--- sys/unix/Makefile.top.orig Tue Dec 10 21:20:10 1996
+++ sys/unix/Makefile.top Sun Mar 19 20:10:34 2000
@@ -15,15 +15,15 @@
$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 @@
# execute things like 'data' and 'rumors')
# MAKE = make
+include ${NETHACKCONFIG}
+
# make NetHack
-PREFIX = /usr
GAME = nethack
-GAMEUID = games
-GAMEGRP = bin
@ -21,26 +27,23 @@
# GAMEDIR also appears in config.h as "HACKDIR".
#
@@ -32,13 +32,14 @@
@@ -33,11 +34,12 @@ 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 = /usr/games/lib/$(GAME)dir
-SHELLDIR = /usr/games
+GAMEDIR = ${DESTDIR}${PREFIX}/lib/$(GAME)dir
+REALGAMEDIR = ${PREFIX}/lib/$(GAME)dir
+SHELLDIR = ${DESTDIR}${PREFIX}/bin
-GAMEDIR = $(PREFIX)/games/lib/$(GAME)dir
-SHELLDIR = $(PREFIX)/games
+REALGAMEDIR = ${PREFIX}/lib/$(GAME)dir
+GAMEDIR = ${DESTDIR}${REALGAMEDIR}
+SHELLDIR = $(DESTDIR)$(PREFIX)/bin
# per discussion in Install.X11
# per discussion in Install.X11 and Install.Qt
-VARDATND =
+#VARDATND =
+# VARDATND =
# VARDATND = x11tiles pet_mark.xbm
-# VARDATND = x11tiles pet_mark.xbm rip.xpm
+VARDATND = x11tiles pet_mark.xbm rip.xpm
# VARDATND = x11tiles pet_mark.xbm rip.xpm
VARDATD = data oracles options quest.dat rumors
VARDAT = $(VARDATD) $(VARDATND)
@@ -137,7 +138,7 @@
@@ -139,7 +141,7 @@ dofiles:
$(MAKE) dofiles-$${target-nodlb}
cp src/$(GAME) $(GAMEDIR)
-rm -f $(SHELLDIR)/$(GAME)

22
games/nethack/patches/patch-sys_unix_Makefile_utl Normal file
View File

@ -0,0 +1,22 @@
$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
@@ -1,6 +1,7 @@
# Makefile for NetHack's utility programs.
# SCCS Id: @(#)Makefile.utl 3.3 97/04/19
+include ${NETHACKCONFIG}
# 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 @@
# 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.

7
games/nethack/patches/patch-ah → games/nethack/patches/patch-sys_unix_unixunix_c
View File

@ -1,6 +1,7 @@
--- sys/unix/unixunix.c.orig Fri Jul 24 19:06:13 1998
+++ sys/unix/unixunix.c Fri Jul 24 19:06:05 1998
@@ -38,7 +38,9 @@
$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)
* does not exist on all systems, and moreover, that it sometimes includes
* <sys/types.h> again, so that the compiler sees these typedefs twice.
*/

13
games/nethack/patches/patch-win_Qt_qt_win_cpp Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-win_Qt_qt_win_cpp,v 1.1 2000/04/16 20:49:00 espie Exp $
--- win/Qt/qt_win.cpp.orig Sat Dec 11 06:21:09 1999
+++ win/Qt/qt_win.cpp Fri Apr 14 14:13:20 2000
@@ -91,7 +91,8 @@ extern "C" {
#include "qt_clust.h"
#include "qt_xpms.h"
-#include <malloc.h>
+//#include <malloc.h>
+#include <stdlib.h>
#ifdef _WS_X11_
// For userid control

11
games/nethack/pkg/DESCR
View File

@ -4,12 +4,13 @@ and finish the game ? At least, you're starting with a bonus: a puppy
If you find that game too easy, you may want to try slash instead.
- in order to use nethack with X11 graphics, you will have to add
${PREFIX}/lib/X11/fonts/hack to your fontpath, see xset(1) and Xserver(1), also
/usr/X11R6/lib/X11/xdm or /usr/X11R6/lib/X11/xinit for proper configuration.
- in order to use nethack with X11 graphics, you need the nethack-*-x11
FLAVOR. You will also have to add ${PREFIX}/lib/X11/fonts/hack to your
fontpath, see xset(1) and Xserver(1), also /usr/X11R6/lib/X11/xdm or
/usr/X11R6/lib/X11/xinit for proper configuration.
- the tty with colors mode expects a black background and white foreground to
run properly, e.g., xterm -fg white -bg black
- the tty with colors mode uses ANSI colors, unless it finds a suitable
termcap entry, for instance xterm-color.
- Marc
espie@cvs.openbsd.org

4
games/nethack/pkg/PFRAG.x11 Normal file
View File

@ -0,0 +1,4 @@
lib/X11/app-defaults/NetHack
lib/nethackdir/pet_mark.xbm
lib/nethackdir/x11tiles
lib/nethackdir/rip.xpm

134
games/nethack/pkg/PLIST
View File

@ -1,134 +0,0 @@
@group games
bin/nethack
man/man6/dgn_comp.6
man/man6/dlb.6
man/man6/lev_comp.6
man/man6/nethack.6
man/man6/recover.6
lib/nethackdir/A-filla.lev
lib/nethackdir/A-fillb.lev
lib/nethackdir/A-goal.lev
lib/nethackdir/A-locate.lev
lib/nethackdir/A-start.lev
lib/nethackdir/B-filla.lev
lib/nethackdir/B-fillb.lev
lib/nethackdir/B-goal.lev
lib/nethackdir/B-locate.lev
lib/nethackdir/B-start.lev
lib/nethackdir/C-filla.lev
lib/nethackdir/C-fillb.lev
lib/nethackdir/C-goal.lev
lib/nethackdir/C-locate.lev
lib/nethackdir/C-start.lev
lib/nethackdir/E-filla.lev
lib/nethackdir/E-fillb.lev
lib/nethackdir/E-goal.lev
lib/nethackdir/E-locate.lev
lib/nethackdir/E-start.lev
lib/nethackdir/H-filla.lev
lib/nethackdir/H-fillb.lev
lib/nethackdir/H-goal.lev
lib/nethackdir/H-locate.lev
lib/nethackdir/H-start.lev
lib/nethackdir/K-filla.lev
lib/nethackdir/K-fillb.lev
lib/nethackdir/K-goal.lev
lib/nethackdir/K-locate.lev
lib/nethackdir/K-start.lev
lib/nethackdir/P-filla.lev
lib/nethackdir/P-fillb.lev
lib/nethackdir/P-goal.lev
lib/nethackdir/P-locate.lev
lib/nethackdir/P-start.lev
lib/nethackdir/R-filla.lev
lib/nethackdir/R-fillb.lev
lib/nethackdir/R-goal.lev
lib/nethackdir/R-locate.lev
lib/nethackdir/R-start.lev
lib/nethackdir/S-filla.lev
lib/nethackdir/S-fillb.lev
lib/nethackdir/S-goal.lev
lib/nethackdir/S-locate.lev
lib/nethackdir/S-start.lev
lib/nethackdir/T-filla.lev
lib/nethackdir/T-fillb.lev
lib/nethackdir/T-goal.lev
lib/nethackdir/T-locate.lev
lib/nethackdir/T-start.lev
lib/nethackdir/V-filla.lev
lib/nethackdir/V-fillb.lev
lib/nethackdir/V-goal.lev
lib/nethackdir/V-locate.lev
lib/nethackdir/V-start.lev
lib/nethackdir/W-filla.lev
lib/nethackdir/W-fillb.lev
lib/nethackdir/W-goal.lev
lib/nethackdir/W-locate.lev
lib/nethackdir/W-start.lev
lib/nethackdir/air.lev
lib/nethackdir/asmodeus.lev
lib/nethackdir/astral.lev
lib/nethackdir/baalz.lev
lib/nethackdir/bigrm-1.lev
lib/nethackdir/bigrm-2.lev
lib/nethackdir/bigrm-3.lev
lib/nethackdir/bigrm-4.lev
lib/nethackdir/bigrm-5.lev
lib/nethackdir/castle.lev
lib/nethackdir/cmdhelp
lib/nethackdir/data
lib/nethackdir/dungeon
lib/nethackdir/earth.lev
lib/nethackdir/fakewiz1.lev
lib/nethackdir/fakewiz2.lev
lib/nethackdir/fire.lev
lib/nethackdir/help
lib/nethackdir/hh
lib/nethackdir/history
lib/nethackdir/juiblex.lev
lib/nethackdir/knox.lev
lib/nethackdir/license
lib/nethackdir/medusa-1.lev
lib/nethackdir/medusa-2.lev
lib/nethackdir/minefill.lev
lib/nethackdir/minend-1.lev
lib/nethackdir/minend-2.lev
lib/nethackdir/minetn-1.lev
lib/nethackdir/minetn-2.lev
lib/nethackdir/opthelp
lib/nethackdir/options
lib/nethackdir/oracle.lev
lib/nethackdir/oracles
lib/nethackdir/orcus.lev
lib/nethackdir/pet_mark.xbm
lib/nethackdir/quest.dat
lib/nethackdir/rip.xpm
lib/nethackdir/rumors
lib/nethackdir/sanctum.lev
lib/nethackdir/tower1.lev
lib/nethackdir/tower2.lev
lib/nethackdir/tower3.lev
lib/nethackdir/valley.lev
lib/nethackdir/water.lev
lib/nethackdir/wizard1.lev
lib/nethackdir/wizard2.lev
lib/nethackdir/wizard3.lev
lib/nethackdir/wizhelp
lib/nethackdir/x11tiles
lib/X11/app-defaults/NetHack
lib/X11/fonts/hack/ibm.pcf.gz
lib/X11/fonts/hack/nh10.pcf.gz
@exec /usr/X11R6/bin/mkfontdir %D/lib/X11/fonts/hack
@unexec /usr/X11R6/bin/mkfontdir %D/lib/X11/fonts/hack
@mode 664
lib/nethackdir/logfile
lib/nethackdir/record
lib/nethackdir/perm
@exec chmod 775 %D/lib/nethackdir
@mode 2555
lib/nethackdir/nethack
@exec mkdir %D/lib/nethackdir/save
@exec chgrp games %D/lib/nethackdir/save
@exec chmod -R 575 %D/lib/nethackdir/save
@unexec rm -rf %D/lib/nethackdir/save
@dirrm lib/nethackdir

137
games/nethack/pkg/PLIST.sed Normal file
View File

@ -0,0 +1,137 @@
@comment $OpenBSD: PLIST.sed,v 1.1 2000/04/16 20:49:01 espie Exp $
@group games
bin/nethack
bin/recover
%%x11%%
lib/nethackdir/Arc-fila.lev
lib/nethackdir/Arc-filb.lev
lib/nethackdir/Arc-goal.lev
lib/nethackdir/Arc-loca.lev
lib/nethackdir/Arc-strt.lev
lib/nethackdir/Bar-fila.lev
lib/nethackdir/Bar-filb.lev
lib/nethackdir/Bar-goal.lev
lib/nethackdir/Bar-loca.lev
lib/nethackdir/Bar-strt.lev
lib/nethackdir/Cav-fila.lev
lib/nethackdir/Cav-filb.lev
lib/nethackdir/Cav-goal.lev
lib/nethackdir/Cav-loca.lev
lib/nethackdir/Cav-strt.lev
lib/nethackdir/Hea-fila.lev
lib/nethackdir/Hea-filb.lev
lib/nethackdir/Hea-goal.lev
lib/nethackdir/Hea-loca.lev
lib/nethackdir/Hea-strt.lev
lib/nethackdir/Kni-fila.lev
lib/nethackdir/Kni-filb.lev
lib/nethackdir/Kni-goal.lev
lib/nethackdir/Kni-loca.lev
lib/nethackdir/Kni-strt.lev
lib/nethackdir/Mon-fila.lev
lib/nethackdir/Mon-filb.lev
lib/nethackdir/Mon-goal.lev
lib/nethackdir/Mon-loca.lev
lib/nethackdir/Mon-strt.lev
lib/nethackdir/Pri-fila.lev
lib/nethackdir/Pri-filb.lev
lib/nethackdir/Pri-goal.lev
lib/nethackdir/Pri-loca.lev
lib/nethackdir/Pri-strt.lev
lib/nethackdir/Ran-fila.lev
lib/nethackdir/Ran-filb.lev
lib/nethackdir/Ran-goal.lev
lib/nethackdir/Ran-loca.lev
lib/nethackdir/Ran-strt.lev
lib/nethackdir/Rog-fila.lev
lib/nethackdir/Rog-filb.lev
lib/nethackdir/Rog-goal.lev
lib/nethackdir/Rog-loca.lev
lib/nethackdir/Rog-strt.lev
lib/nethackdir/Sam-fila.lev
lib/nethackdir/Sam-filb.lev
lib/nethackdir/Sam-goal.lev
lib/nethackdir/Sam-loca.lev
lib/nethackdir/Sam-strt.lev
lib/nethackdir/Tou-fila.lev
lib/nethackdir/Tou-filb.lev
lib/nethackdir/Tou-goal.lev
lib/nethackdir/Tou-loca.lev
lib/nethackdir/Tou-strt.lev
lib/nethackdir/Val-fila.lev
lib/nethackdir/Val-filb.lev
lib/nethackdir/Val-goal.lev
lib/nethackdir/Val-loca.lev
lib/nethackdir/Val-strt.lev
lib/nethackdir/Wiz-fila.lev
lib/nethackdir/Wiz-filb.lev
lib/nethackdir/Wiz-goal.lev
lib/nethackdir/Wiz-loca.lev
lib/nethackdir/Wiz-strt.lev
lib/nethackdir/air.lev
lib/nethackdir/asmodeus.lev
lib/nethackdir/astral.lev
lib/nethackdir/baalz.lev
lib/nethackdir/bigrm-1.lev
lib/nethackdir/bigrm-2.lev
lib/nethackdir/bigrm-3.lev
lib/nethackdir/bigrm-4.lev
lib/nethackdir/bigrm-5.lev
lib/nethackdir/castle.lev
lib/nethackdir/cmdhelp
lib/nethackdir/data
lib/nethackdir/dungeon
lib/nethackdir/earth.lev
lib/nethackdir/fakewiz1.lev
lib/nethackdir/fakewiz2.lev
lib/nethackdir/fire.lev
lib/nethackdir/help
lib/nethackdir/hh
lib/nethackdir/history
lib/nethackdir/juiblex.lev
lib/nethackdir/knox.lev
lib/nethackdir/license
lib/nethackdir/medusa-1.lev
lib/nethackdir/medusa-2.lev
lib/nethackdir/minefill.lev
lib/nethackdir/minend-1.lev
lib/nethackdir/minend-2.lev
lib/nethackdir/minetn-1.lev
lib/nethackdir/minetn-2.lev
lib/nethackdir/opthelp
lib/nethackdir/options
lib/nethackdir/oracle.lev
lib/nethackdir/oracles
lib/nethackdir/orcus.lev
lib/nethackdir/quest.dat
lib/nethackdir/rumors
lib/nethackdir/sanctum.lev
lib/nethackdir/soko1-1.lev
lib/nethackdir/soko1-2.lev
lib/nethackdir/soko2-1.lev
lib/nethackdir/soko2-2.lev
lib/nethackdir/soko3-1.lev
lib/nethackdir/soko3-2.lev
lib/nethackdir/soko4-1.lev
lib/nethackdir/soko4-2.lev
lib/nethackdir/tower1.lev
lib/nethackdir/tower2.lev
lib/nethackdir/tower3.lev
lib/nethackdir/valley.lev
lib/nethackdir/water.lev
lib/nethackdir/wizard1.lev
lib/nethackdir/wizard2.lev
lib/nethackdir/wizard3.lev
lib/nethackdir/wizhelp
man/man6/nethack.6
man/man6/recover.6
@mode 2555
lib/nethackdir/nethack
@exec chmod 775 %B
@exec install -g games -m 0664 /dev/null %B/logfile
@exec install -g games -m 0664 /dev/null %B/perm
@exec install -g games -m 0664 /dev/null %B/record
@unexec rm %B/logfile %B/perm %B/record
@exec install -d -g games -m 0575 %B/save
@unexec rm -rf %B/save
@dirrm lib/nethackdir