diff options
23 files changed, 199 insertions, 286 deletions
diff --git a/games/nethack-lib/Makefile b/games/nethack-lib/Makefile index 5a08a32bd2c..6310e8af8ef 100644 --- a/games/nethack-lib/Makefile +++ b/games/nethack-lib/Makefile @@ -1,13 +1,9 @@ -# $NetBSD: Makefile,v 1.8 2000/07/17 15:37:15 agc Exp $ +# $NetBSD: Makefile,v 1.9 2000/08/10 17:50:04 pooka Exp $ # -DISTNAME= nethack-3.3.0 -PKGNAME= nethack-lib-3.3.0 -CATEGORIES= games -MASTER_SITES= ftp://ftp.win.tue.nl/pub/games/nethack.330/source/ +.include "../nethack-lib/Makefile.common" -MAINTAINER= root@garbled.net -HOMEPAGE= http://www.win.tue.nl/games/roguelike/nethack/ +PKGNAME= nethack-lib-${NETHACK_VERSION} HAS_CONFIGURE= yes CONFIGURE_SCRIPT= ./sys/unix/setup.sh @@ -16,22 +12,10 @@ INSTALL_TARGET= manpages install-dat DEINSTALL_FILE= ${WRKDIR}/DEINSTALL -.include "../../mk/bsd.prefs.mk" - .if ${OPSYS} == "SunOS" MAKE_FLAGS+= CC=gcc CPPFLAGS= .endif -pre-configure: - @${CHMOD} 755 ${WRKSRC}/sys/unix/setup.sh - -post-patch: - @${MV} ${WRKSRC}/include/config.h ${WRKSRC}/config.h-pre - @${SED} -e 's@XXXPREFIXXXX@${PREFIX}@g' \ - -e 's|@GZIP_PROGRAM@|'`${ECHO} ${GZIP_CMD} | ${AWK} '{ print $$1 }'`'|g' \ - ${WRKSRC}/config.h-pre > ${WRKSRC}/include/config.h - @${RM} -f ${WRKSRC}/config.h-pre - post-build: ${SED} -e 's|@PREFIX@|${PREFIX}|' ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} diff --git a/games/nethack-lib/Makefile.common b/games/nethack-lib/Makefile.common new file mode 100644 index 00000000000..0790d8fe6ab --- /dev/null +++ b/games/nethack-lib/Makefile.common @@ -0,0 +1,32 @@ +# $NetBSD: Makefile.common,v 1.1 2000/08/10 17:50:05 pooka Exp $ +# + +NETHACK_VERSION= 3.3.1 +NETHACK_DISTVER= 331 + +DISTNAME= nethack-${NETHACK_DISTVER} +CATEGORIES= games +MASTER_SITES= ftp://ftp.nethack.org/pub/nethack/nh331/src/ +EXTRACT_SUFX= .tgz + +MAINTAINER= root@garbled.net +HOMEPAGE= http://www.nethack.org/ + +WRKSRC= ${WRKDIR}/nethack-${NETHACK_VERSION} + +HAS_CONFIGURE= yes +CONFIGURE_SCRIPT= ./sys/unix/setup.sh + +MD5_FILE= "${.CURDIR}/../nethack-lib/files/md5" + +.include "../../mk/bsd.prefs.mk" + +pre-configure: + @${CHMOD} 755 ${WRKSRC}/sys/unix/setup.sh + +post-patch: + @${MV} ${WRKSRC}/include/config.h ${WRKSRC}/config.h-pre + @${SED} -e 's@XXXPREFIXXXX@${PREFIX}@g' \ + -e 's|@GZIP_PROGRAM@|'`${ECHO} ${GZIP_CMD} | ${AWK} '{ print $$1 }'`'|g' \ + < ${WRKSRC}/config.h-pre > ${WRKSRC}/include/config.h + @${RM} -f ${WRKSRC}/config.h-pre diff --git a/games/nethack-lib/files/md5 b/games/nethack-lib/files/md5 index b71189bc32a..aa14b9e23da 100644 --- a/games/nethack-lib/files/md5 +++ b/games/nethack-lib/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.3 1999/12/24 22:30:00 pooka Exp $ +$NetBSD: md5,v 1.4 2000/08/10 17:50:05 pooka Exp $ -MD5 (nethack-3.3.0.tar.gz) = cf9f4039408321f39c3ef733455cb73a +MD5 (nethack-331.tgz) = d0600ce4698c80e5ad1f917ded1c36d2 diff --git a/games/nethack-lib/files/patch-sum b/games/nethack-lib/files/patch-sum index fd0eb035dbb..1c6fa0f3ec6 100644 --- a/games/nethack-lib/files/patch-sum +++ b/games/nethack-lib/files/patch-sum @@ -1,9 +1,9 @@ -$NetBSD: patch-sum,v 1.5 2000/07/17 14:31:13 agc Exp $ +$NetBSD: patch-sum,v 1.6 2000/08/10 17:50:06 pooka Exp $ -MD5 (patch-aa) = 4d561cc88b548ab8fcc7953c18660d31 -MD5 (patch-ab) = 39341410ce990a7eb55beeef4af75855 -MD5 (patch-ac) = 4f89ee35a5901b7b8a8e376216c227ba +MD5 (patch-aa) = 98c413b5d1b5c3b021e30a91e1d6da0b +MD5 (patch-ab) = 705d3c572b63015fed5aa245c1f1bdda +MD5 (patch-ac) = d775a25ca6c4680d41858f2c52d1854c MD5 (patch-ad) = 1c894f6943c2b5edfcca5e36a6f43c4d -MD5 (patch-ae) = 0461964e1047cb98a734dfbe257e8325 -MD5 (patch-af) = ea67bbcb60a39b8fe0c7994b55d951e2 -MD5 (patch-ag) = 2498d677fef1a69f0c4ee79ab7d43f9b +MD5 (patch-ae) = aa584b7e7b691f5fd031efae81b9b142 +MD5 (patch-af) = e5bb0036820641290d4533457c6c4a31 +MD5 (patch-ag) = 44e6cdf2d18e24f5582a66fe27a21063 diff --git a/games/nethack-lib/patches/patch-aa b/games/nethack-lib/patches/patch-aa index 6ce5e484e3c..1a0cbbccd06 100644 --- a/games/nethack-lib/patches/patch-aa +++ b/games/nethack-lib/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.4 2000/07/17 14:31:13 agc Exp $ +$NetBSD: patch-aa,v 1.5 2000/08/10 17:50:06 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 @@ +--- include/config.h.orig Sat Jul 22 04:13:51 2000 ++++ include/config.h Thu Aug 10 17:39:35 2000 +@@ -151,11 +151,11 @@ #ifdef UNIX /* path and file name extension for compression program */ @@ -13,12 +13,12 @@ $NetBSD: patch-aa,v 1.4 2000/07/17 14:31:13 agc 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_EXTENSION ".gz" /* normal gzip extension */ ++#define COMPRESS "@GZIP_PROGRAM@" /* FSF gzip compression */ ++#define COMPRESS_EXTENSION ".gz" /* normal gzip extension */ #endif #ifndef COMPRESS -@@ -168,7 +168,7 @@ +@@ -186,7 +186,7 @@ * otherwise it will be the current directory. */ # ifndef HACKDIR @@ -27,21 +27,12 @@ $NetBSD: patch-aa,v 1.4 2000/07/17 14:31:13 agc Exp $ # endif /* -@@ -264,7 +264,7 @@ +@@ -282,7 +282,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 */ ++#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 */ -@@ -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) */ - - #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 3b2c20cbdfc..d60bd039552 100644 --- a/games/nethack-lib/patches/patch-ab +++ b/games/nethack-lib/patches/patch-ab @@ -1,13 +1,14 @@ -$NetBSD: patch-ab,v 1.3 2000/04/14 14:06:53 pooka Exp $ +$NetBSD: patch-ab,v 1.4 2000/08/10 17:50:06 pooka Exp $ ---- sys/unix/Makefile.top.orig Sat Dec 11 07:21:05 1999 -+++ sys/unix/Makefile.top Fri Apr 14 16:44:56 2000 -@@ -14,17 +14,16 @@ +--- sys/unix/Makefile.top.orig Tue Jul 4 03:42:05 2000 ++++ sys/unix/Makefile.top Thu Aug 10 18:12:00 2000 +@@ -14,18 +14,17 @@ # MAKE = make # make NetHack -PREFIX = /usr GAME = nethack + # GAME = nethack.prg -GAMEUID = games -GAMEGRP = bin +GAMEUID = root @@ -24,25 +25,26 @@ $NetBSD: patch-ab,v 1.3 2000/04/14 14:06:53 pooka Exp $ +DIRPERM = 0775 # GAMEDIR also appears in config.h as "HACKDIR". - # -@@ -33,13 +32,13 @@ + # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else GAMEDIR +@@ -35,14 +34,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 = $(PREFIX)/games/lib/$(GAME)dir --SHELLDIR = $(PREFIX)/games +GAMEDIR = $(PREFIX)/share/$(GAME)dir + VARDIR = $(GAMEDIR) +-SHELLDIR = $(PREFIX)/games +SHELLDIR = $(PREFIX)/bin # per discussion in Install.X11 and Install.Qt - VARDATND = +-VARDATND = # VARDATND = x11tiles pet_mark.xbm -# VARDATND = x11tiles pet_mark.xbm rip.xpm +VARDATND = x11tiles pet_mark.xbm rip.xpm - - VARDATD = data oracles options quest.dat rumors - VARDAT = $(VARDATD) $(VARDATND) -@@ -76,9 +75,12 @@ + # for Atari/Gem + # VARDATND = nh16.img title.img GEM_RSC.RSC + # for BeOS +@@ -87,9 +85,12 @@ $(GAME): ( cd src ; $(MAKE) ) @@ -51,12 +53,12 @@ $NetBSD: patch-ab,v 1.3 2000/04/14 14:06:53 pooka Exp $ @echo "Done." +datastuff: Guidebook $(VARDAT) dungeon spec_levs check-dlb recover -+ @echo "Data Sets Built" ++ @echo "Data Sets Built." + Guidebook: ( cd doc ; $(MAKE) Guidebook ) -@@ -88,6 +90,9 @@ +@@ -99,6 +100,9 @@ data: ( cd dat ; $(MAKE) data ) @@ -66,21 +68,19 @@ $NetBSD: patch-ab,v 1.3 2000/04/14 14:06:53 pooka Exp $ rumors: ( cd dat ; $(MAKE) rumors ) -@@ -128,7 +133,12 @@ +@@ -156,6 +160,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 \ - -e '/librarian/{' \ -@@ -137,16 +147,13 @@ +@@ -165,16 +174,13 @@ -e '}' \ -e '$$s/.*/nodlb/p' < dat/options` ; \ $(MAKE) dofiles-$${target-nodlb} @@ -98,21 +98,21 @@ $NetBSD: patch-ab,v 1.3 2000/04/14 14:06:53 pooka Exp $ -$(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME) $(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME) chmod $(EXEPERM) $(SHELLDIR)/$(GAME) -@@ -182,10 +189,10 @@ +@@ -210,11 +216,10 @@ # 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 - -mkdir $(SHELLDIR) -- -rm -rf $(GAMEDIR) -+# -rm -rf $(GAMEDIR) - -mkdir $(GAMEDIR) $(GAMEDIR)/save - -$(CHOWN) $(GAMEUID) $(GAMEDIR) $(GAMEDIR)/save - $(CHGRP) $(GAMEGRP) $(GAMEDIR) $(GAMEDIR)/save -@@ -197,6 +204,14 @@ - -( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) perm record logfile ; \ + # not all mkdirs have -p; those that don't will create a -p directory + -mkdir -p $(SHELLDIR) +- -rm -rf $(GAMEDIR) $(VARDIR) + -mkdir -p $(GAMEDIR) $(VARDIR) $(VARDIR)/save + -rmdir ./-p + -$(CHOWN) $(GAMEUID) $(GAMEDIR) $(VARDIR) $(VARDIR)/save +@@ -227,6 +232,14 @@ + -( cd $(VARDIR) ; $(CHOWN) $(GAMEUID) perm record logfile ; \ $(CHGRP) $(GAMEGRP) perm record logfile ; \ chmod $(FILEPERM) perm record logfile ) + -mkdir -p $(PREFIX)/share/doc/nethack diff --git a/games/nethack-lib/patches/patch-ac b/games/nethack-lib/patches/patch-ac index cff66dccea1..52eed9f850a 100644 --- a/games/nethack-lib/patches/patch-ac +++ b/games/nethack-lib/patches/patch-ac @@ -1,17 +1,17 @@ -$NetBSD: patch-ac,v 1.2 1999/12/24 22:30:00 pooka Exp $ +$NetBSD: patch-ac,v 1.3 2000/08/10 17:50:06 pooka Exp $ ---- include/system.h.orig Sat Dec 11 07:20:51 1999 -+++ include/system.h Thu Dec 23 22:12:04 1999 +--- 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 @@ # if !defined(__SC__) && !defined(LINUX) E long NDECL(random); # endif -# if !defined(SUNOS4) || defined(RANDOM) -+# if (!defined(SUNOS4) && !defined(__NetBSD__)) || defined(RANDOM) ++# if !defined(SUNOS4) && !defined(__NetBSD__) || defined(RANDOM) E void FDECL(srandom, (unsigned int)); # else --# ifndef bsdi -+# if !defined(bsdi) && !defined(__NetBSD__) +-# if !defined(bsdi) && !defined(__FreeBSD__) ++# if !defined(bsdi) && !defined(__FreeBSD__) && !defined(__NetBSD__) E int FDECL(srandom, (unsigned int)); # endif # endif @@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.2 1999/12/24 22:30:00 pooka Exp $ int(*)(const genericptr,const genericptr))); #else -# if defined(BSD) || defined(ULTRIX) -+# if (defined(BSD) || defined(ULTRIX)) && !defined(__NetBSD__) ++# if defined(BSD) || defined(ULTRIX) && !defined(__NetBSD__) E int qsort(); # else # if !defined(LATTICE) && !defined(AZTEC_50) diff --git a/games/nethack-lib/patches/patch-ae b/games/nethack-lib/patches/patch-ae index 0dee1364566..b2fb32669d3 100644 --- a/games/nethack-lib/patches/patch-ae +++ b/games/nethack-lib/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.2 1999/12/24 22:30:01 pooka Exp $ +$NetBSD: patch-ae,v 1.3 2000/08/10 17:50:07 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 @@ +--- 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 @@ GAME = nethack diff --git a/games/nethack-lib/patches/patch-af b/games/nethack-lib/patches/patch-af index 6503c9850a8..9b8feae32b3 100644 --- a/games/nethack-lib/patches/patch-af +++ b/games/nethack-lib/patches/patch-af @@ -1,20 +1,20 @@ -$NetBSD: patch-af,v 1.1 1999/12/24 22:30:01 pooka Exp $ +$NetBSD: patch-af,v 1.2 2000/08/10 17:50:07 pooka Exp $ ---- include/unixconf.h.orig Sat Dec 11 07:20:51 1999 -+++ include/unixconf.h Thu Dec 23 22:14:04 1999 +--- include/unixconf.h.orig Mon Jul 17 04:03:51 2000 ++++ include/unixconf.h Thu Aug 10 18:30:45 2000 @@ -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 */ ++#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 */ ++/* #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 */ @@ -22,20 +22,20 @@ $NetBSD: patch-af,v 1.1 1999/12/24 22:30:01 pooka Exp $ /* 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 */ ++/* #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 +@@ -47,7 +47,7 @@ * 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 */ ++/* #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 @@ +@@ -168,11 +168,15 @@ #ifdef MAIL # if defined(BSD) || defined(ULTRIX) @@ -51,30 +51,4 @@ $NetBSD: patch-af,v 1.1 1999/12/24 22:30:01 pooka Exp $ +# 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 + # if defined(M_XENIX) || defined(__FreeBSD__) diff --git a/games/nethack-lib/patches/patch-ag b/games/nethack-lib/patches/patch-ag index 3f43f068738..88fe200433e 100644 --- a/games/nethack-lib/patches/patch-ag +++ b/games/nethack-lib/patches/patch-ag @@ -1,21 +1,13 @@ -$NetBSD: patch-ag,v 1.1 1999/12/24 22:30:01 pooka Exp $ +$NetBSD: patch-ag,v 1.2 2000/08/10 17:50:07 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 */ - +--- src/mail.c.orig Wed Aug 9 21:02:04 2000 ++++ src/mail.c Thu Aug 10 18:32:30 2000 +@@ -71,7 +71,7 @@ + # if !defined(MAILPATH) && (defined(LINUX) || defined(__osf__)) + # define MAILPATH "/var/spool/mail/" + # endif +-# if !defined(MAILPATH) && defined(__FreeBSD__) ++# if !defined(MAILPATH) && (defined(__FreeBSD__) || defined(__NetBSD__)) + # define MAILPATH "/var/mail/" + # endif + # if !defined(MAILPATH) && (defined(BSD) || defined(ULTRIX)) diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile index 91dcb849592..9fb093c0444 100644 --- a/games/nethack-qt/Makefile +++ b/games/nethack-qt/Makefile @@ -1,24 +1,16 @@ -# $NetBSD: Makefile,v 1.19 2000/07/15 20:39:18 agc Exp $ +# $NetBSD: Makefile,v 1.20 2000/08/10 17:50:10 pooka Exp $ # -DISTNAME= nethack-3.3.0 -PKGNAME= nethack-qt-3.3.0 -CATEGORIES= games x11 -MASTER_SITES= ftp://ftp.win.tue.nl/pub/games/nethack.330/source/ +.include "../nethack-lib/Makefile.common" -MAINTAINER= root@garbled.net -HOMEPAGE= http://trolls.troll.no/warwick/nethack/ +PKGNAME= nethack-qt-${NETHACK_VERSION} +CATEGORIES+= x11 -DEPENDS+= nethack-lib-3.3.0:../nethack-lib +DEPENDS+= nethack-lib-${NETHACK_VERSION}:../nethack-lib DEPENDS+= xpm-3.4k:../../graphics/xpm DEPENDS+= qt2-2.0.2:../../x11/qt -WRKSRC= ${WRKDIR}/nethack-3.3.0 - USE_X11= yes -USE_GMAKE= yes -HAS_CONFIGURE= yes -CONFIGURE_SCRIPT= ./sys/unix/setup.sh ALL_TARGET= x11tiles nethack INSTALL_TARGET= binfiles @@ -29,16 +21,6 @@ MAKE_ENV+= GTYPE=-qt QTDIR=${QT2DIR}/qt2 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@XXXPREFIXXXX@${PREFIX}@g' <${WRKSRC}/foo> ${WRKSRC}/include/config.h - @${RM} -f ${WRKSRC}/foo - post-install: @${CP} -f ${WRKSRC}/dat/x11tiles ${WRKSRC}/dat/tiles.xpm @${INSTALL_DATA} ${WRKSRC}/dat/tiles.xpm ${PREFIX}/share/nethackdir diff --git a/games/nethack-qt/files/patch-sum b/games/nethack-qt/files/patch-sum index 2b957f9dac0..3f9f3d8952c 100644 --- a/games/nethack-qt/files/patch-sum +++ b/games/nethack-qt/files/patch-sum @@ -1,6 +1,5 @@ -$NetBSD: patch-sum,v 1.7 2000/04/28 10:12:43 drochner Exp $ +$NetBSD: patch-sum,v 1.8 2000/08/10 17:50:10 pooka Exp $ -MD5 (patch-aa) = a009a4ece6a091f6c1055708aac55ace -MD5 (patch-ab) = 329300bb675c34e2d95099b7452b39fc -MD5 (patch-ac) = c4b1ccf2bc98708940b3b46dfd35c453 -MD5 (patch-ad) = 2dc6f7ee1e0d58c0207d648258a30d85 +MD5 (patch-aa) = 26cd05907c0b14df0da9f319d78008a9 +MD5 (patch-ac) = 261fede1e7eb1d94f33b36447c7281c7 +MD5 (patch-ad) = 1b71accc5cf87b03e8c8b905cc832347 diff --git a/games/nethack-qt/patches/patch-aa b/games/nethack-qt/patches/patch-aa index 6afabb0f073..e039d77df09 100644 --- a/games/nethack-qt/patches/patch-aa +++ b/games/nethack-qt/patches/patch-aa @@ -1,16 +1,16 @@ -$NetBSD: patch-aa,v 1.4 1999/12/24 22:30:03 pooka Exp $ +$NetBSD: patch-aa,v 1.5 2000/08/10 17:50:11 pooka Exp $ ---- include/config.h.orig Wed Dec 22 22:13:56 1999 -+++ include/config.h Wed Dec 22 22:26:48 1999 +--- include/config.h.orig Sat Jul 22 04:13:51 2000 ++++ include/config.h Thu Aug 10 19:55:36 2000 @@ -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 X11_GRAPHICS */ /* X11 interface */ -/* #define QT_GRAPHICS */ /* Qt interface */ -+#define QT_GRAPHICS /* Qt interface */ ++#define QT_GRAPHICS */ /* Qt interface */ + /* #define GNOME_GRAPHICS */ /* Gnome 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 deleted file mode 100644 index 8ba17543542..00000000000 --- a/games/nethack-qt/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$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 index ad9fdc80fd4..540493101eb 100644 --- a/games/nethack-qt/patches/patch-ac +++ b/games/nethack-qt/patches/patch-ac @@ -1,22 +1,22 @@ -$NetBSD: patch-ac,v 1.5 2000/04/28 10:12:44 drochner Exp $ +$NetBSD: patch-ac,v 1.6 2000/08/10 17:50:13 pooka Exp $ ---- 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 @@ +--- 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 -CFLAGS = -O -I../include --LFLAGS = +-LFLAGS = +CFLAGS = -O -I../include -I${X11BASE}/include +LFLAGS = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib - # Only used for Qt interface (other interfaces are standard C) - CXXFLAGS = -g $(CFLAGS) -I. -I$(QTDIR)/include -@@ -165,8 +165,8 @@ + # 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) @@ -24,7 +24,7 @@ $NetBSD: patch-ac,v 1.5 2000/04/28 10:12:44 drochner 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 -@@ -192,14 +192,14 @@ +@@ -230,7 +230,7 @@ # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0 # # libraries for Qt @@ -33,8 +33,9 @@ $NetBSD: patch-ac,v 1.5 2000/04/28 10:12:44 drochner Exp $ # # libraries for KDE (with Qt) WINKDELIB = -lkdecore -lkdeui -lXext - # - # +@@ -244,7 +244,7 @@ + # libraries for BeOS + WINBELIB = -lbe -WINLIB = $(WINTTYLIB) +WINLIB = $(WINQTLIB) diff --git a/games/nethack-qt/patches/patch-ad b/games/nethack-qt/patches/patch-ad index 92cb0b251b6..8bc0ce66e58 100644 --- a/games/nethack-qt/patches/patch-ad +++ b/games/nethack-qt/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.1 2000/04/14 17:31:27 pooka Exp $ +$NetBSD: patch-ad,v 1.2 2000/08/10 17:50:14 pooka Exp $ ---- win/Qt/qt_win.cpp.orig Sat Dec 11 07:21:09 1999 -+++ win/Qt/qt_win.cpp Fri Apr 14 17:16:15 2000 -@@ -3410,7 +3410,7 @@ +--- 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 @@ NetHackQtGlyphs::NetHackQtGlyphs() { diff --git a/games/nethack-tty/Makefile b/games/nethack-tty/Makefile index ba59d127833..4fb092c946a 100644 --- a/games/nethack-tty/Makefile +++ b/games/nethack-tty/Makefile @@ -1,31 +1,16 @@ -# $NetBSD: Makefile,v 1.6 2000/03/27 08:54:56 tron Exp $ +# $NetBSD: Makefile,v 1.7 2000/08/10 17:50:07 pooka Exp $ +# -DISTNAME= nethack-3.3.0 -PKGNAME= nethack-tty-3.3.0 -CATEGORIES= games -MASTER_SITES= ftp://ftp.win.tue.nl/pub/games/nethack.330/source/ +.include "../nethack-lib/Makefile.common" -MAINTAINER= root@garbled.net -HOMEPAGE= http://www.win.tue.nl/games/roguelike/nethack/ +PKGNAME= nethack-tty-${NETHACK_VERSION} -DEPENDS+= nethack-lib-3.3.0:../nethack-lib +DEPENDS+= nethack-lib-${NETHACK_VERSION}:../nethack-lib -HAS_CONFIGURE= yes -CONFIGURE_SCRIPT= ./sys/unix/setup.sh ALL_TARGET= nethack INSTALL_TARGET= binfiles 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@XXXPREFIXXXX@${PREFIX}@g' <${WRKSRC}/foo> ${WRKSRC}/include/config.h - @${RM} -f ${WRKSRC}/foo +PATCHDIR= "${.CURDIR}/../nethack-lib/patches" .include "../../mk/bsd.pkg.mk" diff --git a/games/nethack-tty/files/patch-sum b/games/nethack-tty/files/patch-sum index da94abbbd7d..6658ecddf8b 100644 --- a/games/nethack-tty/files/patch-sum +++ b/games/nethack-tty/files/patch-sum @@ -1,9 +1,9 @@ -$NetBSD: patch-sum,v 1.5 2000/07/17 14:31:14 agc Exp $ +$NetBSD: patch-sum,v 1.6 2000/08/10 17:50:08 pooka Exp $ -MD5 (patch-aa) = 4d561cc88b548ab8fcc7953c18660d31 -MD5 (patch-ab) = 39341410ce990a7eb55beeef4af75855 -MD5 (patch-ac) = 4f89ee35a5901b7b8a8e376216c227ba +MD5 (patch-aa) = 98c413b5d1b5c3b021e30a91e1d6da0b +MD5 (patch-ab) = 705d3c572b63015fed5aa245c1f1bdda +MD5 (patch-ac) = d775a25ca6c4680d41858f2c52d1854c MD5 (patch-ad) = 1c894f6943c2b5edfcca5e36a6f43c4d -MD5 (patch-ae) = 0461964e1047cb98a734dfbe257e8325 -MD5 (patch-af) = ea67bbcb60a39b8fe0c7994b55d951e2 -MD5 (patch-ag) = 2498d677fef1a69f0c4ee79ab7d43f9b +MD5 (patch-ae) = aa584b7e7b691f5fd031efae81b9b142 +MD5 (patch-af) = e5bb0036820641290d4533457c6c4a31 +MD5 (patch-ag) = 44e6cdf2d18e24f5582a66fe27a21063 diff --git a/games/nethack-x11/Makefile b/games/nethack-x11/Makefile index 2679a51301f..b810648a445 100644 --- a/games/nethack-x11/Makefile +++ b/games/nethack-x11/Makefile @@ -1,20 +1,16 @@ -# $NetBSD: Makefile,v 1.7 2000/03/27 08:54:56 tron Exp $ +# $NetBSD: Makefile,v 1.8 2000/08/10 17:50:08 pooka Exp $ # -DISTNAME= nethack-3.3.0 -PKGNAME= nethack-x11-3.3.0 -CATEGORIES= games x11 -MASTER_SITES= ftp://ftp.win.tue.nl/pub/games/nethack.330/source/ +.include "../nethack-lib/Makefile.common" -MAINTAINER= root@garbled.net -HOMEPAGE= http://www.win.tue.nl/games/roguelike/nethack/ +PKGNAME= nethack-x11-${NETHACK_VERSION} -DEPENDS+= nethack-lib-3.3.0:../nethack-lib +CATEGORIES+= x11 + +DEPENDS+= nethack-lib-${NETHACK_VERSION}:../nethack-lib DEPENDS+= xpm-3.4k:../../graphics/xpm USE_X11= yes -HAS_CONFIGURE= yes -CONFIGURE_SCRIPT= ./sys/unix/setup.sh ALL_TARGET= nethack INSTALL_TARGET= binfiles MAKE_ENV+= GTYPE=-x11 @@ -22,14 +18,4 @@ 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@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/patch-sum b/games/nethack-x11/files/patch-sum index fe7de58b355..f853693b864 100644 --- a/games/nethack-x11/files/patch-sum +++ b/games/nethack-x11/files/patch-sum @@ -1,4 +1,4 @@ -$NetBSD: patch-sum,v 1.2 1999/12/24 22:30:06 pooka Exp $ +$NetBSD: patch-sum,v 1.3 2000/08/10 17:50:09 pooka Exp $ -MD5 (patch-aa) = 540c8a6f9754f529e48bffc5d59e3432 -MD5 (patch-ab) = f02f85296c63fd87802f371b68000666 +MD5 (patch-aa) = a155b03ccd55374b567fbbbd38599d17 +MD5 (patch-ab) = 2a28cc997f121bf671aa252910d5c5d6 diff --git a/games/nethack-x11/patches/patch-aa b/games/nethack-x11/patches/patch-aa index f8d4d93c018..82d62c8fa5d 100644 --- a/games/nethack-x11/patches/patch-aa +++ b/games/nethack-x11/patches/patch-aa @@ -1,19 +1,19 @@ -$NetBSD: patch-aa,v 1.2 1999/12/24 22:30:07 pooka Exp $ +$NetBSD: patch-aa,v 1.3 2000/08/10 17:50:09 pooka Exp $ ---- include/config.h.orig Sat Dec 11 07:20:49 1999 -+++ include/config.h Wed Dec 22 21:41:41 1999 +--- include/config.h.orig Sat Jul 22 04:13:51 2000 ++++ include/config.h Thu Aug 10 19:25:21 2000 @@ -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 */ + /* #define GNOME_GRAPHICS */ /* Gnome interface */ - /* -@@ -80,7 +80,7 @@ +@@ -98,7 +98,7 @@ #endif #ifndef DEFAULT_WINDOW_SYS @@ -22,12 +22,12 @@ $NetBSD: patch-aa,v 1.2 1999/12/24 22:30:07 pooka Exp $ #endif #ifdef X11_GRAPHICS -@@ -92,7 +92,7 @@ +@@ -110,7 +110,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 */ # 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 7d207cf799a..bbd9ccb8a87 100644 --- a/games/nethack-x11/patches/patch-ab +++ b/games/nethack-x11/patches/patch-ab @@ -1,22 +1,22 @@ -$NetBSD: patch-ab,v 1.3 1999/12/24 22:30:07 pooka Exp $ +$NetBSD: patch-ab,v 1.4 2000/08/10 17:50:09 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 @@ +--- sys/unix/Makefile.src.orig Sat Aug 5 13:52:57 2000 ++++ sys/unix/Makefile.src Thu Aug 10 19:28:31 2000 +@@ -144,8 +144,8 @@ # flags for debugging: # CFLAGS = -g -I../include -CFLAGS = -O -I../include --LFLAGS = +-LFLAGS = +CFLAGS = -O -I../include -I${X11BASE}/include +LFLAGS = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib - # Only used for Qt interface (other interfaces are standard C) - CXXFLAGS = -g $(CFLAGS) -I. -I$(QTDIR)/include -@@ -165,8 +165,8 @@ + # 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 = $(WINX11SRC) @@ -24,7 +24,7 @@ $NetBSD: patch-ab,v 1.3 1999/12/24 22:30:07 pooka 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 -@@ -186,7 +186,7 @@ +@@ -224,7 +224,7 @@ # # libraries for X11 # If USE_XPM is defined in config.h, you will also need -lXpm here. @@ -33,9 +33,9 @@ $NetBSD: patch-ab,v 1.3 1999/12/24 22:30:07 pooka Exp $ # WINX11LIB = -lXaw -lXmu -lXt -lX11 # 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 @@ - # - # +@@ -244,7 +244,7 @@ + # libraries for BeOS + WINBELIB = -lbe -WINLIB = $(WINTTYLIB) +WINLIB = $(WINX11LIB) diff --git a/games/nethack/Makefile b/games/nethack/Makefile index 30cb3aa0eb9..dab6b07bede 100644 --- a/games/nethack/Makefile +++ b/games/nethack/Makefile @@ -1,15 +1,15 @@ -# $NetBSD: Makefile,v 1.6 1999/12/24 22:29:58 pooka Exp $ +# $NetBSD: Makefile,v 1.7 2000/08/10 17:50:04 pooka Exp $ -DISTNAME= nethack-all-3.3.0 -CATEGORIES= games x11 +.include "../nethack-lib/Makefile.common" + +DISTNAME= nethack-all-${NETHACK_VERSION} +CATEGORIES+= x11 MASTER_SITES= # empty DISTFILES= # empty -MAINTAINER= root@garbled.net - -DEPENDS+= nethack-tty-3.3.0:../nethack-tty -DEPENDS+= nethack-x11-3.3.0:../nethack-x11 -#DEPENDS+= nethack-qt-3.3.0:../nethack-qt +DEPENDS+= nethack-tty-${NETHACK_VERSION}:../nethack-tty +DEPENDS+= nethack-x11-${NETHACK_VERSION}:../nethack-x11 +DEPENDS+= nethack-qt-${NETHACK_VERSION}:../nethack-qt USE_X11= yes EXTRACT_ONLY= # empty |