head 1.13; access; symbols pkgsrc-2013Q2:1.13.0.8 pkgsrc-2013Q2-base:1.13 pkgsrc-2012Q4:1.13.0.6 pkgsrc-2012Q4-base:1.13 pkgsrc-2011Q4:1.13.0.4 pkgsrc-2011Q4-base:1.13 pkgsrc-2011Q2:1.13.0.2 pkgsrc-2011Q2-base:1.13 pkgsrc-2011Q1:1.12.0.48 pkgsrc-2011Q1-base:1.12 pkgsrc-2010Q4:1.12.0.46 pkgsrc-2010Q4-base:1.12 pkgsrc-2010Q3:1.12.0.44 pkgsrc-2010Q3-base:1.12 pkgsrc-2010Q2:1.12.0.42 pkgsrc-2010Q2-base:1.12 pkgsrc-2010Q1:1.12.0.40 pkgsrc-2010Q1-base:1.12 pkgsrc-2009Q4:1.12.0.38 pkgsrc-2009Q4-base:1.12 pkgsrc-2009Q3:1.12.0.36 pkgsrc-2009Q3-base:1.12 pkgsrc-2009Q2:1.12.0.34 pkgsrc-2009Q2-base:1.12 pkgsrc-2009Q1:1.12.0.32 pkgsrc-2009Q1-base:1.12 pkgsrc-2008Q4:1.12.0.30 pkgsrc-2008Q4-base:1.12 pkgsrc-2008Q3:1.12.0.28 pkgsrc-2008Q3-base:1.12 cube-native-xorg:1.12.0.26 cube-native-xorg-base:1.12 pkgsrc-2008Q2:1.12.0.24 pkgsrc-2008Q2-base:1.12 cwrapper:1.12.0.22 pkgsrc-2008Q1:1.12.0.20 pkgsrc-2008Q1-base:1.12 pkgsrc-2007Q4:1.12.0.18 pkgsrc-2007Q4-base:1.12 pkgsrc-2007Q3:1.12.0.16 pkgsrc-2007Q3-base:1.12 pkgsrc-2007Q2:1.12.0.14 pkgsrc-2007Q2-base:1.12 pkgsrc-2007Q1:1.12.0.12 pkgsrc-2007Q1-base:1.12 pkgsrc-2006Q4:1.12.0.10 pkgsrc-2006Q4-base:1.12 pkgsrc-2006Q3:1.12.0.8 pkgsrc-2006Q3-base:1.12 pkgsrc-2006Q2:1.12.0.6 pkgsrc-2006Q2-base:1.12 pkgsrc-2006Q1:1.12.0.4 pkgsrc-2006Q1-base:1.12 pkgsrc-2005Q4:1.12.0.2 pkgsrc-2005Q4-base:1.12 pkgsrc-2005Q3:1.11.0.14 pkgsrc-2005Q3-base:1.11 pkgsrc-2005Q2:1.11.0.12 pkgsrc-2005Q2-base:1.11 pkgsrc-2005Q1:1.11.0.10 pkgsrc-2005Q1-base:1.11 pkgsrc-2004Q4:1.11.0.8 pkgsrc-2004Q4-base:1.11 pkgsrc-2004Q3:1.11.0.6 pkgsrc-2004Q3-base:1.11 pkgsrc-2004Q2:1.11.0.4 pkgsrc-2004Q2-base:1.11 pkgsrc-2004Q1:1.11.0.2 pkgsrc-2004Q1-base:1.11 pkgsrc-2003Q4:1.10.0.2 pkgsrc-2003Q4-base:1.10 netbsd-1-6-1:1.7.0.6 netbsd-1-6-1-base:1.7 netbsd-1-6:1.7.0.8 netbsd-1-6-RELEASE-base:1.7 pkgviews:1.7.0.4 pkgviews-base:1.7 buildlink2:1.7.0.2 buildlink2-base:1.7 netbsd-1-5-PATCH003:1.7 netbsd-1-5-PATCH001:1.5 netbsd-1-5-RELEASE:1.5 netbsd-1-4-PATCH003:1.5 netbsd-1-4-PATCH002:1.4 comdex-fall-1999:1.3 netbsd-1-4-PATCH001:1.3 netbsd-1-4-RELEASE:1.3 netbsd-1-3-PATCH003:1.2; locks; strict; comment @# @; 1.13 date 2011.06.01.11.20.29; author wiz; state dead; branches; next 1.12; 1.12 date 2005.12.19.19.45.02; author joerg; state Exp; branches; next 1.11; 1.11 date 2004.03.05.15.21.01; author pooka; state Exp; branches; next 1.10; 1.10 date 2003.10.14.11.06.35; author pooka; state Exp; branches; next 1.9; 1.9 date 2003.06.06.12.10.07; author jmmv; state Exp; branches; next 1.8; 1.8 date 2003.03.01.21.12.51; author pooka; state Exp; branches; next 1.7; 1.7 date 2002.03.25.20.32.27; author pooka; state Exp; branches 1.7.6.1; next 1.6; 1.6 date 2002.03.22.17.26.26; author pooka; state Exp; branches; next 1.5; 1.5 date 2000.08.10.17.50.11; author pooka; state Exp; branches; next 1.4; 1.4 date 99.12.24.22.30.03; author pooka; state Exp; branches; next 1.3; 1.3 date 98.12.31.07.28.46; author garbled; state Exp; branches; next 1.2; 1.2 date 98.08.31.08.43.13; author matthias; state Exp; branches; next 1.1; 1.1 date 98.08.27.13.06.51; author garbled; state Exp; branches; next ; 1.7.6.1 date 2003.03.05.14.10.56; author agc; state Exp; branches; next ; desc @@ 1.13 log @DESTDIRify nethack. Merge patches and distinfo. Some other improvements. From Rhialto in PR 45010. @ text @$NetBSD: patch-aa,v 1.12 2005/12/19 19:45:02 joerg Exp $ --- include/config.h.old 2003-12-08 01:39:13.000000000 +0200 +++ include/config.h 2004-03-05 17:00:59.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. */ -#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 GNOME_GRAPHICS */ /* Gnome interface */ /* #define MSWIN_GRAPHICS */ /* Windows NT, CE, Graphics */ @@@@ -85,7 +85,7 @@@@ #ifdef QT_GRAPHICS # define DEFAULT_WC_TILED_MAP /* Default to tiles if users doesn't say wc_ascii_map */ # define USER_SOUNDS /* Use sounds */ -# ifndef __APPLE__ +# if !(defined(__APPLE__) || defined(__NetBSD__) || defined(__DragonFly__)) # define USER_SOUNDS_REGEX # endif # define USE_XPM /* Use XPM format for images (required) */ @@@@ -169,11 +169,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 "@@GZIP_PROGRAM@@" /* FSF gzip compression */ +#define COMPRESS_EXTENSION ".gz" /* normal gzip extension */ #endif #ifndef COMPRESS @@@@ -204,7 +204,7 @@@@ * otherwise it will be the current directory. */ # ifndef HACKDIR -# define HACKDIR "/usr/games/lib/nethackdir" +# define HACKDIR "XXXPREFIXXXX/share/nethackdir340" # endif /* @@@@ -300,7 +300,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 */ @ 1.12 log @Add DragonFly support. When linking with libqt-mt, explicitly link in the thread libraries, this is needed for FreeBSD4-style -pthread. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.11 2004/03/05 15:21:01 pooka Exp $ @ 1.11 log @Nethack 3.4.3 This is a bugfix-release. It should be compatible with bones files and savegames all the way back to 3.4.0 (but of course it's safer to ascend before upgrade). Assorted fixes (full list in doc/fixes34.3): * Correct several inconsistencies * Correct a potentially fatal bug caused by dropping loadstones * Handle level completely filled with monsters better * X11 player selection fixes, one of which could be fatal * Eliminated a gold-in-shop-container cheat @ text @d1 1 a1 1 $NetBSD$ d22 1 a22 1 +# if !(defined(__APPLE__) || defined(__NetBSD__)) @ 1.10 log @Set HACKDIR the good old-fashioned way, so that these build. fixes pkg/22999 by Lloyd Parkes. thanks also to salo for the final nudge @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.9 2003/06/06 12:10:07 jmmv Exp $ d3 2 a4 2 --- include/config.h.orig 2003-02-23 16:43:19.000000000 +0200 +++ include/config.h 2003-03-01 22:54:41.000000000 +0200 d10 1 a10 1 +/* #define TTY_GRAPHICS /* good old tty based graphics */ d17 1 a17 2 @@@@ -84,8 +84,8 @@@@ d20 5 a24 4 -# define USER_SOUNDS /* Use sounds */ -# define USER_SOUNDS_REGEX +/* # define USER_SOUNDS Use sounds */ +/* # define USER_SOUNDS_REGEX */ d26 1 a26 12 # define GRAPHIC_TOMBSTONE /* Use graphical tombstone (rip.ppm) */ # ifndef DEFAULT_WINDOW_SYS @@@@ -112,7 +112,7 @@@@ #endif #ifndef DEFAULT_WINDOW_SYS -# define DEFAULT_WINDOW_SYS "tty" +# define DEFAULT_WINDOW_SYS "Qt" #endif #ifdef X11_GRAPHICS @@@@ -167,11 +167,11 @@@@ d32 2 a33 2 +/* #define COMPRESS "/usr/bin/compress" /* Lempel-Ziv compression */ +/* #define COMPRESS_EXTENSION ".Z" /* compress's extension */ d37 1 a37 1 +#define COMPRESS "/usr/bin/gzip" /* FSF gzip compression */ d42 6 a47 7 @@@@ -205,7 +205,7 @@@@ # ifdef __APPLE__ # define HACKDIR "nethackdir" /* nethack directory */ # else -# define HACKDIR "/usr/games/lib/nethackdir" +# define HACKDIR "XXXPREFIXXXX/share/nethackdir340" # endif d50 2 a51 1 @@@@ -302,7 +302,7 @@@@ @ 1.9 log @Avoid hardcoding /usr/pkg in patches. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.8 2003/03/01 21:12:51 pooka Exp $ d58 1 a58 1 +# define HACKDIR PREFIX "/share/nethackdir340" @ 1.8 log @Hello NetHack 3.4.1 This is a bugfix release, no new features introduced. As a compensation for no new features, savegames and bones levels from NetHack 3.4.0 should work, and that's why I kept the datafile directory named nethackdir340. In theory you should be able to simply update the nethack pkgs and continue playing, but I'll not accept any death threats if it doesn't work, so please make sure you make the appropriate backups before trying. @ text @d1 1 a1 1 $NetBSD$ d58 1 a58 1 +# define HACKDIR "/usr/pkg/share/nethackdir340" @ 1.7 log @Make the name of nethackdir contain version information (eg. now it's called nethackdir340). This is to ease the lives of people who wish to have multiple versions nethack installed at the same time. It is not fully automated, because doing pkgsrc magic will most likely screw things up one funny way or another. And we all know that the most important thing in this world is the nethack scorefile ... Manually bump version to 3.4.0nb1. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.6 2002/03/22 17:26:26 pooka Exp $ d3 2 a4 2 --- include/config.h.orig Thu Mar 21 01:42:43 2002 +++ include/config.h Fri Mar 22 18:52:27 2002 d17 1 a17 2 @@@@ -83,7 +83,7 @@@@ #endif d20 1 d22 3 a24 1 +/* # define USER_SOUNDS /* Use sounds */ d28 1 a28 1 @@@@ -110,7 +110,7 @@@@ d37 1 a37 1 @@@@ -163,11 +163,11 @@@@ d48 1 a48 1 +#define COMPRESS "@@GZIP_PROGRAM@@" /* FSF gzip compression */ d53 1 a53 1 @@@@ -201,7 +201,7 @@@@ d58 1 a58 1 +# define HACKDIR "XXXPREFIXXXX/share/nethackdir340" d62 1 a62 1 @@@@ -298,7 +298,7 @@@@ @ 1.7.6.1 log @Pullup nethack version 3.4.1 to netbsd-1-6-1 pkgsrc branch. Requested by Antti Kantee. > Date: Sat, 1 Mar 2003 23:12:53 +0200 (EET) > > > Module Name: pkgsrc > Committed By: pooka > Date: Sat Mar 1 21:12:53 UTC 2003 > > Modified Files: > pkgsrc/games/nethack-lib: Makefile.common distinfo > pkgsrc/games/nethack-lib/patches: patch-aa patch-ab patch-ac patch-ae > pkgsrc/games/nethack-qt: Makefile distinfo > pkgsrc/games/nethack-qt/patches: patch-aa patch-ab patch-ac patch-ae > patch-af patch-ag patch-ah patch-ai > pkgsrc/games/nethack-tty: distinfo > pkgsrc/games/nethack-x11: Makefile distinfo > pkgsrc/games/nethack-x11/patches: patch-aa patch-ab patch-ac patch-af > patch-ag patch-ah > Removed Files: > pkgsrc/games/nethack-lib/patches: patch-ah > pkgsrc/games/nethack-qt/patches: patch-aj > pkgsrc/games/nethack-x11/patches: patch-ai > > Log Message: > Hello NetHack 3.4.1 > > This is a bugfix release, no new features introduced. > > As a compensation for no new features, savegames and bones levels > from NetHack 3.4.0 should work, and that's why I kept the datafile > directory named nethackdir340. In theory you should be able to > simply update the nethack pkgs and continue playing, but I'll not > accept any death threats if it doesn't work, so please make sure > you make the appropriate backups before trying. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.7 2002/03/25 20:32:27 pooka Exp $ d3 2 a4 2 --- include/config.h.orig 2003-02-23 16:43:19.000000000 +0200 +++ include/config.h 2003-03-01 22:54:41.000000000 +0200 d17 2 a18 1 @@@@ -84,8 +84,8 @@@@ a20 1 # define DEFAULT_WC_TILED_MAP /* Default to tiles if users doesn't say wc_ascii_map */ d22 1 a22 3 -# define USER_SOUNDS_REGEX +/* # define USER_SOUNDS Use sounds */ +/* # define USER_SOUNDS_REGEX */ d26 1 a26 1 @@@@ -112,7 +112,7 @@@@ d35 1 a35 1 @@@@ -167,11 +167,11 @@@@ d46 1 a46 1 +#define COMPRESS "/usr/bin/gzip" /* FSF gzip compression */ d51 1 a51 1 @@@@ -205,7 +205,7 @@@@ d56 1 a56 1 +# define HACKDIR "/usr/pkg/share/nethackdir340" d60 1 a60 1 @@@@ -302,7 +302,7 @@@@ @ 1.6 log @Upgrade nethack packages to NetHack 3.4.0 Highlights of the new release: * numerous bugfixes * stamina affects ability to throw heavy things * objects merge in containers * several small refinements to race/role separation * more feedback about skill advancement from #enhance command * "autodig" option * option for starting without a pet + many more, read doc/fixes34.0 Old savegames naturally don't work, so make sure you finish old ones before upgrading the package. Also fixes the rest of pkg/15717 by Bernd Ernesti. Solution was the same as what Thomas Klausner used to fix angband (ie. simply duplicate the patches) @ text @d1 1 a1 1 $NetBSD$ d56 1 a56 1 +# define HACKDIR "XXXPREFIXXXX/share/nethackdir" @ 1.5 log @Upgrade nethack to 3.3.1. Add Makefile.common to easy future upgrades. This release contains numerous fixes to bugs in 3.3.0 and users are advised to upgrade. Note that old savegames and bones files won't work anymore. @ text @d3 2 a4 2 --- include/config.h.orig Sat Jul 22 04:13:51 2000 +++ include/config.h Thu Aug 10 19:55:36 2000 d13 1 a13 1 +#define QT_GRAPHICS */ /* Qt interface */ d15 1 d17 52 a68 1 /* @ 1.4 log @Update the Nethack package to 3.3.0. nethack-qt will be non-functional until we get qt2.0 or greater into pkgsrc. @ text @d3 2 a4 2 --- include/config.h.orig Wed Dec 22 22:13:56 1999 +++ include/config.h Wed Dec 22 22:26:48 1999 d11 1 a11 1 /* #define X11_GRAPHICS */ /* X11 interface */ d13 2 a14 1 +#define QT_GRAPHICS /* Qt interface */ a16 1 * Define the default window system. This should be one that is compiled @ 1.3 log @Newer versions of qt >1.40 seem to need -lXext @ text @d1 16 a16 180 $NetBSD: patch-aa,v 1.2 1998/08/31 08:43:13 matthias 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 @ 1.2 log @remove original RCS ids from patch file (else the patch will fail). @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 1998/08/27 13:06:51 garbled Exp $ d104 1 a104 1 ++ WINQTLIB = -lqt -lX11 @ 1.1 log @nethack-qt: the QT-Enhanced X11 version of NetHack @ text @d1 1 a1 1 $NetBSD$ a3 17 @@@@ -1,16 +1 @@@@ -diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./doc/tmac.n ../qnethack/doc/tmac.n -*** ./doc/tmac.n Tue Aug 21 16:42:05 1990 ---- ../qnethack/doc/tmac.n Mon Mar 16 10:01:07 1998 -*************** -*** 1,4 **** -! \" @@(#)$Id: tmac.n,v 3.0 89/06/21 21:44:28 syd Exp $ - .\" The News macro package - .\" - .\" This is the macro package that is used to format news documents. It ---- 1,4 ---- -! \" @@(#)$Id: tmac.n,v 1.1.1.1 1998/03/15 08:49:50 warwick Exp $ - .\" The News macro package - .\" - .\" This is the macro package that is used to format news documents. It -diff --exclude ? --exclude *.moc --exclude *.orig --exclude *.o --exclude *.bak --exclude *~ --exclude onames.h --exclude date.h -c -r ./include/config.h ../qnethack/include/config.h *** ./include/config.h Tue Dec 10 21:20:07 1996 @