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

Repair slash port.

Browse Source 
- base on nethack 3.2.2, bump to 3.3.0 will have to wait (probably better
to port slash'em instead),
- use hackdata to avoid conflicts with nethack,
- proper packaging,
- x11/no x11 flavor,
- install recover,
- change manpages to differentiate from nethack,
- grab enough TERMINFO to handle color correctly (from nethack 3.3.0)
This commit is contained in:
espie 2000-04-16 21:18:59 +00:00
parent 45b85b1174
commit f9fa1eecc8
21 changed files with 256 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
games/slash/Makefile
View File

@ -1,55 +1,75 @@
# $OpenBSD: Makefile,v 1.13 2000/04/09 17:36:32 espie Exp $
# $OpenBSD: Makefile,v 1.14 2000/04/16 21:18:59 espie Exp $
DISTNAME= slash-e8
CATEGORIES= games
NEED_VERSION= 1.121
FAKE=No
MASTER_SITES0= ${MASTER_SITE_GNU}
MASTER_SITES= ftp://ftp.nethack.org/pub/nethack/oldver/3.2.2/src/ \
ftp://ftp.uu.net/pub/games/nethack/sources/ \
${MASTER_SITE_GNU}
MASTER_SITES0= ftp://ftp.nethack.org/pub/nethack/oldver/3.2.3/src/
MASTER_SITES1= http://www.rz.tu-ilmenau.de/~wi019/Slash/
MASTER_SITE_SUBDIR= nethack
DISTFILES= nethack-3.2.2.tar.gz:0 Slash-Unix.tar.gz:1
DISTFILES= nethack-3.2.2.tar.gz Slash-Unix.tar.gz:1
PATCHFILES=nh-3.2.2-3.2.3.diff:0
MAINTAINER= espie@openbsd.org
LICENSE_TYPE= GPL
PERMIT_PACKAGE_CDROM= YES
PERMIT_PACKAGE_FTP= YES
PERMIT_DISTFILES_CDROM= YES
PERMIT_DISTFILES_FTP= YES
PERMIT_PACKAGE_CDROM= Yes
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= ${PREFIX}/lib/slashdir
MAKE_ENV+= NHDIR=${NHDIR}
NHDIR= ${DESTDIR}${PREFIX}/lib/slashdir
MAKE_ENV+= NHDIR=${NHDIR} NETHACKCONFIG=${NETHACKCONFIG}
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/nethack/Guidebook.txt::games/hackdata
post-extract:
@cd ${WRKDIR}; mv nethack-3.2.2 ${DISTNAME}
@cd ${WRKDIR}; mv dat/* ${DISTNAME}/dat
@cd ${WRKDIR} && mv nethack-3.2.2 ${DISTNAME}
@cd ${WRKDIR} && mv dat/* ${DISTNAME}/dat
@cp ${FILESDIR}/blkmar.des ${WRKSRC}/dat
pre-patch:
@cd ${WRKSRC}; ${PATCH} -p1 -s < ${WRKDIR}/slashe8.dif
@cd ${WRKSRC}; ${PATCH} -p1 -s < ${WRKDIR}/e8p1.dif
post-distpatch:
# Two patches failure, not to worry
@-cd ${WRKSRC} && ${PATCH} -p1 -b .bak.orig -s < ${WRKDIR}/slashe8.dif
@cd ${WRKSRC} && ${PATCH} -p1 -b .bak.orig -s < ${WRKDIR}/e8p1.dif
pre-configure:
@cd ${WRKSRC}/sys/unix; ${SH} setup.sh
do-configure:
@cd ${WRKSRC}/sys/unix && ${SH} setup.sh symlinks
post-build:
@cd ${WRKSRC}/util && ${MAKE_ENV} make recover
@cd ${WRKSRC}/util && ln -f recover srecover
@cd ${WRKSRC}/doc && perl -p ${FILESDIR}/substitute <nethack.6 >slash.6
@cd ${WRKSRC}/doc && perl -p ${FILESDIR}/substitute <recover.6 >srecover.6
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/srecover ${PREFIX}/bin
@cd ${WRKSRC}/doc && \
${INSTALL_MAN} slash.6 srecover.6 ${PREFIX}/man/man6
.if ${FLAVOR:U} == "X11"
@mkdir -p ${PREFIX}/lib/X11/app-defaults
@cd ${WRKSRC}/win/X11 && \
sed -e "s/^NetHack/Slash/; s/^!NetHack/!Slash/" <NetHack.ad > Slash && \
${INSTALL_DATA} Slash ${PREFIX}/lib/X11/app-defaults && \
${X11BASE}/bin/bdftopcf ibm.bdf | /usr/bin/gzip > ibm.pcf.gz && \
${X11BASE}/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
${X11BASE}/bin/mkfontdir ${X11BASE}/lib/X11/fonts/hack
@cat ${PKGDIR}/DESCR
${INSTALL_DATA} Slash ${PREFIX}/lib/X11/app-defaults
.endif
.include <bsd.port.mk>

6
games/slash/files/md5
View File

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

7
games/slash/files/simple-config Normal file
View File

@ -0,0 +1,7 @@
VARDATND =
CFLAGS+=
LFLAGS =
WINSRC = $(WINTTYSRC)
WINOBJ = $(WINTTYOBJ)
WINLIB = $(WINTTYLIB)

6
games/slash/files/substitute Normal file
View File

@ -0,0 +1,6 @@
s/\bNETHACK\b/SLASH/g;
s/\bNet[hH]ack\b(?!\s+v3.1)/Slash/g;
s/\bnethack\b/slash/g;
s/\bnethackdir\b/slashdir/g;
s|/usr/games|/usr/local|g;
s/\brecover\b/srecover/g;

7
games/slash/files/x-config Normal file
View File

@ -0,0 +1,7 @@
VARDATND = x11tiles pet_mark.xbm rip.xpm
CFLAGS+=-DX11_GRAPHICS -I${X11BASE}/include
LFLAGS =-L${X11BASE}/lib
WINSRC = $(WINTTYSRC) $(WINX11SRC)
WINOBJ = $(WINTTYOBJ) $(WINX11OBJ)
WINLIB = $(WINTTYLIB) $(WINX11LIB)

20
games/slash/patches/patch-ab
View File

@ -1,20 +0,0 @@
--- include/system.h.org Fri Jul 24 22:45:01 1998
+++ include/system.h Fri Jul 24 22:46:04 1998
@@ -511,6 +511,9 @@
# 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)
# ifndef __WATCOMC__
E time_t FDECL(time, (time_t *));
@@ -518,6 +521,7 @@
# else
E long FDECL(time, (time_t *));
# endif /* ULTRIX */
+#endif
#ifdef VMS
/* used in makedefs.c, but missing from gcc-vms's <time.h> */

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

@ -1,11 +0,0 @@
--- sys/unix/Makefile.utl.org Fri Jul 24 22:55:02 1998
+++ sys/unix/Makefile.utl Fri Jul 24 22:55:38 1998
@@ -78,7 +78,7 @@
# flags for debugging:
# CFLAGS = -g -I../include
-CFLAGS = -O -I../include
+CFLAGS += -DHAVE_SYS_PARAM_H -I../include
LFLAGS =

28
games/slash/patches/patch-aa → games/slash/patches/patch-include_config_h
View File

@ -1,14 +1,6 @@
--- include/config.h.org Fri Jul 24 22:40:57 1998
+++ include/config.h Fri Jul 24 22:44:16 1998
@@ -213,7 +213,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
$OpenBSD: patch-include_config_h,v 1.1 2000/04/16 21:19:07 espie Exp $
--- include/config.h.orig Fri Apr 14 15:10:44 2000
+++ include/config.h Fri Apr 14 15:14:40 2000
@@ -258,7 +258,7 @@
* would allow:
* xpmtoppm <x11tiles.xpm | pnmscale 1.25 | ppmquant 90 >x11tiles_big.xpm
@ -26,7 +18,7 @@
#ifndef WIZARD /* allow for compile-time or Makefile changes */
# ifndef KR1ED
# define WIZARD "wizard" /* the person allowed to use the -D option */
@@ -298,12 +299,12 @@
@@ -298,12 +299,14 @@
#ifdef UNIX
/* path and file name extension for compression program */
@ -36,14 +28,14 @@
+/* # 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 */
/* # 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
# define INTERNAL_COMP /* control use of NetHack's compression routines */
@@ -431,7 +432,7 @@
@@ -431,7 +434,7 @@ typedef unsigned char uchar;
* functions that have been macroized.
*/
@ -52,7 +44,7 @@
#ifndef VISION_TABLES
# ifndef NO_MACRO_CPATH
# define MACRO_CPATH /* use clear_path macros instead of functions */
@@ -453,14 +454,14 @@
@@ -453,14 +456,14 @@ typedef unsigned char uchar;
/* dungeon levels */
#define WALLIFIED_MAZE /* Fancy mazes - Jean-Christophe Collet */
#define REINCARNATION /* Special Rogue-like levels */

16
games/slash/patches/patch-include_patchlevel_h Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-include_patchlevel_h,v 1.1 2000/04/16 21:19:07 espie Exp $
--- include/patchlevel.h.orig Fri Apr 14 15:10:24 2000
+++ include/patchlevel.h Fri Apr 14 15:10:50 2000
@@ -2,9 +2,9 @@
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
-/* NetHack 3.2.3 */
-#define VERSION_MAJOR 3
-#define VERSION_MINOR 2
+/* Slash */
+#define VERSION_MAJOR 4
+#define VERSION_MINOR 1
/*
* PATCHLEVEL is updated for each release.
*/

21
games/slash/patches/patch-include_system_h Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-include_system_h,v 1.1 2000/04/16 21:19:07 espie Exp $
--- include/system.h.orig Fri Apr 14 15:10:24 2000
+++ include/system.h Fri Apr 14 15:10:49 2000
@@ -511,6 +511,9 @@ 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)
# ifndef __WATCOMC__
E time_t FDECL(time, (time_t *));
@@ -518,6 +521,7 @@ 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> */

