pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Re-add xdoom, requested by drochner.
details: https://anonhg.NetBSD.org/pkgsrc/rev/d8fd7cd40f33
branches: trunk
changeset: 572260:d8fd7cd40f33
user: wiz <wiz%pkgsrc.org@localhost>
date: Mon Feb 22 21:58:47 2010 +0000
description:
Re-add xdoom, requested by drochner.
Address PR 24024 by marking it as not-for-lp64platforms.
diffstat:
games/Makefile | 3 +-
games/xdoom/DESCR | 10 +++
games/xdoom/Makefile | 63 +++++++++++++++++++
games/xdoom/PLIST | 4 +
games/xdoom/distinfo | 39 ++++++++++++
games/xdoom/patches/patch-aa | 20 ++++++
games/xdoom/patches/patch-ab | 35 ++++++++++
games/xdoom/patches/patch-ac | 66 ++++++++++++++++++++
games/xdoom/patches/patch-ad | 13 ++++
games/xdoom/patches/patch-ae | 18 +++++
games/xdoom/patches/patch-af | 21 ++++++
games/xdoom/patches/patch-ag | 35 ++++++++++
games/xdoom/patches/patch-ah | 55 +++++++++++++++++
games/xdoom/patches/patch-ai | 137 +++++++++++++++++++++++++++++++++++++++++++
games/xdoom/patches/patch-aj | 22 ++++++
games/xdoom/patches/patch-ak | 14 ++++
games/xdoom/patches/patch-al | 13 ++++
games/xdoom/patches/patch-am | 13 ++++
games/xdoom/patches/patch-an | 51 ++++++++++++++++
games/xdoom/patches/patch-ao | 24 +++++++
games/xdoom/patches/patch-ap | 18 +++++
games/xdoom/patches/patch-aq | 13 ++++
games/xdoom/patches/patch-ar | 78 ++++++++++++++++++++++++
games/xdoom/patches/patch-as | 13 ++++
games/xdoom/patches/patch-at | 123 ++++++++++++++++++++++++++++++++++++++
games/xdoom/patches/patch-au | 16 +++++
games/xdoom/patches/patch-av | 16 +++++
games/xdoom/patches/patch-aw | 27 ++++++++
games/xdoom/patches/patch-ax | 16 +++++
games/xdoom/patches/patch-ay | 42 +++++++++++++
games/xdoom/patches/patch-az | 38 +++++++++++
games/xdoom/patches/patch-ba | 13 ++++
games/xdoom/patches/patch-bb | 27 ++++++++
games/xdoom/patches/patch-bc | 30 +++++++++
games/xdoom/patches/patch-bd | 40 ++++++++++++
games/xdoom/patches/patch-be | 12 +++
licenses/xdoom-license | 106 +++++++++++++++++++++++++++++++++
37 files changed, 1283 insertions(+), 1 deletions(-)
diffs (truncated from 1442 to 300 lines):
diff -r 33d27a3845ea -r d8fd7cd40f33 games/Makefile
--- a/games/Makefile Mon Feb 22 21:48:03 2010 +0000
+++ b/games/Makefile Mon Feb 22 21:58:47 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.330 2010/02/21 16:17:12 wiz Exp $
+# $NetBSD: Makefile,v 1.331 2010/02/22 21:58:47 wiz Exp $
#
COMMENT= Games
@@ -268,6 +268,7 @@
SUBDIR+= xbreaky
SUBDIR+= xconq
SUBDIR+= xdemineur
+SUBDIR+= xdoom
SUBDIR+= xemeraldia
SUBDIR+= xevil
SUBDIR+= xfreecell
diff -r 33d27a3845ea -r d8fd7cd40f33 games/xdoom/DESCR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/games/xdoom/DESCR Mon Feb 22 21:58:47 2010 +0000
@@ -0,0 +1,10 @@
+DOOM is a lightning-fast virtual reality adventure where you're the
+toughest space trooper ever to suck vacuum. Your mission is to shoot
+your way through a monster-infested holocaust. Living to tell the tale if
+possible.
+
+The gameplay for DOOM is quite simple. This is not a cumbersome
+adventure game, but an action-oriented slugathon. You don't need the
+reflexes of a hyperactive eight-year-old to win, either--using your wits is
+IMPORTANT. To escape DOOM, you need both brains and the killer
+instinct.
diff -r 33d27a3845ea -r d8fd7cd40f33 games/xdoom/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/games/xdoom/Makefile Mon Feb 22 21:58:47 2010 +0000
@@ -0,0 +1,63 @@
+# $NetBSD: Makefile,v 1.46 2010/02/22 21:58:47 wiz Exp $
+
+DISTNAME= linuxdoom-1.10
+PKGNAME= xdoom-1.10
+PKGREVISION= 3
+CATEGORIES= games x11
+MASTER_SITES= ftp://ftp.idsoftware.com/idstuff/source/
+MASTER_SITES+= ftp://ftp.idsoftware.com/idstuff/doom/
+DISTFILES= doomsrc.zip doom-1.8.wad.gz
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+# HOMEPAGE= http://www.idsoftware.com/archives/doomarc.html
+# AWOL
+COMMENT= 3D shoot-em-up for 8-bit X11 displays
+LICENSE= xdoom-license
+
+PKG_DESTDIR_SUPPORT= user-destdir
+
+EXTRACT_ONLY= doomsrc.zip
+
+WRKSRC= ${WRKDIR}
+USE_X11BASE= yes
+USE_TOOLS+= gmake gunzip tar unzip
+MAKE_ENV+= X11BASE=${X11BASE:Q} INSTALL_PREFIX=${PREFIX:Q}
+
+NOT_FOR_PLATFORM= ${LP64PLATFORMS}
+
+INSTALLATION_DIRS= share/doom
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Linux"
+CFLAGS+= -DLINUX
+.endif
+
+.include "../../mk/endian.mk"
+
+.if ${MACHINE_ENDIAN} == "big"
+CFLAGS+= -D__BIG_ENDIAN__=1
+.endif
+
+INSTALLATION_DIRS= bin
+
+post-extract:
+ (cd ${WRKDIR}; ${TAR} xzf linuxdoom-1.10.src.tgz)
+ (cd ${WRKDIR}; ${TAR} xzf sndserv.tgz)
+
+do-build:
+ cd ${WRKSRC}/${DISTNAME} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
+ cd ${WRKSRC}/sndserv && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
+
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/${DISTNAME}/linux/linuxxdoom \
+ ${DESTDIR}${PREFIX}/bin/xdoom
+ ${INSTALL_PROGRAM} ${WRKSRC}/sndserv/linux/sndserver \
+ ${DESTDIR}${PREFIX}/bin/sndserver
+ ${GUNZIP_CMD} -c ${DISTDIR}/doom-1.8.wad.gz \
+ > ${DESTDIR}${PREFIX}/share/doom/doom1.wad
+
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r 33d27a3845ea -r d8fd7cd40f33 games/xdoom/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/games/xdoom/PLIST Mon Feb 22 21:58:47 2010 +0000
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.4 2010/02/22 21:58:47 wiz Exp $
+bin/xdoom
+bin/sndserver
+share/doom/doom1.wad
diff -r 33d27a3845ea -r d8fd7cd40f33 games/xdoom/distinfo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/games/xdoom/distinfo Mon Feb 22 21:58:47 2010 +0000
@@ -0,0 +1,39 @@
+$NetBSD: distinfo,v 1.18 2010/02/22 21:58:47 wiz Exp $
+
+SHA1 (doomsrc.zip) = ffd07e0bd95b7c6ba0cd003fb6ff5ebd535d6f99
+RMD160 (doomsrc.zip) = c88e57b3cc72ca8bbfacbe138f8a3c69a13bf2e1
+Size (doomsrc.zip) = 362698 bytes
+SHA1 (doom-1.8.wad.gz) = e43334e5f31d93cadaf8f1ede6cd432f9b0aca68
+RMD160 (doom-1.8.wad.gz) = 5d951d1f685bedd68033a332a6581b5056213c21
+Size (doom-1.8.wad.gz) = 1756050 bytes
+SHA1 (patch-aa) = ff3a5f3acb186c1de4e7e0f542274db8b8c908e7
+SHA1 (patch-ab) = 32d4389a7fc2413d19fe8f66d6da9205effa710a
+SHA1 (patch-ac) = d47c6e1388f3d2d7ea5dbc074c5bec34adf14f1f
+SHA1 (patch-ad) = cb8e892e9fa561960da46c0bfea61bcf65246458
+SHA1 (patch-ae) = 5bba08b0ae36e3a9b9b48b1dba9570035cf1a54d
+SHA1 (patch-af) = 19367ee3112bfd0e5c054749347e642e6d0ff2ee
+SHA1 (patch-ag) = accb03154ee6fcd8771b5cd782bb4f4fb0c96b1b
+SHA1 (patch-ah) = d5ab2fd3f5593876d5c78e2a18ac909ec56ac8cf
+SHA1 (patch-ai) = 05d2abc579d970fec6c0776e953d6ad13946b9b6
+SHA1 (patch-aj) = 23e3b35b8072752a9d3fcaa1913f390cf6bd5146
+SHA1 (patch-ak) = 7ac753f505c5becc2ce26de209723fc464096cdc
+SHA1 (patch-al) = a3c5b2ae0a820010339c06655f53778e5edfd498
+SHA1 (patch-am) = 3b4606d1d040b8c9a9685ef66faf88598d64d3f2
+SHA1 (patch-an) = 2c146291dcacf250986a8a014dd1b0d69bb8f825
+SHA1 (patch-ao) = b2d0ae80d2832c0aac89da1a078afedd7d97362d
+SHA1 (patch-ap) = fe23b3894de0a1c4e32b266377a420e329179beb
+SHA1 (patch-aq) = 83b21a11e8007ea04fbedf10330887469b48dbab
+SHA1 (patch-ar) = 9f7285b05baf484f6546cc6678088e02cd0ff7ea
+SHA1 (patch-as) = 8d56b0a78a6cedb3b1ad63d9418081fb0277cf3d
+SHA1 (patch-at) = 96e5a88b7f250c35b148353d77eb6e598e35c661
+SHA1 (patch-au) = 7782fcbd0bd44f8739c5dbd2a0c3a1c1d3eac9db
+SHA1 (patch-av) = 494568bf3298195523c689125ad664d59d16e901
+SHA1 (patch-aw) = 431b990ad5bcf32fc5152c4b4331ce2bc85aba8b
+SHA1 (patch-ax) = 8aab1f5d3e6f0fc08bd673d37fb19c600aa0f60b
+SHA1 (patch-ay) = 525fe394abcb0833c7595d3bc0559afcc7319f3b
+SHA1 (patch-az) = f9494960fcb2b5c9b42274db4c603205f0556624
+SHA1 (patch-ba) = d8e41ed9d277145cd776ca5dc18e1c82cbefc8b7
+SHA1 (patch-bb) = 28dbedb6209466f5b9ad226e2a5583c3881acae1
+SHA1 (patch-bc) = e55e08d525469b44f96fbd45aeed0bedee0a9d8c
+SHA1 (patch-bd) = 35f01a7d790bb8683a6a4b72581dbe10307c57ed
+SHA1 (patch-be) = 8a6a822136899e09fd3a8dff80d5618d60dd7a3c
diff -r 33d27a3845ea -r d8fd7cd40f33 games/xdoom/patches/patch-aa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/games/xdoom/patches/patch-aa Mon Feb 22 21:58:47 2010 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-aa,v 1.9 2010/02/22 21:58:47 wiz Exp $
+
+--- linuxdoom-1.10/Makefile.orig Mon Dec 22 19:55:36 1997
++++ linuxdoom-1.10/Makefile Thu Feb 3 13:22:41 2000
+@@ -6,9 +6,12 @@
+ #
+ CC= gcc # gcc or g++
+
+-CFLAGS=-g -Wall -DNORMALUNIX -DLINUX # -DUSEASM
+-LDFLAGS=-L/usr/X11R6/lib
+-LIBS=-lXext -lX11 -lnsl -lm
++X11BASE?=/usr/X11R6
++
++CFLAGS+= -Wall -DNORMALUNIX -DSNDSRV -DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\" #-DUSEASM
++CFLAGS+= -I$(X11BASE)/include
++LDFLAGS=-Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib
++LIBS=-lXext -lX11 -lm
+
+ # subdirectory for objects
+ O=linux
diff -r 33d27a3845ea -r d8fd7cd40f33 games/xdoom/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/games/xdoom/patches/patch-ab Mon Feb 22 21:58:47 2010 +0000
@@ -0,0 +1,35 @@
+$NetBSD: patch-ab,v 1.5 2010/02/22 21:58:47 wiz Exp $
+
+--- linuxdoom-1.10/am_map.c.orig Mon Dec 22 19:58:32 1997
++++ linuxdoom-1.10/am_map.c Thu Feb 3 01:33:44 2000
+@@ -783,7 +783,7 @@
+ //
+ void AM_updateLightLev(void)
+ {
+- static nexttic = 0;
++ static int nexttic = 0;
+ //static int litelevels[] = { 0, 3, 5, 6, 6, 7, 7, 7 };
+ static int litelevels[] = { 0, 4, 7, 10, 12, 14, 15, 15 };
+ static int litelevelscnt = 0;
+@@ -856,9 +856,9 @@
+ TOP =8
+ };
+
+- register outcode1 = 0;
+- register outcode2 = 0;
+- register outside;
++ register int outcode1 = 0;
++ register int outcode2 = 0;
++ register int outside;
+
+ fpoint_t tmp;
+ int dx;
+@@ -989,7 +989,7 @@
+ register int ay;
+ register int d;
+
+- static fuck = 0;
++ static int fuck = 0;
+
+ // For debugging only
+ if ( fl->a.x < 0 || fl->a.x >= f_w
diff -r 33d27a3845ea -r d8fd7cd40f33 games/xdoom/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/games/xdoom/patches/patch-ac Mon Feb 22 21:58:47 2010 +0000
@@ -0,0 +1,66 @@
+$NetBSD: patch-ac,v 1.5 2010/02/22 21:58:47 wiz Exp $
+
+--- linuxdoom-1.10/d_main.c.orig Mon Dec 22 20:32:03 1997
++++ linuxdoom-1.10/d_main.c Thu Feb 3 13:35:25 2000
+@@ -577,7 +577,11 @@
+ char *doomwaddir;
+ doomwaddir = getenv("DOOMWADDIR");
+ if (!doomwaddir)
++#ifdef INSTALL_PREFIX
++ doomwaddir = INSTALL_PREFIX"/share/doom";
++#else
+ doomwaddir = ".";
++#endif
+
+ // Commercial.
+ doom2wad = malloc(strlen(doomwaddir)+1+9+1);
+@@ -804,7 +808,32 @@
+
+ setbuf (stdout, NULL);
+ modifiedgame = false;
+-
++
++ if (myargc > 1 && strcmp(myargv[1], "-h")==0)
++ {
++ printf(
++"Many options are not explained, and some are just plain broken.\n\
++Some more useful ones are:\n\
++ -2 -3 -4 Scale the window by 2, 3, or 4 times.\n\
++ -config FILE Load/save configuration from FILE.\n\
++ -episode N Set starting expisode to N.\n\
++ -grabmouse Grab the mouse to control movement.\n\
++ -volume N Set volume (default 8).\n\
++ -skill N Set starting skill level to N.\n\
++\n\
++Others are:\n\
++
++-altdeath -debugfile -file -nodraw -respawn -warp \n\
++-avg -devparm -geom -nomonsters -shdev -wart \n\
++-cdrom -disp -loadgame -playdemo -statcopy \n\
++-comdev -dup -maxdemo -port -timedemo \n\
++ -extratic -net -record -timer \n\
++-deathmatch -fast -noblit -regdev -turbo \n\
++
++");
++ exit(0);
++ }
++
+ nomonsters = M_CheckParm ("-nomonsters");
+ respawnparm = M_CheckParm ("-respawn");
+ fastparm = M_CheckParm ("-fast");
+@@ -1013,6 +1042,15 @@
+
+ printf ("M_LoadDefaults: Load system defaults.\n");
+ M_LoadDefaults (); // load before initing other systems
++
++ /* Must be after M_LoadDefaults */
++ p = M_CheckParm ("-volume");
++ if (p && p < myargc-1)
++ {
++ int vol = atoi(myargv[p+1]);
++ S_SetSfxVolume(vol);
++ S_SetMusicVolume(vol);
++ }
+
+ printf ("Z_Init: Init zone memory allocation daemon. \n");
+ Z_Init ();
diff -r 33d27a3845ea -r d8fd7cd40f33 games/xdoom/patches/patch-ad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/games/xdoom/patches/patch-ad Mon Feb 22 21:58:47 2010 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.5 2010/02/22 21:58:47 wiz Exp $
+
+--- linuxdoom-1.10/d_net.h.orig Sun Dec 14 11:53:05 1997
++++ linuxdoom-1.10/d_net.h Thu Feb 3 01:33:46 2000
+@@ -79,7 +79,7 @@
+ typedef struct
+ {
+ // Supposed to be DOOMCOM_ID?
+- long id;
++ int id;
+
+ // DOOM executes an int to execute commands.
+ short intnum;
diff -r 33d27a3845ea -r d8fd7cd40f33 games/xdoom/patches/patch-ae
Home |
Main Index |
Thread Index |
Old Index