summaryrefslogtreecommitdiff
path: root/games/nethack-qt
diff options
context:
space:
mode:
Diffstat (limited to 'games/nethack-qt')
-rw-r--r--games/nethack-qt/Makefile5
-rw-r--r--games/nethack-qt/distinfo20
-rw-r--r--games/nethack-qt/patches/patch-aa26
-rw-r--r--games/nethack-qt/patches/patch-ab64
-rw-r--r--games/nethack-qt/patches/patch-ac14
-rw-r--r--games/nethack-qt/patches/patch-ae8
-rw-r--r--games/nethack-qt/patches/patch-af2
-rw-r--r--games/nethack-qt/patches/patch-ag2
-rw-r--r--games/nethack-qt/patches/patch-ah12
-rw-r--r--games/nethack-qt/patches/patch-ai14
-rw-r--r--games/nethack-qt/patches/patch-aj20
11 files changed, 78 insertions, 109 deletions
diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile
index 0a857accb42..dacecb95b3a 100644
--- a/games/nethack-qt/Makefile
+++ b/games/nethack-qt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2002/09/20 21:24:48 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2003/03/01 21:12:51 pooka Exp $
#
.include "../nethack-lib/Makefile.common"
@@ -21,8 +21,7 @@ ALLFILES= ${DISTFILES} # don't checksum shared patches
post-install:
@${CP} -f ${WRKSRC}/dat/x11tiles ${WRKSRC}/dat/tiles.xpm
- @${INSTALL_DATA} ${WRKSRC}/dat/tiles.xpm \
- ${PREFIX}/share/nethackdir${NETHACK_DISTVER}
+ @${INSTALL_DATA} ${WRKSRC}/dat/tiles.xpm ${PREFIX}/share/${NETHACK_DIR}
.include "../../graphics/xpm/buildlink2.mk"
.include "../../x11/qt2-libs/buildlink2.mk"
diff --git a/games/nethack-qt/distinfo b/games/nethack-qt/distinfo
index c2b03d28ba0..ece14086b78 100644
--- a/games/nethack-qt/distinfo
+++ b/games/nethack-qt/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.9 2003/02/19 20:25:21 pooka Exp $
+$NetBSD: distinfo,v 1.10 2003/03/01 21:12:51 pooka Exp $
-SHA1 (nethack-340.tgz) = db480f5bf94372a8f87ee4d081f83efd99b31523
-Size (nethack-340.tgz) = 3270905 bytes
-SHA1 (patch-aa) = 30fd5b1b39e367ad3278065c76788663a131caee
-SHA1 (patch-ab) = 3c4fd5e4d9e1bdf685cfafaba74ee158f6d52072
-SHA1 (patch-ac) = 3a88954c950854350938fbec1fef195baaacb2cf
-SHA1 (patch-ae) = b6d0cca1e3d781a2a1f1d4b244e944eaedfec716
+SHA1 (nethack-341.tgz) = 91eec5d20fb0fe676f92e1149e3b0360470aef77
+Size (nethack-341.tgz) = 3492419 bytes
+SHA1 (patch-aa) = 5d136e6d97ad1caa0f173b4210fca32cd7bf79a1
+SHA1 (patch-ab) = fa217d8540a550d669a9037c5861ac4d685941ee
+SHA1 (patch-ac) = a2a23324ec9859962064c9f520cad27439442a77
+SHA1 (patch-ae) = a72da6e6bd1af3a8eaed97ecc1fdd1ed4198a5db
SHA1 (patch-af) = 20c37fd62b05121d834d3c42cf3aa48b018b362d
SHA1 (patch-ag) = 6aeae6bde079b9c9081f6e32523687010c9bc674
-SHA1 (patch-ah) = f9d4a9d7e4e536a1c221a4b12b0d204f63410543
-SHA1 (patch-ai) = 580a75c7ebc55b099a702ad21ce12d960f2805ff
-SHA1 (patch-aj) = 12763f8759de2c9b13d0e77f18e8e6aa69a031dc
+SHA1 (patch-ah) = f6c4eeddefe46d17066972edc1711e5b2984dcaa
+SHA1 (patch-ai) = 6c3b678a5b8123fe902cce1cbe8cce61ff4cf821
+SHA1 (patch-aj) = 9df6d1c4af8526e0d1dd2b44960847f6653fe445
diff --git a/games/nethack-qt/patches/patch-aa b/games/nethack-qt/patches/patch-aa
index 0c9c39f213d..fddf7f27768 100644
--- a/games/nethack-qt/patches/patch-aa
+++ b/games/nethack-qt/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.7 2002/03/25 20:32:27 pooka Exp $
+$NetBSD: patch-aa,v 1.8 2003/03/01 21:12:51 pooka Exp $
---- include/config.h.orig Thu Mar 21 01:42:43 2002
-+++ include/config.h Fri Mar 22 18:52:27 2002
+--- include/config.h.orig 2003-02-23 16:43:19.000000000 +0200
++++ include/config.h 2003-03-01 22:54:41.000000000 +0200
@@ -42,9 +42,9 @@
* Define all of those you want supported in your binary.
* Some combinations make no sense. See the installation document.
@@ -14,16 +14,18 @@ $NetBSD: patch-aa,v 1.7 2002/03/25 20:32:27 pooka Exp $
/* #define GNOME_GRAPHICS */ /* Gnome interface */
/* #define MSWIN_GRAPHICS */ /* Windows NT, CE, Graphics */
-@@ -83,7 +83,7 @@
- #endif
+@@ -84,8 +84,8 @@
#ifdef QT_GRAPHICS
+ # define DEFAULT_WC_TILED_MAP /* Default to tiles if users doesn't say wc_ascii_map */
-# define USER_SOUNDS /* Use sounds */
-+/* # define USER_SOUNDS /* Use sounds */
+-# define USER_SOUNDS_REGEX
++/* # define USER_SOUNDS Use sounds */
++/* # define USER_SOUNDS_REGEX */
# define USE_XPM /* Use XPM format for images (required) */
# define GRAPHIC_TOMBSTONE /* Use graphical tombstone (rip.ppm) */
# ifndef DEFAULT_WINDOW_SYS
-@@ -110,7 +110,7 @@
+@@ -112,7 +112,7 @@
#endif
#ifndef DEFAULT_WINDOW_SYS
@@ -32,7 +34,7 @@ $NetBSD: patch-aa,v 1.7 2002/03/25 20:32:27 pooka Exp $
#endif
#ifdef X11_GRAPHICS
-@@ -163,11 +163,11 @@
+@@ -167,11 +167,11 @@
#ifdef UNIX
/* path and file name extension for compression program */
@@ -43,21 +45,21 @@ $NetBSD: patch-aa,v 1.7 2002/03/25 20:32:27 pooka Exp $
/* 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 "@GZIP_PROGRAM@" /* FSF gzip compression */
++#define COMPRESS "/usr/bin/gzip" /* FSF gzip compression */
+#define COMPRESS_EXTENSION ".gz" /* normal gzip extension */
#endif
#ifndef COMPRESS
-@@ -201,7 +201,7 @@
+@@ -205,7 +205,7 @@
# ifdef __APPLE__
# define HACKDIR "nethackdir" /* nethack directory */
# else
-# define HACKDIR "/usr/games/lib/nethackdir"
-+# define HACKDIR "XXXPREFIXXXX/share/nethackdir340"
++# define HACKDIR "/usr/pkg/share/nethackdir340"
# endif
# endif
-@@ -298,7 +298,7 @@
+@@ -302,7 +302,7 @@
* functions that have been macroized.
*/
diff --git a/games/nethack-qt/patches/patch-ab b/games/nethack-qt/patches/patch-ab
index ee6ac2e96d6..1948fec88c9 100644
--- a/games/nethack-qt/patches/patch-ab
+++ b/games/nethack-qt/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.5 2002/03/25 20:32:27 pooka Exp $
+$NetBSD: patch-ab,v 1.6 2003/03/01 21:12:51 pooka Exp $
---- sys/unix/Makefile.top.orig Fri Mar 22 17:15:28 2002
-+++ sys/unix/Makefile.top Fri Mar 22 17:24:57 2002
+--- sys/unix/Makefile.top.orig 2003-02-23 16:43:39.000000000 +0200
++++ sys/unix/Makefile.top 2003-03-01 22:06:45.000000000 +0200
@@ -14,18 +14,17 @@
# MAKE = make
@@ -46,43 +46,23 @@ $NetBSD: patch-ab,v 1.5 2002/03/25 20:32:27 pooka Exp $
$(GAME):
( cd src ; $(MAKE) )
--all: $(GAME) Guidebook $(VARDAT) dungeon spec_levs check-dlb
+-all: $(GAME) recover Guidebook $(VARDAT) dungeon spec_levs check-dlb
+all: $(GAME) datastuff
@echo "Done."
-+datastuff: Guidebook $(VARDAT) dungeon spec_levs check-dlb recover
++datastuff: recover Guidebook $(VARDAT) dungeon spec_levs check-dlb
+ @echo "Data Sets Built."
+
# Note: many of the dependencies below are here to allow parallel make
# to generate valid output
-@@ -102,6 +104,9 @@
- data: $(GAME)
- ( cd dat ; $(MAKE) data )
-
-+recover:
-+ ( cd util ; $(MAKE) recover )
-+
- rumors: $(GAME)
- ( cd dat ; $(MAKE) rumors )
-
-@@ -164,6 +169,11 @@
- ( 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) )
-+ chmod $(GAMEPERM) $(SHELLDIR)/$(GAME)$(GTYPE)
-
- dofiles:
- target=`sed -n \
-@@ -173,16 +183,13 @@
+@@ -180,18 +182,15 @@
-e '}' \
-e '$$s/.*/nodlb/p' < dat/options` ; \
$(MAKE) dofiles-$${target-nodlb}
- cp src/$(GAME) $(GAMEDIR)
+- cp util/recover $(GAMEDIR)
++ cp util/recover $(PREFIX)/bin
-rm -f $(SHELLDIR)/$(GAME)
sed -e 's;/usr/games/lib/nethackdir;$(GAMEDIR);' \
-e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \
@@ -90,18 +70,20 @@ $NetBSD: patch-ab,v 1.5 2002/03/25 20:32:27 pooka Exp $
< sys/unix/nethack.sh \
> $(SHELLDIR)/$(GAME)
# set up their permissions
-- -( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(GAME) ; \
-- $(CHGRP) $(GAMEGRP) $(GAME) )
+- -( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(GAME) recover ; \
+- $(CHGRP) $(GAMEGRP) $(GAME) recover )
- chmod $(GAMEPERM) $(GAMEDIR)/$(GAME)
+- chmod $(EXEPERM) $(GAMEDIR)/recover
++ chmod $(EXEPERM) $(PREFIX)/bin/recover
-$(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME)
$(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME)
chmod $(EXEPERM) $(SHELLDIR)/$(GAME)
-@@ -218,16 +225,16 @@
+@@ -227,16 +226,16 @@
# 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
+-install: $(GAME) recover $(VARDAT) dungeon spec_levs
++install-dat: recover $(VARDAT) dungeon spec_levs
# set up the directories
# not all mkdirs have -p; those that don't will create a -p directory
-mkdir -p $(SHELLDIR)
@@ -116,18 +98,24 @@ $NetBSD: patch-ab,v 1.5 2002/03/25 20:32:27 pooka Exp $
# set up the game files
( $(MAKE) dofiles )
# set up some additional files
-@@ -235,6 +242,14 @@
+@@ -244,9 +243,20 @@
-( cd $(VARDIR) ; $(CHOWN) $(GAMEUID) perm record logfile ; \
$(CHGRP) $(GAMEGRP) perm record logfile ; \
chmod $(FILEPERM) perm record logfile )
++ -touch -c $(VARDIR)/bones* $(VARDIR)/?lock* $(VARDIR)/wizard*
++ -touch -c $(VARDIR)/save/*
+ -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
-+ cp util/recover $(PREFIX)/bin/recover
-+ chown 0:0 $(PREFIX)/bin/recover
-+ chmod 755 $(PREFIX)/bin/recover
-+
# and a reminder
@echo You may also want to reinstall the man pages via the doc Makefile.
++binfiles: $(GAME)
++ cp src/$(GAME) $(SHELLDIR)/$(GAME)$(GTYPE)
++ -( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME)$(GTYPE) ; \
++ $(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME)$(GTYPE) )
++ chmod $(GAMEPERM) $(SHELLDIR)/$(GAME)$(GTYPE)
+
+ # 'make clean' removes all the .o files, but leaves around all the executables
+ # and compiled data files
diff --git a/games/nethack-qt/patches/patch-ac b/games/nethack-qt/patches/patch-ac
index 26b8a13e1ac..979e288134d 100644
--- a/games/nethack-qt/patches/patch-ac
+++ b/games/nethack-qt/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.10 2002/03/22 17:26:26 pooka Exp $
+$NetBSD: patch-ac,v 1.11 2003/03/01 21:12:51 pooka Exp $
---- include/system.h.orig Thu Jan 6 21:20:08 2000
-+++ include/system.h Thu Aug 10 18:16:03 2000
-@@ -77,10 +77,10 @@
+--- include/system.h.orig 2003-02-23 16:43:22.000000000 +0200
++++ include/system.h 2003-03-01 16:34:46.000000000 +0200
+@@ -79,10 +79,10 @@
# if !defined(__SC__) && !defined(LINUX)
E long NDECL(random);
# endif
@@ -15,7 +15,7 @@ $NetBSD: patch-ac,v 1.10 2002/03/22 17:26:26 pooka Exp $
E int FDECL(srandom, (unsigned int));
# endif
# endif
-@@ -130,7 +130,7 @@
+@@ -132,7 +132,7 @@
E void FDECL(qsort, (genericptr_t,size_t,size_t,
int(*)(const genericptr,const genericptr)));
#else
@@ -24,7 +24,7 @@ $NetBSD: patch-ac,v 1.10 2002/03/22 17:26:26 pooka Exp $
E int qsort();
# else
# if !defined(LATTICE) && !defined(AZTEC_50)
-@@ -413,7 +413,7 @@
+@@ -421,7 +421,7 @@
# ifdef HPUX
E unsigned int FDECL(strlen, (char *));
# else
@@ -33,7 +33,7 @@ $NetBSD: patch-ac,v 1.10 2002/03/22 17:26:26 pooka Exp $
E int FDECL(strlen, (const char *));
# endif
# endif /* HPUX */
-@@ -513,11 +513,13 @@
+@@ -521,11 +521,13 @@
# endif
# endif
diff --git a/games/nethack-qt/patches/patch-ae b/games/nethack-qt/patches/patch-ae
index 23fd95a97fa..2726aeec3c1 100644
--- a/games/nethack-qt/patches/patch-ae
+++ b/games/nethack-qt/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2002/03/22 17:26:26 pooka Exp $
+$NetBSD: patch-ae,v 1.2 2003/03/01 21:12:51 pooka Exp $
---- sys/unix/Makefile.doc.orig Fri Jan 14 22:49:48 2000
-+++ sys/unix/Makefile.doc Thu Aug 10 18:17:40 2000
-@@ -34,7 +34,7 @@
+--- sys/unix/Makefile.doc.orig 2003-02-23 16:43:39.000000000 +0200
++++ sys/unix/Makefile.doc 2003-03-01 16:36:19.000000000 +0200
+@@ -38,7 +38,7 @@
GAME = nethack
diff --git a/games/nethack-qt/patches/patch-af b/games/nethack-qt/patches/patch-af
index 86d6ab6e5f7..db6df93b51f 100644
--- a/games/nethack-qt/patches/patch-af
+++ b/games/nethack-qt/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1 2002/03/22 17:26:27 pooka Exp $
+$NetBSD: patch-af,v 1.2 2003/03/01 21:12:51 pooka Exp $
--- include/unixconf.h.orig Thu Mar 21 01:42:56 2002
+++ include/unixconf.h Fri Mar 22 17:42:50 2002
diff --git a/games/nethack-qt/patches/patch-ag b/games/nethack-qt/patches/patch-ag
index 58580c00d2c..e65f3b616b3 100644
--- a/games/nethack-qt/patches/patch-ag
+++ b/games/nethack-qt/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.1 2002/03/22 17:26:27 pooka Exp $
+$NetBSD: patch-ag,v 1.2 2003/03/01 21:12:51 pooka Exp $
--- src/mail.c.orig Wed Aug 9 21:02:04 2000
+++ src/mail.c Thu Aug 10 18:32:30 2000
diff --git a/games/nethack-qt/patches/patch-ah b/games/nethack-qt/patches/patch-ah
index 28e8f99bb28..8b06d42d1c6 100644
--- a/games/nethack-qt/patches/patch-ah
+++ b/games/nethack-qt/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.2 2002/09/20 21:24:49 jlam Exp $
+$NetBSD: patch-ah,v 1.3 2003/03/01 21:12:51 pooka Exp $
---- sys/unix/Makefile.src.orig Sat Aug 5 13:52:57 2000
-+++ sys/unix/Makefile.src Thu Aug 10 20:03:19 2000
+--- sys/unix/Makefile.src.orig 2003-02-23 16:43:39.000000000 +0200
++++ sys/unix/Makefile.src 2003-03-01 22:36:14.000000000 +0200
@@ -144,8 +144,8 @@
# flags for debugging:
# CFLAGS = -g -I../include
@@ -13,7 +13,7 @@ $NetBSD: patch-ah,v 1.2 2002/09/20 21:24:49 jlam Exp $
# The Qt and Be window systems are written in C++, while the rest of
# NetHack is standard C. If using Qt, uncomment the LD line here to get
-@@ -203,8 +203,8 @@
+@@ -204,8 +204,8 @@
#
#
@@ -24,7 +24,7 @@ $NetBSD: patch-ah,v 1.2 2002/09/20 21:24:49 jlam Exp $
# on some systems the termcap library is in -ltermcap or -lcurses
# on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
-@@ -230,7 +230,7 @@
+@@ -231,7 +231,7 @@
# WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
#
# libraries for Qt
@@ -33,7 +33,7 @@ $NetBSD: patch-ah,v 1.2 2002/09/20 21:24:49 jlam Exp $
#
# libraries for KDE (with Qt)
WINKDELIB = -lkdecore -lkdeui -lXext
-@@ -244,7 +244,7 @@
+@@ -245,7 +245,7 @@
# libraries for BeOS
WINBELIB = -lbe
diff --git a/games/nethack-qt/patches/patch-ai b/games/nethack-qt/patches/patch-ai
index 8a787b98115..fce697fd688 100644
--- a/games/nethack-qt/patches/patch-ai
+++ b/games/nethack-qt/patches/patch-ai
@@ -1,13 +1,13 @@
-$NetBSD: patch-ai,v 1.1 2002/03/22 17:26:27 pooka Exp $
+$NetBSD: patch-ai,v 1.2 2003/03/01 21:12:51 pooka Exp $
---- win/Qt/qt_win.cpp.orig Sat Jul 22 03:59:19 2000
-+++ win/Qt/qt_win.cpp Thu Aug 10 19:59:49 2000
-@@ -3448,7 +3448,7 @@
+--- win/Qt/qt_win.cpp.orig 2003-02-23 16:43:45.000000000 +0200
++++ win/Qt/qt_win.cpp 2003-03-01 22:37:46.000000000 +0200
+@@ -4278,7 +4278,7 @@
NetHackQtGlyphs::NetHackQtGlyphs()
{
-- const char* tile_file = "x11tiles";
+- const char* tile_file = "nhtiles.bmp";
+ const char* tile_file = "tiles.xpm";
+ if ( iflags.wc_tile_file )
+ tile_file = iflags.wc_tile_file;
- int tw = TILEWBASE;
- int th = TILEHBASE;
diff --git a/games/nethack-qt/patches/patch-aj b/games/nethack-qt/patches/patch-aj
deleted file mode 100644
index cc9584f7f5c..00000000000
--- a/games/nethack-qt/patches/patch-aj
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2003/02/19 20:25:21 pooka Exp $
-
-*** src/topten.c.orig Mon Feb 4 08:06:07 2002
---- src/topten.c Mon Feb 10 10:48:55 2003
-***************
-*** 856,861 ****
---- 856,867 ----
- else {
- if (playerct > 1) Strcat(pbuf, "any of ");
- for (i = 0; i < playerct; i++) {
-+ /* stop printing players if there are too many to fit */
-+ if (strlen(pbuf) + strlen(players[i]) + 2 >= BUFSZ) {
-+ if (strlen(pbuf) < BUFSZ-4) Strcat(pbuf, "...");
-+ else Strcpy(pbuf+strlen(pbuf)-4, "...");
-+ break;
-+ }
- Strcat(pbuf, players[i]);
- if (i < playerct-1) {
- if (players[i][0] == '-' &&
-
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-20 12:20:37 +0000