diff options
| author | pooka <pooka@pkgsrc.org> | 1999-12-24 22:29:58 +0000 |
|---|---|---|
| committer | pooka <pooka@pkgsrc.org> | 1999-12-24 22:29:58 +0000 |
| commit | c3b8ad7ebcd63465936cc29d74a1b1bad873f2ad (patch) | |
| tree | ff3d7ba097bd9ecf05d8fa4fcc4f0fed8582c8f2 | |
| parent | f7c7e1c7ff8ea3b7e389b455124c4d8d00ec43bb (diff) | |
| download | pkgsrc-c3b8ad7ebcd63465936cc29d74a1b1bad873f2ad.tar.gz | |
Update the Nethack package to 3.3.0. nethack-qt will be non-functional
until we get qt2.0 or greater into pkgsrc.
27 files changed, 523 insertions, 400 deletions
diff --git a/games/nethack-lib/Makefile b/games/nethack-lib/Makefile index 5da866755ad..7b5dba0e3c9 100644 --- a/games/nethack-lib/Makefile +++ b/games/nethack-lib/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.3 1998/11/12 23:34:31 frueauf Exp $ +# $NetBSD: Makefile,v 1.4 1999/12/24 22:29:59 pooka Exp $ # -DISTNAME= nethack-3.2.2 -PKGNAME= nethack-lib-3.2.2 +DISTNAME= nethack-3.3.0 +PKGNAME= nethack-lib-3.3.0 CATEGORIES= games -MASTER_SITES= http://pinky.wtower.com/nethack/sources/ +MASTER_SITES= ftp://ftp.win.tue.nl/pub/games/nethack.330/source/ MAINTAINER= root@garbled.net HOMEPAGE= http://www.win.tue.nl/games/roguelike/nethack/ @@ -14,9 +14,12 @@ CONFIGURE_SCRIPT= sys/unix/setup.sh ALL_TARGET= datastuff INSTALL_TARGET= manpages install-dat +pre-configure: + @${CHMOD} 755 ${WRKSRC}/sys/unix/setup.sh + post-patch: @${MV} ${WRKSRC}/include/config.h ${WRKSRC}/foo - @${SED} -e 's@XXXLOCALBASEXXX@${LOCALBASE}@g' <${WRKSRC}/foo> ${WRKSRC}/include/config.h + @${SED} -e 's@XXXPREFIXXXX@${PREFIX}@g' <${WRKSRC}/foo> ${WRKSRC}/include/config.h @${RM} -f ${WRKSRC}/foo .include "../../mk/bsd.pkg.mk" diff --git a/games/nethack-lib/files/md5 b/games/nethack-lib/files/md5 index ca4aaf9429d..b71189bc32a 100644 --- a/games/nethack-lib/files/md5 +++ b/games/nethack-lib/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.2 1998/08/28 13:04:37 garbled Exp $ +$NetBSD: md5,v 1.3 1999/12/24 22:30:00 pooka Exp $ -MD5 (nethack-3.2.2.tar.gz) = c85de4d14453b3a2d182d1dfc2ca04df +MD5 (nethack-3.3.0.tar.gz) = cf9f4039408321f39c3ef733455cb73a diff --git a/games/nethack-lib/files/patch-sum b/games/nethack-lib/files/patch-sum index 6abd6940cba..94cde078c63 100644 --- a/games/nethack-lib/files/patch-sum +++ b/games/nethack-lib/files/patch-sum @@ -1,7 +1,9 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:58 agc Exp $ +$NetBSD: patch-sum,v 1.2 1999/12/24 22:30:00 pooka Exp $ -MD5 (patch-aa) = 12bb422b2f85120950d8973bdd5bfbe6 -MD5 (patch-ab) = be16583bf6e540e266106885143d9ce6 -MD5 (patch-ac) = 86ede1504426a3b6b5de815dd9782849 -MD5 (patch-ad) = 550b27fc2a426612cfb92fec64366808 -MD5 (patch-ae) = 5407e5dc2cb0d8b325e8b7bf779e49f7 +MD5 (patch-aa) = ab2e40a9c222d914cc0ca9ecfda1cd88 +MD5 (patch-ab) = 21f70d969186fda8328f8f4a2300cebf +MD5 (patch-ac) = 4f89ee35a5901b7b8a8e376216c227ba +MD5 (patch-ad) = 1c894f6943c2b5edfcca5e36a6f43c4d +MD5 (patch-ae) = 0461964e1047cb98a734dfbe257e8325 +MD5 (patch-af) = ea67bbcb60a39b8fe0c7994b55d951e2 +MD5 (patch-ag) = 2498d677fef1a69f0c4ee79ab7d43f9b diff --git a/games/nethack-lib/patches/patch-aa b/games/nethack-lib/patches/patch-aa index 89e8b1030ef..28d3c770759 100644 --- a/games/nethack-lib/patches/patch-aa +++ b/games/nethack-lib/patches/patch-aa @@ -1,31 +1,47 @@ -$NetBSD: patch-aa,v 1.1 1998/08/27 12:58:51 garbled Exp $ ---- include/config.h.orig Sat Aug 8 06:06:46 1998 -+++ include/config.h Sat Aug 8 06:08:27 1998 -@@ -298,8 +298,8 @@ - /* 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 */ +$NetBSD: patch-aa,v 1.2 1999/12/24 22:30:00 pooka Exp $ + +--- include/config.h.orig Sat Dec 11 07:20:49 1999 ++++ include/config.h Fri Dec 17 13:51:24 1999 +@@ -133,11 +133,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 */ +-/* #define COMPRESS "/usr/local/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 */ #endif -@@ -333,3 +333,3 @@ + + #ifndef COMPRESS +@@ -168,7 +168,7 @@ + * otherwise it will be the current directory. + */ # ifndef HACKDIR -# define HACKDIR "/usr/games/lib/nethackdir" /* nethack directory */ -+# define HACKDIR "XXXLOCALBASEXXX/share/nethackdir" /* nethack directory */ ++# define HACKDIR "XXXPREFIXXXX/share/nethackdir" /* nethack directory */ # endif -@@ -429,3 +429,3 @@ --/*#define VISION_TABLES /* use vision tables generated at compile time */ -+#define VISION_TABLES /* use vision tables generated at compile time */ + /* +@@ -264,7 +264,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 -@@ -467,3 +467,3 @@ + # ifndef NO_MACRO_CPATH + # define MACRO_CPATH /* use clear_path macros instead of functions */ +@@ -302,7 +302,7 @@ + #endif + #define EXP_ON_BOTL /* Show experience on bottom line */ --/* #define SCORE_ON_BOTL /* added by Gary Erickson (erickson@ucivax) */ -+#define SCORE_ON_BOTL /* added by Gary Erickson (erickson@ucivax) */ +-/* #define SCORE_ON_BOTL */ /* added by Gary Erickson (erickson@ucivax) */ ++#define SCORE_ON_BOTL /* added by Gary Erickson (erickson@ucivax) */ + + #include "global.h" /* Define everything else according to choices above */ diff --git a/games/nethack-lib/patches/patch-ab b/games/nethack-lib/patches/patch-ab index 09a1317ff79..b93e7376145 100644 --- a/games/nethack-lib/patches/patch-ab +++ b/games/nethack-lib/patches/patch-ab @@ -1,14 +1,19 @@ -$NetBSD: patch-ab,v 1.1 1998/08/27 12:58:51 garbled Exp $ ---- sys/unix/Makefile.top.orig Tue Dec 10 13:20:10 1996 -+++ sys/unix/Makefile.top Sat Aug 8 06:10:41 1998 -@@ -17,4 +17,4 @@ +$NetBSD: patch-ab,v 1.2 1999/12/24 22:30:00 pooka Exp $ + +--- sys/unix/Makefile.top.orig Sat Dec 11 07:21:05 1999 ++++ sys/unix/Makefile.top Wed Dec 22 20:18:19 1999 +@@ -14,17 +14,16 @@ + # MAKE = make + + # make NetHack +-PREFIX = /usr GAME = nethack -GAMEUID = games -GAMEGRP = bin -+GAMEUID = bin ++GAMEUID = root +GAMEGRP = games -@@ -22,6 +22,6 @@ + # Permissions - some places use setgid instead of setuid, for instance # See also the option "SECURE" in include/config.h -GAMEPERM = 04755 -FILEPERM = 0644 @@ -18,19 +23,28 @@ $NetBSD: patch-ab,v 1.1 1998/08/27 12:58:51 garbled Exp $ -DIRPERM = 0755 +DIRPERM = 0775 -@@ -34,4 +34,4 @@ + # GAMEDIR also appears in config.h as "HACKDIR". + # +@@ -33,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 = $(LOCALBASE)/share/$(GAME)dir -+SHELLDIR = $(LOCALBASE)/bin +-GAMEDIR = $(PREFIX)/games/lib/$(GAME)dir +-SHELLDIR = $(PREFIX)/games ++GAMEDIR = $(PREFIX)/share/$(GAME)dir ++SHELLDIR = $(PREFIX)/bin -@@ -40,3 +40,3 @@ + # per discussion in Install.X11 and Install.Qt + VARDATND = # VARDATND = x11tiles pet_mark.xbm -# VARDATND = x11tiles pet_mark.xbm rip.xpm +VARDATND = x11tiles pet_mark.xbm rip.xpm -@@ -76,5 +76,8 @@ + VARDATD = data oracles options quest.dat rumors + VARDAT = $(VARDATD) $(VARDATND) +@@ -76,9 +75,12 @@ + $(GAME): + ( cd src ; $(MAKE) ) -all: $(GAME) Guidebook $(VARDAT) dungeon spec_levs check-dlb +all: $(GAME) datastuff @@ -40,37 +54,58 @@ $NetBSD: patch-ab,v 1.1 1998/08/27 12:58:51 garbled Exp $ + @echo "Data Sets Built" + Guidebook: -@@ -128,2 +131,7 @@ + ( cd doc ; $(MAKE) Guidebook ) + +@@ -128,7 +130,12 @@ + ( cd util ; $(MAKE) dlb ) + ( cd dat ; ../util/dlb cf nhdat $(DATDLB) ) +- +binfiles: $(GAME) + cp src/$(GAME) $(SHELLDIR)/$(GAME)$(GTYPE) + -( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME)$(GTYPE) ; \ -+ $(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME)$(GTYPE) ) ++ $(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME)$(GTYPE) ) + chmod $(GAMEPERM) $(SHELLDIR)/$(GAME)$(GTYPE) - -@@ -137,3 +145,2 @@ ++ + dofiles: + target=`sed -n \ + -e '/librarian/{' \ +@@ -137,16 +144,13 @@ + -e '}' \ + -e '$$s/.*/nodlb/p' < dat/options` ; \ $(MAKE) dofiles-$${target-nodlb} - cp src/$(GAME) $(GAMEDIR) -rm -f $(SHELLDIR)/$(GAME) -@@ -141,2 +148,3 @@ + sed -e 's;/usr/games/lib/nethackdir;$(GAMEDIR);' \ -e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \ -+ -e 's;XXXPREFIXXXX;$(LOCALBASE);' \ ++ -e 's;XXXPREFIXXXX;$(PREFIX);' \ < sys/unix/nethack.sh \ -@@ -144,5 +152,2 @@ + > $(SHELLDIR)/$(GAME) # set up their permissions - -( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(GAME) ; \ - $(CHGRP) $(GAMEGRP) $(GAME) ) - chmod $(GAMEPERM) $(GAMEDIR)/$(GAME) -$(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME) -@@ -182,3 +187,3 @@ + $(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME) + chmod $(EXEPERM) $(SHELLDIR)/$(GAME) +@@ -182,7 +186,7 @@ + # and a reminder + @echo You may also want to install the man pages via the doc Makefile. -install: $(GAME) $(VARDAT) dungeon spec_levs +install-dat: $(VARDAT) dungeon spec_levs # set up the directories -@@ -197,2 +202,6 @@ + -mkdir $(SHELLDIR) + -rm -rf $(GAMEDIR) +@@ -197,6 +201,11 @@ + -( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) perm record logfile ; \ + $(CHGRP) $(GAMEGRP) perm record logfile ; \ chmod $(FILEPERM) perm record logfile ) -+ -mkdir -p $(LOCALBASE)/share/doc/nethack -+ cp doc/Guidebook $(LOCALBASE)/share/doc/nethack -+ chown $(GAMEUID):$(GAMEGRP) $(LOCALBASE)/share/doc/nethack/Guidebook -+ chmod $(FILEPERM) $(LOCALBASE)/share/doc/nethack/Guidebook ++ -mkdir -p $(PREFIX)/share/doc/nethack ++ cp doc/Guidebook $(PREFIX)/share/doc/nethack ++ chown $(GAMEUID):$(GAMEGRP) $(PREFIX)/share/doc/nethack/Guidebook ++ chmod $(FILEPERM) $(PREFIX)/share/doc/nethack/Guidebook ++ # and a reminder + @echo You may also want to reinstall the man pages via the doc Makefile. + diff --git a/games/nethack-lib/patches/patch-ac b/games/nethack-lib/patches/patch-ac index 9ad08fde339..cff66dccea1 100644 --- a/games/nethack-lib/patches/patch-ac +++ b/games/nethack-lib/patches/patch-ac @@ -1,26 +1,49 @@ -$NetBSD: patch-ac,v 1.1 1998/08/27 12:58:51 garbled Exp $ ---- include/system.h.rorig Sun Aug 9 05:31:34 1998 -+++ include/system.h Sun Aug 9 05:31:40 1998 -@@ -82,3 +82,3 @@ +$NetBSD: patch-ac,v 1.2 1999/12/24 22:30:00 pooka Exp $ + +--- include/system.h.orig Sat Dec 11 07:20:51 1999 ++++ include/system.h Thu Dec 23 22:12:04 1999 +@@ -77,10 +77,10 @@ + # if !defined(__SC__) && !defined(LINUX) + E long NDECL(random); + # endif +-# if !defined(SUNOS4) || defined(RANDOM) ++# if (!defined(SUNOS4) && !defined(__NetBSD__)) || defined(RANDOM) + E void FDECL(srandom, (unsigned int)); # else -# ifndef bsdi +# if !defined(bsdi) && !defined(__NetBSD__) E int FDECL(srandom, (unsigned int)); -@@ -132,3 +132,3 @@ + # endif + # endif +@@ -130,7 +130,7 @@ + E void FDECL(qsort, (genericptr_t,size_t,size_t, + int(*)(const genericptr,const genericptr))); #else -# if defined(BSD) || defined(ULTRIX) +# if (defined(BSD) || defined(ULTRIX)) && !defined(__NetBSD__) E int qsort(); -@@ -398,3 +398,3 @@ + # else + # if !defined(LATTICE) && !defined(AZTEC_50) +@@ -413,7 +413,7 @@ + # ifdef HPUX + E unsigned int FDECL(strlen, (char *)); # else -# if !(defined(ULTRIX_PROTO) && defined(__GNUC__)) +# if !(defined(ULTRIX_PROTO) && defined(__GNUC__)) && !defined(__NetBSD__) E int FDECL(strlen, (const char *)); -@@ -509,2 +509,3 @@ + # endif + # endif /* HPUX */ +@@ -513,11 +513,13 @@ + # endif + # endif +#ifndef __NetBSD__ - # if defined(ULTRIX) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) -@@ -514,2 +515,3 @@ + # 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> */ diff --git a/games/nethack-lib/patches/patch-ad b/games/nethack-lib/patches/patch-ad index 52bf7356e7f..bb524d75ca7 100644 --- a/games/nethack-lib/patches/patch-ad +++ b/games/nethack-lib/patches/patch-ad @@ -1,17 +1,22 @@ -$NetBSD: patch-ad,v 1.1 1998/08/27 12:58:52 garbled Exp $ ---- sys/unix/nethack.sh.orig Tue Sep 12 13:01:39 1995 -+++ sys/unix/nethack.sh Sat Aug 8 03:43:07 1998 -@@ -3,4 +3,11 @@ +$NetBSD: patch-ad,v 1.2 1999/12/24 22:30:00 pooka Exp $ + +--- sys/unix/nethack.sh.orig Sat Dec 11 07:21:05 1999 ++++ sys/unix/nethack.sh Fri Dec 17 14:14:54 1999 +@@ -1,9 +1,15 @@ + #!/bin/sh + # SCCS Id: @(#)nethack.sh 3.3 90/02/26 -HACKDIR=/usr/games/lib/nethackdir --HACK=$HACKDIR/nethack +if [ "$1" = "" ]; then -+ TTY=tty ++ TTY=tty +else -+ TTY=$1 ++ TTY=$1 +fi + +HACKDIR=XXXPREFIXXXX/share/nethackdir -+export HACKDIR + export HACKDIR +-HACK=$HACKDIR/nethack +HACK=XXXPREFIXXXX/bin/nethack-$TTY MAXNROFPLAYERS=4 + + # see if we can find the full path name of PAGER, so help files work properly diff --git a/games/nethack-lib/patches/patch-ae b/games/nethack-lib/patches/patch-ae index 41d95575af8..0dee1364566 100644 --- a/games/nethack-lib/patches/patch-ae +++ b/games/nethack-lib/patches/patch-ae @@ -1,8 +1,13 @@ -$NetBSD: patch-ae,v 1.1 1998/08/27 12:58:52 garbled Exp $ ---- sys/unix/Makefile.doc.orig Sat Aug 8 00:35:44 1998 -+++ sys/unix/Makefile.doc Sat Aug 8 00:36:41 1998 -@@ -33,3 +33,3 @@ +$NetBSD: patch-ae,v 1.2 1999/12/24 22:30:01 pooka Exp $ + +--- sys/unix/Makefile.doc.orig Sat Dec 11 07:21:05 1999 ++++ sys/unix/Makefile.doc Fri Dec 17 14:23:28 1999 +@@ -31,7 +31,7 @@ + + GAME = nethack -MANDIR = /usr/man/man6 -+MANDIR = $(LOCALBASE)/man/man6 ++MANDIR = $(PREFIX)/man/man6 MANEXT = 6 + + # manual installation for most BSD-style systems diff --git a/games/nethack-lib/patches/patch-af b/games/nethack-lib/patches/patch-af new file mode 100644 index 00000000000..6503c9850a8 --- /dev/null +++ b/games/nethack-lib/patches/patch-af @@ -0,0 +1,80 @@ +$NetBSD: patch-af,v 1.1 1999/12/24 22:30:01 pooka Exp $ + +--- include/unixconf.h.orig Sat Dec 11 07:20:51 1999 ++++ include/unixconf.h Thu Dec 23 22:14:04 1999 +@@ -19,20 +19,20 @@ + */ + + /* define exactly one of the following four choices */ +-/* #define BSD 1 */ /* define for 4.n BSD */ ++#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) */ + /* 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 */ + + + /* 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,7 +45,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 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 +@@ -160,11 +160,15 @@ + + #ifdef MAIL + # if defined(BSD) || defined(ULTRIX) ++# ifdef __NetBSD__ ++#define DEF_MAILREADER "/usr/bin/mail" ++# else + # ifdef AMS + #define AMS_MAILBOX "/Mailbox" + # else + #define DEF_MAILREADER "/usr/ucb/Mail" +-# endif ++# endif ++# endif + #else + # if defined(SYSV) || defined(DGUX) || defined(HPUX) + # ifdef M_XENIX +@@ -185,7 +189,6 @@ + #endif /* MAIL */ + + +- + #ifdef COMPRESS + /* Some implementations of compress need a 'quiet' option. + * If you've got one of these versions, put -q here. +@@ -211,7 +214,7 @@ + # endif + #endif /* _AUX_SOURCE */ + +-#if defined(LINUX) || defined(bsdi) ++#if defined(LINUX) || defined(bsdi) || defined(__NetBSD__) + # ifndef POSIX_TYPES + # define POSIX_TYPES + # endif +@@ -272,7 +275,7 @@ + #endif + + #if defined(BSD) || defined(ULTRIX) +-# if !defined(DGUX) && !defined(SUNOS4) ++# if !defined(DGUX) && !defined(SUNOS4) && !defined(__NetBSD__) + #define memcpy(d, s, n) bcopy(s, d, n) + #define memcmp(s1, s2, n) bcmp(s2, s1, n) + # endif diff --git a/games/nethack-lib/patches/patch-ag b/games/nethack-lib/patches/patch-ag new file mode 100644 index 00000000000..3f43f068738 --- /dev/null +++ b/games/nethack-lib/patches/patch-ag @@ -0,0 +1,21 @@ +$NetBSD: patch-ag,v 1.1 1999/12/24 22:30:01 pooka Exp $ + +--- src/mail.c.orig Sat Dec 11 07:20:54 1999 ++++ src/mail.c Thu Dec 23 22:27:40 1999 +@@ -71,12 +71,16 @@ + # ifdef LINUX + # define MAILPATH "/var/spool/mail" + # else ++# ifdef __NetBSD__ ++# define MAILPATH "/var/mail/" ++# else + # if defined(BSD) || defined(ULTRIX) + # define MAILPATH "/usr/spool/mail/" + # endif + # if defined(SYSV) || defined(HPUX) + # define MAILPATH "/usr/mail/" + # endif ++# endif + # endif /* LINUX */ + # endif /* AMS */ + diff --git a/games/nethack-lib/pkg/PLIST b/games/nethack-lib/pkg/PLIST index fd561405624..288232e7a69 100644 --- a/games/nethack-lib/pkg/PLIST +++ b/games/nethack-lib/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 1998/08/27 12:58:52 garbled Exp $ +@comment $NetBSD: PLIST,v 1.2 1999/12/24 22:30:01 pooka Exp $ bin/nethack man/man6/nethack.6 man/man6/lev_comp.6 @@ -13,66 +13,6 @@ share/nethackdir/quest.dat share/nethackdir/options share/nethackdir/oracles share/nethackdir/data -share/nethackdir/W-start.lev -share/nethackdir/V-start.lev -share/nethackdir/T-start.lev -share/nethackdir/S-start.lev -share/nethackdir/R-start.lev -share/nethackdir/P-start.lev -share/nethackdir/K-start.lev -share/nethackdir/H-start.lev -share/nethackdir/E-start.lev -share/nethackdir/C-start.lev -share/nethackdir/B-start.lev -share/nethackdir/A-start.lev -share/nethackdir/W-locate.lev -share/nethackdir/V-locate.lev -share/nethackdir/T-locate.lev -share/nethackdir/S-locate.lev -share/nethackdir/R-locate.lev -share/nethackdir/P-locate.lev -share/nethackdir/K-locate.lev -share/nethackdir/H-locate.lev -share/nethackdir/E-locate.lev -share/nethackdir/C-locate.lev -share/nethackdir/B-locate.lev -share/nethackdir/A-locate.lev -share/nethackdir/W-fillb.lev -share/nethackdir/W-filla.lev -share/nethackdir/V-fillb.lev -share/nethackdir/V-filla.lev -share/nethackdir/T-fillb.lev -share/nethackdir/T-filla.lev -share/nethackdir/S-fillb.lev -share/nethackdir/S-filla.lev -share/nethackdir/R-fillb.lev -share/nethackdir/R-filla.lev -share/nethackdir/P-fillb.lev -share/nethackdir/P-filla.lev -share/nethackdir/K-fillb.lev -share/nethackdir/K-filla.lev -share/nethackdir/H-fillb.lev -share/nethackdir/H-filla.lev -share/nethackdir/E-fillb.lev -share/nethackdir/E-filla.lev -share/nethackdir/C-fillb.lev -share/nethackdir/C-filla.lev -share/nethackdir/B-fillb.lev -share/nethackdir/B-filla.lev -share/nethackdir/A-fillb.lev -share/nethackdir/A-filla.lev -share/nethackdir/W-goal.lev -share/nethackdir/V-goal.lev -share/nethackdir/T-goal.lev -share/nethackdir/S-goal.lev -share/nethackdir/R-goal.lev -share/nethackdir/P-goal.lev -share/nethackdir/K-goal.lev -share/nethackdir/H-goal.lev -share/nethackdir/E-goal.lev -share/nethackdir/C-goal.lev -share/nethackdir/B-goal.lev -share/nethackdir/A-goal.lev share/nethackdir/water.lev share/nethackdir/fire.lev share/nethackdir/earth.lev @@ -109,6 +49,79 @@ share/nethackdir/bigrm-2.lev share/nethackdir/bigrm-1.lev share/nethackdir/baalz.lev share/nethackdir/asmodeus.lev +share/nethackdir/Arc-fila.lev +share/nethackdir/Arc-filb.lev +share/nethackdir/Arc-goal.lev +share/nethackdir/Arc-loca.lev +share/nethackdir/Arc-strt.lev +share/nethackdir/Bar-fila.lev +share/nethackdir/Bar-filb.lev +share/nethackdir/Bar-goal.lev +share/nethackdir/Bar-loca.lev +share/nethackdir/Bar-strt.lev +share/nethackdir/Cav-fila.lev +share/nethackdir/Cav-filb.lev +share/nethackdir/Cav-goal.lev +share/nethackdir/Cav-loca.lev +share/nethackdir/Cav-strt.lev +share/nethackdir/Hea-fila.lev +share/nethackdir/Hea-filb.lev +share/nethackdir/Hea-goal.lev +share/nethackdir/Hea-loca.lev +share/nethackdir/Hea-strt.lev +share/nethackdir/Kni-fila.lev +share/nethackdir/Kni-filb.lev +share/nethackdir/Kni-goal.lev +share/nethackdir/Kni-loca.lev +share/nethackdir/Kni-strt.lev +share/nethackdir/Mon-fila.lev +share/nethackdir/Mon-filb.lev +share/nethackdir/Mon-goal.lev +share/nethackdir/Mon-loca.lev +share/nethackdir/Mon-strt.lev +share/nethackdir/Pri-fila.lev +share/nethackdir/Pri-filb.lev +share/nethackdir/Pri-goal.lev +share/nethackdir/Pri-loca.lev +share/nethackdir/Pri-strt.lev +share/nethackdir/Ran-fila.lev +share/nethackdir/Ran-filb.lev +share/nethackdir/Ran-goal.lev +share/nethackdir/Ran-loca.lev +share/nethackdir/Ran-strt.lev +share/nethackdir/Rog-fila.lev +share/nethackdir/Rog-filb.lev +share/nethackdir/Rog-goal.lev +share/nethackdir/Rog-loca.lev +share/nethackdir/Rog-strt.lev +share/nethackdir/Sam-fila.lev +share/nethackdir/Sam-filb.lev +share/nethackdir/Sam-goal.lev +share/nethackdir/Sam-loca.lev +share/nethackdir/Sam-strt.lev +share/nethackdir/Tou-fila.lev +share/nethackdir/Tou-filb.lev +share/nethackdir/Tou-goal.lev +share/nethackdir/Tou-loca.lev +share/nethackdir/Tou-strt.lev +share/nethackdir/Val-fila.lev +share/nethackdir/Val-filb.lev +share/nethackdir/Val-goal.lev +share/nethackdir/Val-loca.lev +share/nethackdir/Val-strt.lev +share/nethackdir/Wiz-fila.lev +share/nethackdir/Wiz-filb.lev +share/nethackdir/Wiz-goal.lev +share/nethackdir/Wiz-loca.lev +share/nethackdir/Wiz-strt.lev +share/nethackdir/soko1-1.lev +share/nethackdir/soko1-2.lev +share/nethackdir/soko2-1.lev +share/nethackdir/soko2-2.lev +share/nethackdir/soko3-1.lev +share/nethackdir/soko3-2.lev +share/nethackdir/soko4-1.lev +share/nethackdir/soko4-2.lev share/nethackdir/opthelp share/nethackdir/history share/nethackdir/cmdhelp diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile index 1df18efa8d6..a934bd755aa 100644 --- a/games/nethack-qt/Makefile +++ b/games/nethack-qt/Makefile @@ -1,22 +1,19 @@ -# $NetBSD: Makefile,v 1.7 1999/06/04 15:39:09 drochner Exp $ +# $NetBSD: Makefile,v 1.8 1999/12/24 22:30:02 pooka Exp $ # -DISTNAME= qnethack-3.2.2.1.0.1.src -PKGNAME= nethack-qt-3.2.2 +DISTNAME= nethack-3.3.0 +PKGNAME= nethack-qt-3.3.0 CATEGORIES= games x11 -MASTER_SITES= ftp://ftp.troll.no/contrib/ \ - http://pinky.wtower.com/nethack/sources/ -DISTFILES= qnethack-3.2.2.1.0.1.src.tar.gz \ - nethack-3.2.2.tar.gz +MASTER_SITES= ftp://ftp.win.tue.nl/pub/games/nethack.330/source/ MAINTAINER= root@garbled.net HOMEPAGE= http://trolls.troll.no/warwick/nethack/ -DEPENDS+= nethack-lib-3.2.2:../nethack-lib +DEPENDS+= nethack-lib-3.3.0:../nethack-lib DEPENDS+= xpm-3.4k:../../graphics/xpm DEPENDS+= qt-1.44:../../x11/qt -WRKSRC= ${WRKDIR}/nethack-3.2.2 +WRKSRC= ${WRKDIR}/nethack-3.3.0 USE_X11= yes USE_GMAKE= yes @@ -29,16 +26,22 @@ MAKE_ENV+= GTYPE=-qt QTDIR=${X11BASE} PATCHFILES+= ${PKGSRCDIR}/games/nethack-lib/patches/patch-* ALLFILES= ${DISTFILES} # don't checksum shared patches +MD5_FILE= ${.CURDIR}/../nethack-lib/files/md5 + +IGNORE= "requires qt2 which is unavailable in pkgsrc" + +#post-extract: +# #@${LN} -sf ../../Qt ${WRKSRC}/win/Qt + post-extract: - @${LN} -sf ../../Qt ${WRKSRC}/win/Qt + @${CHMOD} 755 ${WRKSRC}/sys/unix/setup.sh post-patch: @${MV} ${WRKSRC}/include/config.h ${WRKSRC}/foo - @${SED} -e 's@XXXLOCALBASEXXX@${LOCALBASE}@g' <${WRKSRC}/foo> ${WRKSRC}/include/config.h + @${SED} -e 's@XXXPREFIXXXX@${PREFIX}@g' <${WRKSRC}/foo> ${WRKSRC}/include/config.h @${RM} -f ${WRKSRC}/foo - @cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < win/Qt/nhqt.patch post-install: - ${INSTALL} -c -o bin -g games -m 0644 ${WRKSRC}/dat/tiles.xpm ${LOCALBASE}/share/nethackdir + ${INSTALL} -c -o bin -g games -m 0644 ${WRKSRC}/dat/tiles.xpm ${PREFIX}/share/nethackdir .include "../../mk/bsd.pkg.mk" diff --git a/games/nethack-qt/files/md5 b/games/nethack-qt/files/md5 deleted file mode 100644 index 8f28ce18b25..00000000000 --- a/games/nethack-qt/files/md5 +++ /dev/null @@ -1,4 +0,0 @@ -$NetBSD: md5,v 1.3 1998/12/31 13:20:53 tv Exp $ - -MD5 (qnethack-3.2.2.1.0.1.src.tar.gz) = 19054e00e5f99c9b05d967ebd977e81a -MD5 (nethack-3.2.2.tar.gz) = c85de4d14453b3a2d182d1dfc2ca04df diff --git a/games/nethack-qt/files/patch-sum b/games/nethack-qt/files/patch-sum index a05203b291a..0555bea3291 100644 --- a/games/nethack-qt/files/patch-sum +++ b/games/nethack-qt/files/patch-sum @@ -1,4 +1,5 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:58 agc Exp $ +$NetBSD: patch-sum,v 1.2 1999/12/24 22:30:03 pooka Exp $ -MD5 (patch-aa) = ffb7eabfab778f54b2143f32288466ea -MD5 (patch-ab) = cb744632ae08477088bf0e69a9e3edd3 +MD5 (patch-aa) = a009a4ece6a091f6c1055708aac55ace +MD5 (patch-ab) = 329300bb675c34e2d95099b7452b39fc +MD5 (patch-ac) = 1096876031d6467d32fcd00412eabdf1 diff --git a/games/nethack-qt/patches/patch-aa b/games/nethack-qt/patches/patch-aa index f9b66afe734..6afabb0f073 100644 --- a/games/nethack-qt/patches/patch-aa +++ b/games/nethack-qt/patches/patch-aa @@ -1,180 +1,16 @@ -$NetBSD: patch-aa,v 1.3 1998/12/31 07:28:46 garbled Exp $ ---- win/Qt/nhqt.patch.orig Tue Apr 14 08:40:16 1998 -+++ win/Qt/nhqt.patch Sat Aug 8 06:42:11 1998 -@@ -88,3 +73,3 @@ - + # endif --+ # ifndef WIN32 -++ # if !defined(WIN32) && !defined(__NetBSD__) - + # define USER_SOUNDS -@@ -123,3 +108,2 @@ - # define DOAGAIN '\001' /* ^A, the "redo" key used in cmd.c and getline.c */ --diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./include/extern.h ../qnethack/include/extern.h - *** ./include/extern.h Mon Dec 9 16:37:13 1996 -@@ -143,3 +127,2 @@ - E char *FDECL(xname, (struct obj *)); --diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./include/global.h ../qnethack/include/global.h - *** ./include/global.h Tue Nov 26 00:52:52 1996 -@@ -163,3 +146,2 @@ - # endif --diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./include/system.h ../qnethack/include/system.h - *** ./include/system.h Mon Nov 4 15:01:25 1996 -@@ -200,3 +182,2 @@ - E int FDECL(chdir, (char *)); --diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./src/files.c ../qnethack/src/files.c - *** ./src/files.c Mon Oct 28 01:33:03 1996 -@@ -237,3 +218,2 @@ - return 1; --diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./src/o_init.c ../qnethack/src/o_init.c - *** ./src/o_init.c Tue Aug 13 19:31:28 1996 -@@ -257,3 +237,2 @@ - } --diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./src/objnam.c ../qnethack/src/objnam.c - *** ./src/objnam.c Mon Dec 9 16:43:29 1996 -@@ -277,3 +256,2 @@ - #ifdef LINT /* static char buf[BUFSZ]; */ --diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./src/sounds.c ../qnethack/src/sounds.c - *** ./src/sounds.c Fri May 24 14:52:26 1996 -@@ -382,3 +360,2 @@ - /*sounds.c*/ --diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./src/spell.c ../qnethack/src/spell.c - *** ./src/spell.c Tue Aug 13 19:27:25 1996 -@@ -414,3 +391,2 @@ - else --diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./src/windows.c ../qnethack/src/windows.c - *** ./src/windows.c Fri May 24 20:27:05 1996 -@@ -441,20 +417,7 @@ - { &mac_procs, 0 }, --diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./sys/unix/Makefile.dat ../qnethack/sys/unix/Makefile.dat --*** ./sys/unix/Makefile.dat Tue Sep 12 22:01:37 1995 ----- ../qnethack/sys/unix/Makefile.dat Tue Apr 14 17:40:03 1998 -+*** ./sys/unix/Makefile.dat Tue Sep 12 13:01:37 1995 -+--- ../qnethack/sys/unix/Makefile.dat Sat Aug 8 06:39:59 1998 - *************** --*** 22,33 **** -- ../util/tile2x11 ../win/share/monsters.txt ../win/share/objects.txt \ -- ../win/share/other.txt -- -- pet_mark.xbm: ../win/X11/pet_mark.xbm -- cp ../win/X11/pet_mark.xbm pet_mark.xbm -- -- rip.xpm: ../win/X11/rip.xpm -- cp ../win/X11/rip.xpm rip.xpm --- -- -- data: data.base ../util/makedefs -- ../util/makedefs -d ----- 22,37 ---- -+*** 22,27 **** -+--- 22,32 ---- - ../util/tile2x11 ../win/share/monsters.txt ../win/share/objects.txt \ -@@ -470,8 +433,2 @@ - -- rip.xpm: ../win/X11/rip.xpm -- cp ../win/X11/rip.xpm rip.xpm -- -- data: data.base ../util/makedefs -- ../util/makedefs -d --diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./sys/unix/Makefile.src ../qnethack/sys/unix/Makefile.src - *** ./sys/unix/Makefile.src Tue Dec 10 21:20:09 1996 -@@ -494,6 +451,6 @@ - ! CFLAGS = -O2 -I../include --! LFLAGS = -L/usr/X11/lib -L$(QTDIR)/lib -+! LFLAGS = -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib -L$(QTDIR)/lib - - + # For USER_SOUNDS support, include -I/usr/X11/include --+ CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include -I/usr/X11/include -++ CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include/qt -I$(X11BASE)/include - -@@ -519,8 +476,8 @@ - + # for USER_SOUNDS support, include ../win/Qt/qaudio.cpp ../win/Qt/qaudio-p.cpp --+ WINQTSRC = ../win/Qt/qt_win.cpp ../win/Qt/qt_cluster.cpp \ --+ ../win/Qt/qaudio.cpp ../win/Qt/qaudio-p.cpp -++ WINQTSRC = ../win/Qt/qt_win.cpp ../win/Qt/qt_cluster.cpp -++ # ../win/Qt/qaudio.cpp ../win/Qt/qaudio-p.cpp - + - + # For USER_SOUNDS support, include qaudio.o qaudio-p.o --+ WINQTOBJ = qt_win.o qt_cluster.o tile.o \ --+ qaudio.o qaudio-p.o -++ WINQTOBJ = qt_win.o qt_cluster.o tile.o -++ # qaudio.o qaudio-p.o - + # -@@ -548,3 +505,3 @@ - + # For USER_SOUNDS support, include -laudio -lm --+ WINQTLIB = -lqt -lX11 -laudio -lm -++ WINQTLIB = -lqt -lX11 -lXext - + # -@@ -994,3 +951,2 @@ - # IF YOU PUT STUFF HERE IT WILL GO AWAY --diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./sys/unix/Makefile.top ../qnethack/sys/unix/Makefile.top - *** ./sys/unix/Makefile.top Tue Dec 10 21:20:10 1996 -@@ -998,21 +954,11 @@ - *************** --*** 35,42 **** -- GAMEDIR = /usr/games/lib/$(GAME)dir -- SHELLDIR = /usr/games -- --! # per discussion in Install.X11 --! VARDATND = -- # VARDATND = x11tiles pet_mark.xbm -- # VARDATND = x11tiles pet_mark.xbm rip.xpm -- ----- 35,43 ---- -- GAMEDIR = /usr/games/lib/$(GAME)dir -- SHELLDIR = /usr/games -- --! # per discussion in Install.X11 and Install.Qt --! VARDATND = tiles.xpm rip.xpm --! -+*** 39,44 **** -+--- 39,45 ---- -+ VARDATND = - # VARDATND = x11tiles pet_mark.xbm -- # VARDATND = x11tiles pet_mark.xbm rip.xpm -- -+ VARDATND = x11tiles pet_mark.xbm rip.xpm -++ VARDATND += tiles.xpm -+ -+ VARDATD = data oracles options quest.dat rumors -+ VARDAT = $(VARDATD) $(VARDATND) - *************** -@@ -1031,5 +977,5 @@ - + -- all: $(GAME) Guidebook $(VARDAT) dungeon spec_levs check-dlb -+ all: $(GAME) datastuff - @echo "Done." -- -+ - *************** -@@ -1055,3 +1001,2 @@ - ( cd dat ; $(MAKE) pet_mark.xbm ) --diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./sys/unix/Makefile.utl ../qnethack/sys/unix/Makefile.utl - *** ./sys/unix/Makefile.utl Tue Dec 10 21:20:11 1996 -@@ -1068,16 +1013,2 @@ - --- 290,295 ---- --diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./sys/unix/nethack.sh ../qnethack/sys/unix/nethack.sh --*** ./sys/unix/nethack.sh Tue Sep 12 22:01:39 1995 ----- ../qnethack/sys/unix/nethack.sh Mon Mar 30 23:19:48 1998 --*************** --*** 2,7 **** ----- 2,8 ---- -- # SCCS Id: @(#)nethack.sh 3.2 90/02/26 -- -- HACKDIR=/usr/games/lib/nethackdir --+ export HACKDIR -- HACK=$HACKDIR/nethack -- MAXNROFPLAYERS=4 -- --diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./sys/unix/unixmain.c ../qnethack/sys/unix/unixmain.c - *** ./sys/unix/unixmain.c Wed Sep 25 02:37:10 1996 -@@ -1105,3 +1036,2 @@ - #endif --diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./sys/winnt/Makefile.nt ../qnethack/sys/winnt/Makefile.nt - *** ./sys/winnt/Makefile.nt Mon Nov 4 14:54:36 1996 -@@ -1349,3 +1279,2 @@ - # from sys\share --diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./util/makedefs.c ../qnethack/util/makedefs.c - *** ./util/makedefs.c Mon Nov 4 15:01:17 1996 -@@ -1364,3 +1293,2 @@ - --diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./win/X11/tile2x11.c ../qnethack/win/X11/tile2x11.c - *** ./win/X11/tile2x11.c Fri May 3 23:44:17 1996 +$NetBSD: patch-aa,v 1.4 1999/12/24 22:30:03 pooka Exp $ + +--- include/config.h.orig Wed Dec 22 22:13:56 1999 ++++ include/config.h Wed Dec 22 22:26:48 1999 +@@ -42,9 +42,9 @@ + * Define all of those you want supported in your binary. + * Some combinations make no sense. See the installation document. + */ +-#define TTY_GRAPHICS /* good old tty based graphics */ ++/* #define TTY_GRAPHICS /* good old tty based graphics */ + /* #define X11_GRAPHICS */ /* X11 interface */ +-/* #define QT_GRAPHICS */ /* Qt interface */ ++#define QT_GRAPHICS /* Qt interface */ + + /* + * Define the default window system. This should be one that is compiled diff --git a/games/nethack-qt/patches/patch-ab b/games/nethack-qt/patches/patch-ab index a2a51f9314a..8ba17543542 100644 --- a/games/nethack-qt/patches/patch-ab +++ b/games/nethack-qt/patches/patch-ab @@ -1,8 +1,13 @@ -$NetBSD: patch-ab,v 1.1 1998/08/27 13:06:51 garbled Exp $ ---- sys/unix/Makefile.dat.orig Sat Aug 8 06:57:06 1998 -+++ sys/unix/Makefile.dat Sat Aug 8 06:57:14 1998 -@@ -17,3 +17,3 @@ +$NetBSD: patch-ab,v 1.2 1999/12/24 22:30:03 pooka Exp $ + +--- sys/unix/Makefile.dat.orig Sat Dec 11 07:21:05 1999 ++++ sys/unix/Makefile.dat Wed Dec 22 22:09:13 1999 +@@ -15,7 +15,7 @@ + (cd ../util ; make lev_comp) + ../util/tile2x11: - (cd ../util ; make tile2x11) + (cd ../util ; gmake tile2x11) + x11tiles: ../util/tile2x11 ../win/share/monsters.txt ../win/share/objects.txt \ + ../win/share/other.txt diff --git a/games/nethack-qt/patches/patch-ac b/games/nethack-qt/patches/patch-ac new file mode 100644 index 00000000000..236e37a3766 --- /dev/null +++ b/games/nethack-qt/patches/patch-ac @@ -0,0 +1,43 @@ +$NetBSD: patch-ac,v 1.1 1999/12/24 22:30:03 pooka Exp $ + +--- sys/unix/Makefile.src.orig Sat Dec 11 07:21:05 1999 ++++ sys/unix/Makefile.src Wed Dec 22 22:29:15 1999 +@@ -132,8 +132,8 @@ + # flags for debugging: + # CFLAGS = -g -I../include + +-CFLAGS = -O -I../include +-LFLAGS = ++CFLAGS = -O -I../include -I${X11BASE}/include ++LFLAGS = -Wl,-R${X11BASE}/lib -L${X11BASE} + + # Only used for Qt interface (other interfaces are standard C) + CXXFLAGS = -g $(CFLAGS) -I. -I$(QTDIR)/include +@@ -165,8 +165,8 @@ + + # + # +-WINSRC = $(WINTTYSRC) +-WINOBJ = $(WINTTYOBJ) ++WINSRC = $(WINQTSRC) ++WINOBJ = $(WINQTOBJ) + + # on some systems the termcap library is in -ltermcap or -lcurses + # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead +@@ -192,14 +192,14 @@ + # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0 + # + # libraries for Qt +-WINQTLIB = -L$(QTDIR)/lib -lqt ++WINQTLIB = -L$(QTDIR)/lib -lqt -lXpm + # + # libraries for KDE (with Qt) + WINKDELIB = -lkdecore -lkdeui -lXext + # + # + +-WINLIB = $(WINTTYLIB) ++WINLIB = $(WINQTLIB) + + # any other strange libraries your system needs (for Sysunix only -- the more + # specialized targets should already be right) diff --git a/games/nethack-qt/pkg/COMMENT b/games/nethack-qt/pkg/COMMENT index 237957f5b36..f24935e0208 100644 --- a/games/nethack-qt/pkg/COMMENT +++ b/games/nethack-qt/pkg/COMMENT @@ -1 +1 @@ -the QT-Enhanced X11 version of NetHack +the (currently non-functional) QT-Enhanced X11 version of NetHack diff --git a/games/nethack-tty/Makefile b/games/nethack-tty/Makefile index 4a1747489c0..04da9abafd5 100644 --- a/games/nethack-tty/Makefile +++ b/games/nethack-tty/Makefile @@ -1,14 +1,14 @@ -# $NetBSD: Makefile,v 1.4 1998/12/31 13:20:53 tv Exp $ +# $NetBSD: Makefile,v 1.5 1999/12/24 22:30:04 pooka Exp $ -DISTNAME= nethack-3.2.2 -PKGNAME= nethack-tty-3.2.2 +DISTNAME= nethack-3.3.0 +PKGNAME= nethack-tty-3.3.0 CATEGORIES= games -MASTER_SITES= http://pinky.wtower.com/nethack/sources/ +MASTER_SITES= ftp://ftp.win.tue.nl/pub/games/nethack.330/source/ MAINTAINER= root@garbled.net HOMEPAGE= http://www.win.tue.nl/games/roguelike/nethack/ -DEPENDS+= nethack-lib-3.2.2:../nethack-lib +DEPENDS+= nethack-lib-3.3.0:../nethack-lib HAS_CONFIGURE= yes CONFIGURE_SCRIPT= sys/unix/setup.sh @@ -18,9 +18,14 @@ MAKE_ENV+= GTYPE=-tty PATCHDIR= ${PKGSRCDIR}/games/nethack-lib/patches +MD5_FILE= ${.CURDIR}/../nethack-lib/files/md5 + +post-extract: + @${CHMOD} 755 ${WRKSRC}/sys/unix/setup.sh + post-patch: @${MV} ${WRKSRC}/include/config.h ${WRKSRC}/foo - @${SED} -e 's@XXXLOCALBASEXXX@${LOCALBASE}@g' <${WRKSRC}/foo> ${WRKSRC}/include/config.h + @${SED} -e 's@XXXPREFIXXXX@${PREFIX}@g' <${WRKSRC}/foo> ${WRKSRC}/include/config.h @${RM} -f ${WRKSRC}/foo .include "../../mk/bsd.pkg.mk" diff --git a/games/nethack-tty/files/md5 b/games/nethack-tty/files/md5 deleted file mode 100644 index adccd5fe5bf..00000000000 --- a/games/nethack-tty/files/md5 +++ /dev/null @@ -1,3 +0,0 @@ -$NetBSD: md5,v 1.1 1998/12/31 13:20:53 tv Exp $ - -MD5 (nethack-3.2.2.tar.gz) = c85de4d14453b3a2d182d1dfc2ca04df diff --git a/games/nethack-tty/files/patch-sum b/games/nethack-tty/files/patch-sum index 6abd6940cba..5536ae70747 100644 --- a/games/nethack-tty/files/patch-sum +++ b/games/nethack-tty/files/patch-sum @@ -1,7 +1,9 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:58 agc Exp $ +$NetBSD: patch-sum,v 1.2 1999/12/24 22:30:05 pooka Exp $ -MD5 (patch-aa) = 12bb422b2f85120950d8973bdd5bfbe6 -MD5 (patch-ab) = be16583bf6e540e266106885143d9ce6 -MD5 (patch-ac) = 86ede1504426a3b6b5de815dd9782849 -MD5 (patch-ad) = 550b27fc2a426612cfb92fec64366808 -MD5 (patch-ae) = 5407e5dc2cb0d8b325e8b7bf779e49f7 +MD5 (patch-aa) = ab2e40a9c222d914cc0ca9ecfda1cd88 +MD5 (patch-ab) = 21f70d969186fda8328f8f4a2300cebf +MD5 (patch-ac) = 4f89ee35a5901b7b8a8e376216c227ba +MD5 (patch-ad) = 1c894f6943c2b5edfcca5e36a6f43c4d +MD5 (patch-ae) = 0461964e1047cb98a734dfbe257e8325 +MD5 (patch-af) = ea67bbcb60a39b8fe0c7994b55d951e2 +MD5 (patch-ag) = 2498d677fef1a69f0c4ee79ab7d43f9b diff --git a/games/nethack-x11/Makefile b/games/nethack-x11/Makefile index 5b9fbcf65c8..9d7aa100b50 100644 --- a/games/nethack-x11/Makefile +++ b/games/nethack-x11/Makefile @@ -1,15 +1,15 @@ -# $NetBSD: Makefile,v 1.5 1999/04/26 18:38:29 garbled Exp $ +# $NetBSD: Makefile,v 1.6 1999/12/24 22:30:05 pooka Exp $ # -DISTNAME= nethack-3.2.2 -PKGNAME= nethack-x11-3.2.2 +DISTNAME= nethack-3.3.0 +PKGNAME= nethack-x11-3.3.0 CATEGORIES= games x11 -MASTER_SITES= http://pinky.wtower.com/nethack/sources/ +MASTER_SITES= ftp://ftp.win.tue.nl/pub/games/nethack.330/source/ MAINTAINER= root@garbled.net HOMEPAGE= http://www.win.tue.nl/games/roguelike/nethack/ -DEPENDS+= nethack-lib-3.2.2:../nethack-lib +DEPENDS+= nethack-lib-3.3.0:../nethack-lib DEPENDS+= xpm-3.4k:../../graphics/xpm USE_X11= yes @@ -22,9 +22,14 @@ MAKE_ENV+= GTYPE=-x11 PATCHFILES+= ${PKGSRCDIR}/games/nethack-lib/patches/patch-* ALLFILES= ${DISTFILES} # don't checksum shared patches +MD5_FILE= "${.CURDIR}/../nethack-lib/files/md5" + +post-extract: + @${CHMOD} 755 ${WRKSRC}/sys/unix/setup.sh + post-patch: @${MV} ${WRKSRC}/include/config.h ${WRKSRC}/foo - @${SED} -e 's@XXXLOCALBASEXXX@${LOCALBASE}@g' <${WRKSRC}/foo> ${WRKSRC}/include/config.h + @${SED} -e 's@XXXPREFIXXXX@${PREFIX}@g' <${WRKSRC}/foo> ${WRKSRC}/include/config.h @${RM} -f ${WRKSRC}/foo .include "../../mk/bsd.pkg.mk" diff --git a/games/nethack-x11/files/md5 b/games/nethack-x11/files/md5 deleted file mode 100644 index ba217546059..00000000000 --- a/games/nethack-x11/files/md5 +++ /dev/null @@ -1,3 +0,0 @@ -$NetBSD: md5,v 1.1 1998/12/31 13:20:54 tv Exp $ - -MD5 (nethack-3.2.2.tar.gz) = c85de4d14453b3a2d182d1dfc2ca04df diff --git a/games/nethack-x11/files/patch-sum b/games/nethack-x11/files/patch-sum index 0278a5cb51b..fe7de58b355 100644 --- a/games/nethack-x11/files/patch-sum +++ b/games/nethack-x11/files/patch-sum @@ -1,4 +1,4 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:59 agc Exp $ +$NetBSD: patch-sum,v 1.2 1999/12/24 22:30:06 pooka Exp $ -MD5 (patch-aa) = 440619e937d38f5dcfc5392dc15aa375 -MD5 (patch-ab) = 0a6e691dc47e82002f6c419dbc6d3397 +MD5 (patch-aa) = 540c8a6f9754f529e48bffc5d59e3432 +MD5 (patch-ab) = f02f85296c63fd87802f371b68000666 diff --git a/games/nethack-x11/patches/patch-aa b/games/nethack-x11/patches/patch-aa index 746eac971c2..f8d4d93c018 100644 --- a/games/nethack-x11/patches/patch-aa +++ b/games/nethack-x11/patches/patch-aa @@ -1,20 +1,33 @@ -$NetBSD: patch-aa,v 1.1 1998/08/27 13:15:01 garbled Exp $ ---- include/config.h.orig Sat Aug 8 01:48:35 1998 -+++ include/config.h Sat Aug 8 01:53:42 1998 -@@ -212,4 +212,4 @@ +$NetBSD: patch-aa,v 1.2 1999/12/24 22:30:07 pooka Exp $ + +--- include/config.h.orig Sat Dec 11 07:20:49 1999 ++++ include/config.h Wed Dec 22 21:41:41 1999 +@@ -42,8 +42,8 @@ + * Define all of those you want supported in your binary. + * 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 TTY_GRAPHICS /* good old tty based graphics */ -+#define X11_GRAPHICS /* X11 interface */ ++#define X11_GRAPHICS /* X11 interface */ + /* #define QT_GRAPHICS */ /* Qt interface */ + + /* +@@ -80,7 +80,7 @@ + #endif -@@ -246,3 +246,3 @@ #ifndef DEFAULT_WINDOW_SYS -# define DEFAULT_WINDOW_SYS "tty" -+# define DEFAULT_WINDOW_SYS "X11" ++# define DEFAULT_WINDOW_SYS "x11" #endif -@@ -258,3 +258,3 @@ + + #ifdef X11_GRAPHICS +@@ -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 */ +-/* # 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 diff --git a/games/nethack-x11/patches/patch-ab b/games/nethack-x11/patches/patch-ab index 6c5bf85ad16..7d207cf799a 100644 --- a/games/nethack-x11/patches/patch-ab +++ b/games/nethack-x11/patches/patch-ab @@ -1,27 +1,44 @@ -$NetBSD: patch-ab,v 1.2 1998/12/31 13:20:54 tv Exp $ ---- sys/unix/Makefile.src.orig Sat Aug 8 01:56:47 1998 -+++ sys/unix/Makefile.src Sat Aug 8 02:00:19 1998 -@@ -126,4 +126,4 @@ +$NetBSD: patch-ab,v 1.3 1999/12/24 22:30:07 pooka Exp $ + +--- sys/unix/Makefile.src.orig Sat Dec 11 07:21:05 1999 ++++ sys/unix/Makefile.src Wed Dec 22 21:45:47 1999 +@@ -132,8 +132,8 @@ + # flags for debugging: + # CFLAGS = -g -I../include -CFLAGS = -O -I../include -LFLAGS = -+CFLAGS = -O -I../include -I$(X11BASE)/include -+LFLAGS = -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib ++CFLAGS = -O -I../include -I${X11BASE}/include ++LFLAGS = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -@@ -148,4 +148,4 @@ + # Only used for Qt interface (other interfaces are standard C) + CXXFLAGS = -g $(CFLAGS) -I. -I$(QTDIR)/include +@@ -165,8 +165,8 @@ + + # # -WINSRC = $(WINTTYSRC) -WINOBJ = $(WINTTYOBJ) +WINSRC = $(WINX11SRC) +WINOBJ = $(WINX11OBJ) -@@ -169,3 +169,3 @@ + # on some systems the termcap library is in -ltermcap or -lcurses + # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead +@@ -186,7 +186,7 @@ + # + # 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 -@@ -175,3 +175,3 @@ + # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm + # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0 +@@ -199,7 +199,7 @@ # + # + -WINLIB = $(WINTTYLIB) +WINLIB = $(WINX11LIB) + # any other strange libraries your system needs (for Sysunix only -- the more + # specialized targets should already be right) diff --git a/games/nethack/Makefile b/games/nethack/Makefile index a0b240e9940..30cb3aa0eb9 100644 --- a/games/nethack/Makefile +++ b/games/nethack/Makefile @@ -1,15 +1,15 @@ -# $NetBSD: Makefile,v 1.5 1999/09/28 20:40:03 soren Exp $ +# $NetBSD: Makefile,v 1.6 1999/12/24 22:29:58 pooka Exp $ -DISTNAME= nethack-all-3.2.2 +DISTNAME= nethack-all-3.3.0 CATEGORIES= games x11 MASTER_SITES= # empty DISTFILES= # empty MAINTAINER= root@garbled.net -DEPENDS+= nethack-tty-3.2.2:../nethack-tty -DEPENDS+= nethack-x11-3.2.2:../nethack-x11 -DEPENDS+= nethack-qt-3.2.2:../nethack-qt +DEPENDS+= nethack-tty-3.3.0:../nethack-tty +DEPENDS+= nethack-x11-3.3.0:../nethack-x11 +#DEPENDS+= nethack-qt-3.3.0:../nethack-qt USE_X11= yes EXTRACT_ONLY= # empty |