From 5a4c76b5ec75e1c65dcf478cf194be80e80c1cc4 Mon Sep 17 00:00:00 2001 From: xtraeme Date: Tue, 25 Jan 2005 16:02:26 +0000 Subject: Merge xevil from pkgsrc-wip, update to 2.02. Lots of changes. --- games/xevil/Makefile | 42 ++++++++++++++++--------- games/xevil/PLIST | 2 +- games/xevil/distinfo | 32 +++++++++++++------ games/xevil/patches/patch-aa | 74 ++++++++++++++------------------------------ games/xevil/patches/patch-ab | 40 ++++++++---------------- games/xevil/patches/patch-ac | 54 ++++++++------------------------ games/xevil/patches/patch-ad | 2 +- games/xevil/patches/patch-ae | 2 +- games/xevil/patches/patch-af | 2 +- 9 files changed, 103 insertions(+), 147 deletions(-) (limited to 'games') diff --git a/games/xevil/Makefile b/games/xevil/Makefile index 84ddcdd9d0f..b99a0022d00 100644 --- a/games/xevil/Makefile +++ b/games/xevil/Makefile @@ -1,21 +1,33 @@ -# $NetBSD: Makefile,v 1.10 2004/05/23 20:58:42 danw Exp $ +# $NetBSD: Makefile,v 1.11 2005/01/25 16:02:26 xtraeme Exp $ -DISTNAME= xevil1.5.1e -PKGNAME= xevil-1.5.1e -CATEGORIES= games x11 -MASTER_SITES= ftp://ftp.xevil.com/xevil1.5.1e/ -EXTRACT_SUFX= .tar.Z +DISTNAME= xevilsrc2.02r2 +PKGNAME= xevil-2.02 +CATEGORIES= games x11 +MASTER_SITES= http://www.xevil.com/download/stable/ +EXTRACT_SUFX= .zip -MAINTAINER= root@garbled.net -HOMEPAGE= http://www.xevil.com/ -COMMENT= Violent game of killing, contains profanity +MAINTAINER= snj@pobox.com +HOMEPAGE= http://www.xevil.com/ +COMMENT= Side scrolling, bloody action game -MAKE_ENV= HOSTTYPE="netbsd" \ - INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - INSTALL_MAN="${INSTALL_MAN}" +MAKEFILE= makefile -WRKSRC= ${WRKDIR} -USE_X11BASE= yes -USE_BUILDLINK3= yes +USE_BUILDLINK3= yes +USE_X11= yes +BUILD_TARGET= pkgsrc +WRKSRC= ${WRKDIR} +MAKE_ENV+= HOSTTYPE="pkgsrc" + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/x11/PKGSRC/xevil ${PREFIX}/bin/xevil + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xevil + ${INSTALL_DATA} ${WRKSRC}/instructions/* ${PREFIX}/share/doc/xevil + +SUBST_CLASSES+= uname +SUBST_STAGE.uname= pre-configure +SUBST_FILES.uname= cmn/utils.cpp +SUBST_SED.uname= -e 's,@UNAME@,${UNAME},g' + +.include "../../graphics/xpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xevil/PLIST b/games/xevil/PLIST index 50e5645f20d..8db73019272 100644 --- a/games/xevil/PLIST +++ b/games/xevil/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2005/01/25 15:59:27 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.2 2005/01/25 16:02:26 xtraeme Exp $ bin/xevil share/doc/xevil/UNIXSetControls.gif share/doc/xevil/UNIXShowControls.gif diff --git a/games/xevil/distinfo b/games/xevil/distinfo index cc3553a6c8e..29f5d48eb8b 100644 --- a/games/xevil/distinfo +++ b/games/xevil/distinfo @@ -1,10 +1,24 @@ -$NetBSD: distinfo,v 1.3 2004/03/26 01:34:08 kristerw Exp $ +$NetBSD: distinfo,v 1.4 2005/01/25 16:02:26 xtraeme Exp $ -SHA1 (xevil1.5.1e.tar.Z) = a4b1fc0264ddd9c73e60d28442f5328c1a1bc060 -Size (xevil1.5.1e.tar.Z) = 475173 bytes -SHA1 (patch-aa) = 310dbab8e8921d4cef9e336052e8bbd0a32f704a -SHA1 (patch-ab) = e366f13447a1756c3328afaa56ae8ae383a904e7 -SHA1 (patch-ac) = 3287d782b176e4500f4499da8f0487a4ebefe560 -SHA1 (patch-ad) = 1c227ab65c6318a170020fb9f3aa4e8e50119532 -SHA1 (patch-ae) = 561ecff4dbdba9fa579558ea29eb2e3e58c2f2f1 -SHA1 (patch-af) = fc095d1b89d340a1325e5142d48dae5041925754 +SHA1 (xevilsrc2.02r2.zip) = e9a262daffc7ee5c06196dc94cf35c199be86bbc +Size (xevilsrc2.02r2.zip) = 1857315 bytes +SHA1 (patch-aa) = 7421021c8b5f486a031959db9ac3e7a1197f7763 +SHA1 (patch-ab) = 10416465eb62f034b111971530f6c1897bce3266 +SHA1 (patch-ac) = 470479cc03cbd3cc35b5c12560868a18845cdf35 +SHA1 (patch-ad) = df17b2c15b3eedaebd62e1de9e08fd01f98c37f0 +SHA1 (patch-ae) = bd4c1811aabf3791563a80c392afe96e0c4ed749 +SHA1 (patch-af) = 4d1e6e7cfa7c1b4423ac9edc8f3ece68dbab9b79 +SHA1 (patch-ag) = 5ee9ccf572cb917247143d345a0889f0698d236a +SHA1 (patch-ah) = 4417e17e9e924a8d0c04565b8c731abc78c0bf7b +SHA1 (patch-ai) = ed5d1660d59835de2b0cae8ebe65432351d0751b +SHA1 (patch-aj) = e7ec143b757de6f07693bc6e192f6d9e913ce252 +SHA1 (patch-ak) = 48f2a6c563a5e51ff28da4f5715a56276dbd63a7 +SHA1 (patch-al) = b95b608016cb6d43ca3f6d7cbc08e0b09e15ba89 +SHA1 (patch-am) = 9250c6c734b22f1edf63040e2c70579917593f59 +SHA1 (patch-an) = 4325b3ff1f32a9b09b540bcc0b482acdf8e96237 +SHA1 (patch-ao) = 894c12c2012bfbd2273bfdd82a09b417fd0e9682 +SHA1 (patch-ap) = a4e4ab0655c218c18d195964ed65db2e1487c895 +SHA1 (patch-aq) = 2a781bd3118bda38244f7b7a0bb1a202a90c3983 +SHA1 (patch-ar) = 69e9198268259cb5df1e7b2a08472c403e89ff5d +SHA1 (patch-as) = f44ccd51c55d89bd3cd04c480ff8cd902da62e50 +SHA1 (patch-at) = 308f449ad894daba7da6ad6e6c2239e2d713b660 diff --git a/games/xevil/patches/patch-aa b/games/xevil/patches/patch-aa index 0d77bc94903..41f10afb347 100644 --- a/games/xevil/patches/patch-aa +++ b/games/xevil/patches/patch-aa @@ -1,57 +1,29 @@ -$NetBSD: patch-aa,v 1.3 1998/08/27 14:06:10 garbled Exp $ +$NetBSD: patch-aa,v 1.4 2005/01/25 16:02:26 xtraeme Exp $ ---- Makefile.orig Tue Oct 1 19:50:59 1996 -+++ Makefile Fri Jul 31 09:49:41 1998 -@@ -8,8 +8,8 @@ - #### Defines that are applicable to makes on all architectures - SHELL = /bin/sh - TARGETS = xevil #xshow --DEBUG_OPT = -g# #-DPRINT_ERRORS --LINK_OPT = #-O -+DEBUG_OPT = -O# #-DPRINT_ERRORS -+LINK_OPT = -Wl,-R$(X11BASE)/lib #-O +--- config.mk.orig 2003-03-23 00:08:58.000000000 +0000 ++++ config.mk 2003-08-16 11:05:41.000000000 +0000 +@@ -36,7 +36,7 @@ + # internally, so you do so at your own risk. + DEBUG_OPT = -O #-DNDEBUG - #SRC_DIR and WORK_DIR are only used for `make workdir` - SRC_DIR = /mit/hardts/src/X/xevil1.4.9 -@@ -22,7 +22,7 @@ - OBJS = physical.o actual.o game.o main.o intel.o locator.o world.o \ - ui.o coord.o area.o utils.o - ARCHITECTURES = athena-sun4 athena-sun5 alpha decmips ds decstation \ -- freebsd hp700 iris4d \ -+ freebsd hp700 iris4d netbsd \ - jsc-sun4 i386-linux rsaix sun4 sun5 vision-sun4 - STRIP = strip +-LINK_OPT = ++LINK_OPT = $(COMPILER_RPATH_FLAG)$(X11BASE)/lib -@@ -33,6 +33,8 @@ + # The string that will be used for making the packaged .tar.Z file. + VERSION = 2.02r2 +@@ -160,11 +160,11 @@ - #### Attempt to guesss the host architecture using the HOSTYPE and hostype - # variables. Then call self with the architecture name. -+all: default -+ - default: - @if [ $${HOSTTYPE-bob} != bob ] ; then \ - archit=$$HOSTTYPE ; \ -@@ -50,7 +52,9 @@ - echo "{$(ARCHITECTURES)}" ; \ - fi ; + # The -DMSEC_PER_CLOCK=8 is kind of a hack, take it out if the game speed of + # XEvil is all screwed up. +-freebsd: ++pkgsrc: + @$(MAKE) CC="c++" \ +-CFLAGS="-DUSE_RANDOM -DPROTECTED_IS_PUBLIC -DMSEC_PER_CLOCK=8 -DUNAME_USR_BIN" \ +-INCL_DIRS="-I/usr/X11R6/include" LIBS_DIRS="-L/usr/X11R6/lib" \ +-OBJ_DIR=$(DEPTH)/x11/FREEBSD PCKG_NAME="freebsd" \ ++CFLAGS="-DUSE_RANDOM -DPROTECTED_IS_PUBLIC -DUSE_UINT_NET_LENGTH ${CFLAGS}" \ ++INCL_DIRS="-I$(X11BASE)/include" LIBS_DIRS="-L$(X11BASE)/lib" \ ++OBJ_DIR=$(DEPTH)/x11/PKGSRC PCKG_NAME="pkgsrc" \ + LIBS="-lXpm -lX11 -lm" $(TARGETS) -- -+install: xevil -+ ${INSTALL_PROGRAM} xevil ${PREFIX}/bin -+ ${INSTALL_MAN} xevil.6 ${PREFIX}/man/man6 - #### Specific architectures. - ## Feel free to modify one of these to accomodate your machine's configuration. -@@ -100,7 +104,11 @@ - INCL_DIRS=-I/usr/X11R6/include LIBS_DIRS=-L/usr/X11R6/lib \ - LIBS="-lX11 -lm" $(TARGETS) - -- -+netbsd: -+ @$(MAKE) CC="c++" \ -+CFLAGS="-DUSE_RANDOM -DPROTECTED_IS_PUBLIC -DMSEC_PER_CLOCK=8" \ -+INCL_DIRS=-I$(X11BASE)/include LIBS_DIRS=-L$(X11BASE)/lib \ -+LIBS="-lX11 -lm" $(TARGETS) - - hp700: - @$(MAKE) CC="g++" LIBS="-lX11 -lm" INCL_DIRS="" CFLAGS="-DUSE_RANDOM -DRANDOM_NEEDS_PROTOTYPES -DMATH_H_IS_CC -DPROTECTED_IS_PUBLIC" \ diff --git a/games/xevil/patches/patch-ab b/games/xevil/patches/patch-ab index acda07c8de7..b06632152c6 100644 --- a/games/xevil/patches/patch-ab +++ b/games/xevil/patches/patch-ab @@ -1,31 +1,17 @@ -$NetBSD: patch-ab,v 1.3 2004/03/26 01:34:08 kristerw Exp $ +$NetBSD: patch-ab,v 1.4 2005/01/25 16:02:26 xtraeme Exp $ ---- actual.C.orig Tue Sep 24 00:18:08 1996 -+++ actual.C Fri Mar 26 02:17:46 2004 -@@ -23,6 +23,7 @@ - hardts@alum.mit.edu - http://graphics.lcs.mit.edu/~hardts/xevil.html - */ -+using namespace std; +--- cmn/utils.cpp.orig Sun Apr 13 15:11:54 2003 ++++ cmn/utils.cpp Sun Apr 13 15:12:19 2003 +@@ -483,11 +483,7 @@ + #endif - #ifndef NO_PRAGMAS - #pragma implementation "actual.h" -@@ -30,7 +31,8 @@ +-#ifdef UNAME_USR_BIN +-#define UNAME_PATH "/usr/bin/uname" +-#else +-#define UNAME_PATH "/bin/uname" +-#endif ++#define UNAME_PATH "@UNAME@" - // Include Files --#include -+#include -+using std::ostrstream; - - #include "utils.h" - #include "coord.h" -@@ -685,7 +687,7 @@ - // More general and easy to extend. - PhysicalP Transmogifier::new_physical(const Pos &middle) - { -- PhysicalContext *list[A_CLASSES_NUM]; -+ const PhysicalContext *list[A_CLASSES_NUM]; - int size; - LocatorP l = get_locator(); - WorldP w = get_world(); + #ifdef X11 + FILE* fp = popen(UNAME_PATH " -a","r"); diff --git a/games/xevil/patches/patch-ac b/games/xevil/patches/patch-ac index 3eec6d2db1c..59a83883c2f 100644 --- a/games/xevil/patches/patch-ac +++ b/games/xevil/patches/patch-ac @@ -1,44 +1,16 @@ -$NetBSD: patch-ac,v 1.3 2004/03/26 01:34:08 kristerw Exp $ +$NetBSD: patch-ac,v 1.4 2005/01/25 16:02:26 xtraeme Exp $ ---- game.C.orig Tue Sep 24 02:27:18 1996 -+++ game.C Fri Mar 26 02:19:24 2004 -@@ -22,6 +22,7 @@ - hardts@alum.mit.edu - http://graphics.lcs.mit.edu/~hardts/xevil.html - */ -+using namespace std; +--- makefile.orig 2003-03-23 00:09:08.000000000 +0000 ++++ makefile 2003-08-16 11:20:02.000000000 +0000 +@@ -63,11 +63,6 @@ - #ifndef NO_PRAGMAS - #pragma implementation "game.h" -@@ -34,7 +35,7 @@ - #include - } + # Could also include serverping in the distribution + $(OBJ_DIR)/xevil$(VERSION).$(PCKG_NAME).tar.Z:: +- cp readme.txt $(OBJ_DIR) +- cp gpl.txt $(OBJ_DIR) +- cp -r instructions $(OBJ_DIR) +- (cd $(OBJ_DIR); tar cf xevil$(VERSION).$(PCKG_NAME).tar xevil readme.txt gpl.txt instructions) +- (cd $(OBJ_DIR); $(COMPRESS) -f xevil$(VERSION).$(PCKG_NAME).tar) --#include -+#include - #include - - #include "utils.h" -@@ -386,11 +387,11 @@ - - // Get arrays of potential weapons and potential otherItems. - int weaponsNum; -- PhysicalContext *weapons[A_CLASSES_NUM]; -+ const PhysicalContext *weapons[A_CLASSES_NUM]; - weaponsNum = locator->filter_contexts(weapons,NULL, - potential_weapon_filter); - int oItemsNum; -- PhysicalContext *oItems[A_CLASSES_NUM]; -+ const PhysicalContext *oItems[A_CLASSES_NUM]; - oItemsNum = locator->filter_contexts(oItems,NULL, - potential_other_item_filter); - -@@ -1381,7 +1382,7 @@ - // Choose class randomly. - - // Get list of all classes that are potential Human classes. -- PhysicalContext *list[A_CLASSES_NUM]; -+ const PhysicalContext *list[A_CLASSES_NUM]; - int size = locator.filter_contexts(list,NULL,potential_human_filter); - assert(size); - theContext = list[Utils::choose(size)]; + ## Make a distribution file. + #dist: diff --git a/games/xevil/patches/patch-ad b/games/xevil/patches/patch-ad index 985d4da950e..addc5959904 100644 --- a/games/xevil/patches/patch-ad +++ b/games/xevil/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.1.1.1 2005/01/25 15:59:27 xtraeme Exp $ +$NetBSD: patch-ad,v 1.2 2005/01/25 16:02:26 xtraeme Exp $ --- cmn/area.cpp.orig 2003-11-22 10:53:19.000000000 -0800 +++ cmn/area.cpp 2003-11-22 10:53:47.000000000 -0800 diff --git a/games/xevil/patches/patch-ae b/games/xevil/patches/patch-ae index b5c9be7a792..b36643a42d2 100644 --- a/games/xevil/patches/patch-ae +++ b/games/xevil/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.1.1.1 2005/01/25 15:59:27 xtraeme Exp $ +$NetBSD: patch-ae,v 1.2 2005/01/25 16:02:26 xtraeme Exp $ --- cmn/role.cpp.orig 2000-01-19 12:54:34.000000000 -0800 +++ cmn/role.cpp 2003-11-22 10:55:47.000000000 -0800 diff --git a/games/xevil/patches/patch-af b/games/xevil/patches/patch-af index 61f278ea1fa..8fee72be442 100644 --- a/games/xevil/patches/patch-af +++ b/games/xevil/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.1.1.1 2005/01/25 15:59:27 xtraeme Exp $ +$NetBSD: patch-af,v 1.2 2005/01/25 16:02:26 xtraeme Exp $ --- cmn/game_style.h.orig 2003-11-22 10:56:44.000000000 -0800 +++ cmn/game_style.h 2003-11-22 10:56:59.000000000 -0800 -- cgit v1.2.3