head 1.15; access; symbols pkgsrc-2013Q2:1.15.0.8 pkgsrc-2013Q2-base:1.15 pkgsrc-2012Q4:1.15.0.6 pkgsrc-2012Q4-base:1.15 pkgsrc-2011Q4:1.15.0.4 pkgsrc-2011Q4-base:1.15 pkgsrc-2011Q2:1.15.0.2 pkgsrc-2011Q2-base:1.15 pkgsrc-2011Q1:1.14.0.48 pkgsrc-2011Q1-base:1.14 pkgsrc-2010Q4:1.14.0.46 pkgsrc-2010Q4-base:1.14 pkgsrc-2010Q3:1.14.0.44 pkgsrc-2010Q3-base:1.14 pkgsrc-2010Q2:1.14.0.42 pkgsrc-2010Q2-base:1.14 pkgsrc-2010Q1:1.14.0.40 pkgsrc-2010Q1-base:1.14 pkgsrc-2009Q4:1.14.0.38 pkgsrc-2009Q4-base:1.14 pkgsrc-2009Q3:1.14.0.36 pkgsrc-2009Q3-base:1.14 pkgsrc-2009Q2:1.14.0.34 pkgsrc-2009Q2-base:1.14 pkgsrc-2009Q1:1.14.0.32 pkgsrc-2009Q1-base:1.14 pkgsrc-2008Q4:1.14.0.30 pkgsrc-2008Q4-base:1.14 pkgsrc-2008Q3:1.14.0.28 pkgsrc-2008Q3-base:1.14 cube-native-xorg:1.14.0.26 cube-native-xorg-base:1.14 pkgsrc-2008Q2:1.14.0.24 pkgsrc-2008Q2-base:1.14 cwrapper:1.14.0.22 pkgsrc-2008Q1:1.14.0.20 pkgsrc-2008Q1-base:1.14 pkgsrc-2007Q4:1.14.0.18 pkgsrc-2007Q4-base:1.14 pkgsrc-2007Q3:1.14.0.16 pkgsrc-2007Q3-base:1.14 pkgsrc-2007Q2:1.14.0.14 pkgsrc-2007Q2-base:1.14 pkgsrc-2007Q1:1.14.0.12 pkgsrc-2007Q1-base:1.14 pkgsrc-2006Q4:1.14.0.10 pkgsrc-2006Q4-base:1.14 pkgsrc-2006Q3:1.14.0.8 pkgsrc-2006Q3-base:1.14 pkgsrc-2006Q2:1.14.0.6 pkgsrc-2006Q2-base:1.14 pkgsrc-2006Q1:1.14.0.4 pkgsrc-2006Q1-base:1.14 pkgsrc-2005Q4:1.14.0.2 pkgsrc-2005Q4-base:1.14 pkgsrc-2005Q3:1.13.0.16 pkgsrc-2005Q3-base:1.13 pkgsrc-2005Q2:1.13.0.14 pkgsrc-2005Q2-base:1.13 pkgsrc-2005Q1:1.13.0.12 pkgsrc-2005Q1-base:1.13 pkgsrc-2004Q4:1.13.0.10 pkgsrc-2004Q4-base:1.13 pkgsrc-2004Q3:1.13.0.8 pkgsrc-2004Q3-base:1.13 pkgsrc-2004Q2:1.13.0.6 pkgsrc-2004Q2-base:1.13 pkgsrc-2004Q1:1.13.0.4 pkgsrc-2004Q1-base:1.13 pkgsrc-2003Q4:1.13.0.2 pkgsrc-2003Q4-base:1.13 netbsd-1-6-1:1.10.0.6 netbsd-1-6-1-base:1.10 netbsd-1-6:1.10.0.8 netbsd-1-6-RELEASE-base:1.10 pkgviews:1.10.0.4 pkgviews-base:1.10 buildlink2:1.10.0.2 buildlink2-base:1.10 netbsd-1-5-PATCH003:1.10 netbsd-1-5-PATCH001:1.6 netbsd-1-5-RELEASE:1.6 netbsd-1-4-PATCH003:1.6 netbsd-1-4-PATCH002:1.1; locks; strict; comment @# @; 1.15 date 2011.06.01.11.20.29; author wiz; state dead; branches; next 1.14; 1.14 date 2005.12.19.19.45.02; author joerg; state Exp; branches; next 1.13; 1.13 date 2003.09.02.00.30.55; author pooka; state Exp; branches; next 1.12; 1.12 date 2003.06.25.14.22.13; author pooka; state Exp; branches; next 1.11; 1.11 date 2003.03.01.21.12.51; author pooka; state Exp; branches; next 1.10; 1.10 date 2002.03.22.17.26.26; author pooka; state Exp; branches 1.10.6.1; next 1.9; 1.9 date 2001.08.29.22.41.13; author jlam; state Exp; branches; next 1.8; 1.8 date 2001.06.26.19.10.18; author jlam; state Exp; branches; next 1.7; 1.7 date 2001.06.26.18.52.09; author jlam; state Exp; branches; next 1.6; 1.6 date 2000.08.10.17.50.13; author pooka; state Exp; branches; next 1.5; 1.5 date 2000.04.28.10.12.44; author drochner; state Exp; branches; next 1.4; 1.4 date 2000.04.14.21.13.58; author dmcmahill; state Exp; branches; next 1.3; 1.3 date 2000.04.06.18.00.14; author dmcmahill; state Exp; branches; next 1.2; 1.2 date 2000.03.29.00.29.53; author dmcmahill; state Exp; branches; next 1.1; 1.1 date 99.12.24.22.30.03; author pooka; state Exp; branches; next ; 1.10.6.1 date 2003.03.05.14.10.56; author agc; state Exp; branches; next ; desc @@ 1.15 log @DESTDIRify nethack. Merge patches and distinfo. Some other improvements. From Rhialto in PR 45010. @ text @$NetBSD: patch-ac,v 1.14 2005/12/19 19:45:02 joerg Exp $ --- include/system.h.orig 2003-08-30 03:07:23.000000000 +0300 +++ include/system.h 2003-09-02 02:49:23.000000000 +0300 @@@@ -79,10 +79,10 @@@@ # if !defined(__SC__) && !defined(LINUX) E long NDECL(random); # endif -# if (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) || defined(RANDOM) +# if (!defined(SUNOS4) && !defined(bsdi) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__)) || defined(RANDOM) E void FDECL(srandom, (unsigned int)); # else -# if !defined(bsdi) && !defined(__FreeBSD__) +# if !defined(bsdi) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) E int FDECL(srandom, (unsigned int)); # endif # endif @@@@ -132,7 +132,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(); # else # if !defined(LATTICE) && !defined(AZTEC_50) @@@@ -421,7 +421,7 @@@@ # ifdef HPUX E unsigned int FDECL(strlen, (char *)); # else -# if !(defined(ULTRIX_PROTO) && defined(__GNUC__)) +# if !(defined(ULTRIX_PROTO) && defined(__GNUC__)) && !defined(__NetBSD__) && !defined(__DragonFly__) E int FDECL(strlen, (const char *)); # endif # endif /* HPUX */ @@@@ -521,11 +521,13 @@@@ # endif # endif +#ifndef __NetBSD__ # if defined(ULTRIX) || (defined(BSD) && defined(POSIX_TYPES)) || 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 */ @ 1.14 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-ac,v 1.13 2003/09/02 00:30:55 pooka Exp $ @ 1.13 log @Update to NetHack 3.4.2 This is a bugfix release which fixes over 100 bugs including but not limited to: * Fixed a fatal bug that triggered a panic when your secondary weapon was cursed during bones file creation * Fixed a fatal bug that caused a crash when applying figurine, candle, or bell that gets used up for a complete list, see doc/fixes34.2 Old savegames and bones levels from nethack 3.4.1 (and 3.4.0) should still work, but as usual, caution is advised. @ text @d1 1 a1 1 $NetBSD$ d10 1 a10 1 +# if (!defined(SUNOS4) && !defined(bsdi) && !defined(__NetBSD__) && !defined(__FreeBSD__)) || defined(RANDOM) d14 1 a14 1 +# if !defined(bsdi) && !defined(__NetBSD__) && !defined(__FreeBSD__) d32 1 a32 1 +# if !(defined(ULTRIX_PROTO) && defined(__GNUC__)) && !defined(__NetBSD__) @ 1.12 log @improve chances these will work on FreeBSD @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.11 2003/03/01 21:12:51 pooka Exp $ d3 2 a4 2 --- include/system.h.orig 2003-02-23 16:43:22.000000000 +0200 +++ include/system.h 2003-03-01 16:34:46.000000000 +0200 d9 2 a10 2 -# if !defined(SUNOS4) || defined(RANDOM) +# if !defined(SUNOS4) && !defined(__FreeBSD__) && !defined(__NetBSD__) || defined(RANDOM) d14 1 a14 1 +# if !defined(bsdi) && !defined(__FreeBSD__) && !defined(__NetBSD__) d41 1 a41 1 # if defined(ULTRIX) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) || (defined(HPUX) && defined(_POSIX_SOURCE)) @ 1.11 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$ d10 1 a10 1 +# if !defined(SUNOS4) && !defined(__NetBSD__) || defined(RANDOM) @ 1.10 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: patch-ac,v 1.3 2000/08/10 17:50:06 pooka Exp $ d3 3 a5 3 --- 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 @@@@ d18 1 a18 1 @@@@ -130,7 +130,7 @@@@ d27 1 a27 1 @@@@ -413,7 +413,7 @@@@ d36 1 a36 1 @@@@ -513,11 +513,13 @@@@ @ 1.10.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-ac,v 1.10 2002/03/22 17:26:26 pooka Exp $ d3 3 a5 3 --- 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 @@@@ d18 1 a18 1 @@@@ -132,7 +132,7 @@@@ d27 1 a27 1 @@@@ -421,7 +421,7 @@@@ d36 1 a36 1 @@@@ -521,11 +521,13 @@@@ @ 1.9 log @Use x11.buildlink.mk instead of USE_X11. Also convert hard-coded references to ${X11BASE} in the header and library search paths into references to ${LOCALBASE}/share/x11-links. These packages should now be strongly- buildlinked regardless of whether xpkgwedge is installed. Changes well-tested on NetBSD-1.5X/i386 with and without xpkgwedge and lightly-tested on NetBSD-1.5.1/alpha without xpkgwedge. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.8 2001/06/26 19:10:18 jlam Exp $ d3 44 a46 5 --- sys/unix/Makefile.src.orig Sat Aug 5 13:52:57 2000 +++ sys/unix/Makefile.src Thu Aug 10 20:03:19 2000 @@@@ -144,8 +144,8 @@@@ # flags for debugging: # CFLAGS = -g -I../include d48 2 a49 36 -CFLAGS = -O -I../include -LFLAGS = +CFLAGS += -I../include -I${BUILDLINK_X11_DIR}/include +LFLAGS = ${LDFLAGS} # 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 @@@@ # # -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 @@@@ -230,7 +230,7 @@@@ # 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 -lX11 -lICE -lSM -lz -lpng -lXext # # libraries for KDE (with Qt) WINKDELIB = -lkdecore -lkdeui -lXext @@@@ -244,7 +244,7 @@@@ # libraries for BeOS WINBELIB = -lbe -WINLIB = $(WINTTYLIB) +WINLIB = $(WINQTLIB) # any other strange libraries your system needs (for Sysunix only -- the more # specialized targets should already be right) @ 1.8 log @Remove -O from CFLAGS...let the builder choose his/her own optimization level. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.7 2001/06/26 18:52:09 jlam Exp $ d11 1 a11 1 +CFLAGS += -I../include -I${X11BASE}/include d32 1 a32 1 +WINQTLIB = -Wl,-R$(QTDIR)/lib -L$(QTDIR)/lib -lqt -lXpm -lX11 -lICE -lSM -lz -lpng -lXext @ 1.7 log @Convert to use buildlink.mk files. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.6 2000/08/10 17:50:13 pooka Exp $ d11 1 a11 1 +CFLAGS += -O -I../include -I${X11BASE}/include @ 1.6 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 @d1 1 a1 1 $NetBSD$ d11 2 a12 2 +CFLAGS = -O -I../include -I${X11BASE}/include +LFLAGS = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib @ 1.5 log @update for new qt2 layout @ text @d3 3 a5 3 --- sys/unix/Makefile.src.orig Sat Dec 11 06:21:05 1999 +++ sys/unix/Makefile.src Fri Apr 28 11:50:01 2000 @@@@ -132,8 +132,8 @@@@ d10 1 a10 1 -LFLAGS = d14 3 a16 3 # Only used for Qt interface (other interfaces are standard C) CXXFLAGS = -g $(CFLAGS) -I. -I$(QTDIR)/include @@@@ -165,8 +165,8 @@@@ d19 1 a19 1 # d27 1 a27 1 @@@@ -192,14 +192,14 @@@@ d36 3 a38 2 # # @ 1.4 log @- sync with qt-2.0.2 path - remove the BROKEN! Thanks to pooka@@netbsd.org who fixed the remaining broken stuff. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.3 2000/04/06 18:00:14 dmcmahill Exp $ d3 4 a6 3 --- sys/unix/Makefile.src.orig Sat Dec 11 00:21:05 1999 +++ sys/unix/Makefile.src Thu Apr 6 11:54:15 2000 @@@@ -133,9 +133,9 @@@@ d15 3 a17 5 -CXXFLAGS = -g $(CFLAGS) -I. -I$(QTDIR)/include +CXXFLAGS = -g $(CFLAGS) -I. -I$(QTDIR)/include/qt2 # Qt is C++, so define the compiler and linker thus required: #CXX=g++ @@@@ -166,6 +166,6 @@@@ d26 3 a28 1 @@@@ -193,5 +193,5 @@@@ d32 1 a32 1 +WINQTLIB = -Wl,-R$(QTDIR)/lib/qt2 -L$(QTDIR)/lib/qt2 -lqt -lXpm -lX11 -lICE -lSM -lz -lpng -lXext d35 2 a36 1 @@@@ -200,5 +200,5 @@@@ d43 1 @ 1.3 log @-look in the right place for Qt includes. -add some extra libs during linking for ELF @ text @d1 1 a1 1 $NetBSD$ d15 1 a15 1 +CXXFLAGS = -g $(CFLAGS) -I. -I$(QTDIR)/include/qt d31 1 a31 1 +WINQTLIB = -Wl,-R$(QTDIR)/lib -L$(QTDIR)/lib -lqt -lXpm -lX11 -lICE -lSM -lz -lpng -lXext @ 1.2 log @update to point at qt-2.0.2. This pkg now compiles again (has been broken for some time). Leave marked as BROKEN because it complains of not finding a "tiles.xpm" file at run time. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.1 1999/12/24 22:30:03 pooka Exp $ d3 3 a5 4 --- 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: d11 1 a11 1 +LFLAGS = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib d14 5 a18 3 CXXFLAGS = -g $(CFLAGS) -I. -I$(QTDIR)/include @@@@ -165,8 +165,8 @@@@ d27 1 a27 3 # 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 d31 1 a31 1 +WINQTLIB = -Wl,-R$(QTDIR)/lib -L$(QTDIR)/lib -lqt -lXpm -lX11 d34 1 a34 2 WINKDELIB = -lkdecore -lkdeui -lXext # a40 1 # specialized targets should already be right) @ 1.1 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 @d1 1 a1 1 $NetBSD$ d12 1 a12 1 +LFLAGS = -Wl,-R${X11BASE}/lib -L${X11BASE} d32 1 a32 1 +WINQTLIB = -L$(QTDIR)/lib -lqt -lXpm @