23
games/slash/patches/patch-ac → games/slash/patches/patch-include_unixconf_h
View File

@ -1,6 +1,7 @@
--- include/unixconf.h.org Fri Jul 24 22:46:52 1998
+++ include/unixconf.h Fri Jul 24 22:48:14 1998
@@ -19,7 +19,11 @@
$OpenBSD: patch-include_unixconf_h,v 1.1 2000/04/16 21:19:07 espie Exp $
--- include/unixconf.h.orig Tue Dec 10 21:20:08 1996
+++ include/unixconf.h Fri Apr 14 15:15:02 2000
@@ -19,12 +19,16 @@
*/
/* define exactly one of the following four choices */
@ -13,6 +14,12 @@
/* 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 */
/* "ULTRIX" not to be confused with "ultrix" */
-/* #define SYSV /* define for System V */
+#define SYSV /* define for System V */
/* #define HPUX /* Hewlett-Packard's Unix, version 6.5 or higher */
/* use SYSV for < v6.5 */
@@ -33,7 +37,7 @@
/* #define SVR4 /* use in addition to SYSV for System V Release 4 */
#define NETWORK /* if running on a networked system */
@ -22,11 +29,13 @@
/* #define LINUX /* Another Unix clone */
/* #define GENIX /* Yet Another Unix Clone */
/* #define HISX /* Bull Unix for XPS Machines */
@@ -42,12 +46,12 @@
@@ -42,12 +46,14 @@
/* #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 TERMLIB
+#define TERMINFO
+#define TEXTCOLOR /* Use System V r3.2 terminfo color support */
/* and/or ANSI color support on termcap systems */
/* and/or X11 color */
@ -38,7 +47,7 @@
/* 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 @@
@@ -114,7 +120,7 @@
* "extra output" method is used, but not all systems provide access to
* a fine-grained timer.
*/
@ -47,7 +56,7 @@
#endif
/*
@@ -125,7 +129,7 @@
@@ -125,7 +131,7 @@
* A stat system call is done on the mailbox every MAILCKFREQ moves.
*/
@ -56,7 +65,7 @@
/* 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 @@
@@ -286,7 +292,7 @@
#endif
#ifdef TIMED_DELAY

9
games/slash/patches/patch-ai → games/slash/patches/patch-sys_unix_Makefile_dat
View File

@ -1,6 +1,7 @@
--- sys/unix/Makefile.dat.orig Sat Jul 25 00:31:54 1998
+++ sys/unix/Makefile.dat Sat Jul 25 00:30:12 1998
@@ -52,7 +52,7 @@
$OpenBSD: patch-sys_unix_Makefile_dat,v 1.1 2000/04/16 21:19:07 espie Exp $
--- sys/unix/Makefile.dat.orig Fri Apr 14 15:10:48 2000
+++ sys/unix/Makefile.dat Fri Apr 14 15:10:49 2000
@@ -52,7 +52,7 @@ spec_levs: ../util/lev_comp \
beholder.des caves.des darkelf.des dragons.des giants.des guild.des \
kobold-1.des kobold-2.des lich.des mall-1.des mall-2.des mineend.des \
minefill.des mtemple.des newmall.des nymph.des rats.des sea.des \
@ -9,7 +10,7 @@
../util/lev_comp bigroom.des
../util/lev_comp castle.des
../util/lev_comp endgame.des
@@ -86,6 +86,7 @@
@@ -86,6 +86,7 @@ spec_levs: ../util/lev_comp \
../util/lev_comp stor-2.des
../util/lev_comp stor-3.des
../util/lev_comp tomb.des

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

@ -1,6 +1,7 @@
--- sys/unix/Makefile.doc.org Fri Jul 24 22:52:05 1998
+++ sys/unix/Makefile.doc Fri Jul 24 22:52:27 1998
@@ -30,16 +30,16 @@
$OpenBSD: patch-sys_unix_Makefile_doc,v 1.1 2000/04/16 21:19:07 espie Exp $
--- sys/unix/Makefile.doc.orig Tue Dec 10 21:20:08 1996
+++ sys/unix/Makefile.doc Fri Apr 14 15:10:49 2000
@@ -30,16 +30,16 @@ Guidebook.dvi: Guidebook.tex
latex Guidebook.tex

34
games/slash/patches/patch-af → games/slash/patches/patch-sys_unix_Makefile_src
View File

@ -1,28 +1,36 @@
$OpenBSD: patch-sys_unix_Makefile_src,v 1.1 2000/04/16 21:19:07 espie Exp $
--- sys/unix/Makefile.src.orig Tue Dec 10 21:20:09 1996
+++ sys/unix/Makefile.src Sat Jul 25 00:30:05 1998
@@ -124,8 +124,8 @@
+++ sys/unix/Makefile.src Fri Apr 14 15:10:49 2000
@@ -1,6 +1,7 @@
# NetHack Makefile.
# SCCS Id: @(#)Makefile.src 3.2 96/10/26
+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
@@ -124,9 +125,7 @@ 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 -I${X11BASE}/include
+LFLAGS = -L${X11BASE}/lib
-
+CFLAGS += -DHACKDIR=\"${NHDIR}\" -DHAVE_SYS_PARAM_H -I../include
# Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired
@@ -146,8 +146,8 @@
# combination of windowing systems. Also set windowing systems in config.h.
@@ -146,9 +145,6 @@ WINX11OBJ = Window.o dialogs.o winX.o wi
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 @@
# Sysatt uses shared library in lieu of this option
@@ -167,14 +163,12 @@ WINTTYLIB = -ltermlib
#
# libraries for X11
# If USE_XPM is defined in config.h, you will also need -lXpm here.
@ -34,11 +42,11 @@
#
#
-WINLIB = $(WINTTYLIB)
+WINLIB = $(WINTTYLIB) ${WINX11LIB}
-
# any other strange libraries your system needs (for Sysunix only -- the more
# specialized targets should already be right)
@@ -199,8 +199,8 @@
#
@@ -199,8 +193,8 @@ WINLIB = $(WINTTYLIB)
#
LIBS =

42
games/slash/patches/patch-ad → games/slash/patches/patch-sys_unix_Makefile_top
View File

@ -1,15 +1,19 @@
--- sys/unix/Makefile.top.org Fri Jul 24 22:49:09 1998
+++ sys/unix/Makefile.top Fri Jul 24 22:51:20 1998
@@ -13,17 +13,17 @@
$OpenBSD: patch-sys_unix_Makefile_top,v 1.1 2000/04/16 21:19:07 espie Exp $
--- sys/unix/Makefile.top.orig Fri Apr 14 15:10:48 2000
+++ sys/unix/Makefile.top Fri Apr 14 15:10:49 2000
@@ -13,17 +13,19 @@
# execute things like 'data' and 'rumors')
# MAKE = make
-# make NetHack
-GAME = nethack
-GAMEUID = games
-GAMEGRP = bin
+include ${NETHACKCONFIG}
+
+# this is slash
+GAME = slash
GAMEUID = games
-GAMEGRP = bin
+GAMEUID = bin
+GAMEGRP = games
# Permissions - some places use setgid instead of setuid, for instance
@ -24,31 +28,37 @@
# GAMEDIR also appears in config.h as "HACKDIR".
#
@@ -32,13 +32,13 @@
@@ -32,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 = ${PREFIX}/lib/$(GAME)dir
+SHELLDIR = ${PREFIX}/bin
+REALGAMEDIR = ${PREFIX}/lib/$(GAME)dir
+GAMEDIR = ${DESTDIR}${REALGAMEDIR}
+SHELLDIR = ${DESTDIR}${PREFIX}/bin
# per discussion in Install.X11
-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)
@@ -63,7 +63,8 @@
@@ -63,7 +66,7 @@ DATHELP = help hh cmdhelp history opthel
SPEC_LEVS = *.lev
-SPEC_LEVS = asmodeus.lev baalz.lev beholder.lev bigrm-?.lev castle.lev \
+SPEC_LEVS = asmodeus.lev baalz.lev blkmar.lev \
+ beholder.lev bigrm-?.lev castle.lev \
+SPEC_LEVS = asmodeus.lev baalz.lev beholder.lev bigrm-?.lev blkmar.lev castle.lev \
cav2fill.lev cavefill.lev demogorg.lev dispater.lev dragons.lev \
fakewiz?.lev geryon.lev guild.lev juiblex.lev knox.lev kobold-?.lev \
lich.lev mall-?.lev mall.lev medusa-?.lev mine_end.lev minefill.lev \
@@ -143,7 +146,7 @@ dofiles:
$(MAKE) dofiles-$${target-nodlb}
cp src/$(GAME) $(GAMEDIR)
-rm -f $(SHELLDIR)/$(GAME)
- sed -e 's;/usr/games/lib/nethackdir;$(GAMEDIR);' \
+ sed -e 's;/usr/games/lib/nethackdir;$(REALGAMEDIR);' \
-e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \
< sys/unix/nethack.sh \
> $(SHELLDIR)/$(GAME)

22
games/slash/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 21:19:08 espie Exp $
--- sys/unix/Makefile.utl.orig Tue Dec 10 21:20:11 1996
+++ sys/unix/Makefile.utl Fri Apr 14 15:10:49 2000
@@ -1,6 +1,7 @@
# Makefile for NetHack's utility programs.
# SCCS Id: @(#)Makefile.utl 3.2 96/05/09
+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
@@ -78,9 +79,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/slash/patches/patch-ah → games/slash/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 21:19:08 espie Exp $
--- sys/unix/unixunix.c.orig Tue Jun 18 00:34:55 1996
+++ sys/unix/unixunix.c Fri Apr 14 15:10:49 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.
*/

7
games/slash/patches/patch-aj → games/slash/patches/patch-win_X11_winX_c
View File

@ -1,6 +1,7 @@
--- win/X11/winX.c.orig Sat Jul 25 00:36:46 1998
+++ win/X11/winX.c Sat Jul 25 00:37:01 1998
@@ -921,7 +921,7 @@
$OpenBSD: patch-win_X11_winX_c,v 1.1 2000/04/16 21:19:08 espie Exp $
--- win/X11/winX.c.orig Tue Jun 18 00:35:23 1996
+++ win/X11/winX.c Fri Apr 14 15:10:49 2000
@@ -921,7 +921,7 @@ char** argv;
XtSetArg(args[num_args], XtNallowShellResize, True); num_args++;
toplevel = XtAppInitialize(
&app_context,

14
games/slash/patches/patch-win_tty_termcap_c Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-win_tty_termcap_c,v 1.1 2000/04/16 21:19:08 espie Exp $
--- win/tty/termcap.c.orig Fri Apr 14 15:15:20 2000
+++ win/tty/termcap.c Fri Apr 14 15:19:54 2000
@@ -827,7 +827,9 @@ init_hilite()
hilites[c] = HI;
hilites[CLR_GRAY] = hilites[NO_COLOR] = (char *)0;
- if (tgetnum("Co") < 8 || (setf = tgetstr("Sf", (char **)0)) == (char *)0)
+ if (tgetnum("Co") < 8
+ || ((setf = tgetstr("Sf", (char **)0)) == (char *)0
+ && (setf = tgetstr("AF", (char **)0)) == (char *)0))
return;
for (c = 0; c < CLR_MAX / 2; c++) {

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

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

36
games/slash/pkg/PLIST → games/slash/pkg/PLIST.sed
View File

@ -1,10 +1,8 @@
@comment $OpenBSD: PLIST.sed,v 1.1 2000/04/16 21:19:09 espie Exp $
@group games
bin/slash
man/man6/dgn_comp.6
man/man6/dlb.6
man/man6/lev_comp.6
man/man6/slash.6
man/man6/recover.6
bin/srecover
%%x11%%
lib/slashdir/A-filla.lev
lib/slashdir/A-fillb.lev
lib/slashdir/A-goal.lev
@ -161,10 +159,8 @@ lib/slashdir/options
lib/slashdir/oracle.lev
lib/slashdir/oracles
lib/slashdir/orcus.lev
lib/slashdir/pet_mark.xbm
lib/slashdir/quest.dat
lib/slashdir/rats.lev
lib/slashdir/rip.xpm
lib/slashdir/rumors
lib/slashdir/sanctum.lev
lib/slashdir/sea.lev
@ -182,24 +178,16 @@ lib/slashdir/wizard1.lev
lib/slashdir/wizard2.lev
lib/slashdir/wizard3.lev
lib/slashdir/wizhelp
lib/slashdir/x11tiles
lib/slashdir/yeenoghu.lev
lib/X11/app-defaults/Slash
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/slashdir/logfile
lib/slashdir/record
lib/slashdir/perm
@exec chmod 775 %D/lib/slashdir
man/man6/srecover.6
man/man6/slash.6
@mode 2555
lib/slashdir/slash
@exec mkdir %D/lib/slashdir/save
@exec chown games:games %D/lib/slashdir/save
@exec chmod -R 575 %D/lib/slashdir/save
@unexec rm %D/lib/slashdir/record
@unexec rm %D/lib/slashdir/logfile
@unexec rm -rf %D/lib/slashdir/save
@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/slashdir