diff options
| author | wiz <wiz> | 2002-08-20 13:10:30 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2002-08-20 13:10:30 +0000 |
| commit | 954940854e2c515f27244d6812622b9c05579ad7 (patch) | |
| tree | bc5bc79f918b9db5333ada15d94937cc9c912695 | |
| parent | 99342133b364a2dd7118561d97ce86178959f053 (diff) | |
| download | pkgsrc-954940854e2c515f27244d6812622b9c05579ad7.tar.gz | |
Pull up
1.18 and 1.19 Makefile
1.5 distinfo
1.5 patches/patch-af
to the 1.6 branch, as requested by agc.
distinfo+patch-af:
Fix the WAD version number printf(), which is very obviously broken.
Makefile:
Fix the special-case do-build target to respect MAKE_ENV.
Crank PKGREVISION.
| -rw-r--r-- | games/xdoom/Makefile | 8 | ||||
| -rw-r--r-- | games/xdoom/distinfo | 4 | ||||
| -rw-r--r-- | games/xdoom/patches/patch-af | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/games/xdoom/Makefile b/games/xdoom/Makefile index efea1d219dc..2a1fd2a0ecf 100644 --- a/games/xdoom/Makefile +++ b/games/xdoom/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.17 2001/11/29 01:12:33 hubertf Exp $ +# $NetBSD: Makefile,v 1.17.8.1 2002/08/20 13:10:30 wiz Exp $ DISTNAME= linuxdoom-1.10 PKGNAME= xdoom-1.10 -PKGREVISION= 1 +PKGREVISION= 2 WRKSRC= ${WRKDIR} CATEGORIES= games x11 MASTER_SITES= ftp://ftp.idsoftware.com/idstuff/source/ @@ -28,8 +28,8 @@ post-extract: (cd ${WRKDIR}; ${GTAR} xzf sndserv.tgz) do-build: - cd ${WRKSRC}/${DISTNAME} ; ${GMAKE} - cd ${WRKSRC}/sndserv ; ${GMAKE} + 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 ${PREFIX}/bin/xdoom diff --git a/games/xdoom/distinfo b/games/xdoom/distinfo index a1b40ce20f2..14fb0899b84 100644 --- a/games/xdoom/distinfo +++ b/games/xdoom/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/07/29 11:09:50 blymn Exp $ +$NetBSD: distinfo,v 1.4.4.1 2002/08/20 13:10:30 wiz Exp $ SHA1 (doomsrc.zip) = ffd07e0bd95b7c6ba0cd003fb6ff5ebd535d6f99 Size (doomsrc.zip) = 362698 bytes @@ -9,7 +9,7 @@ SHA1 (patch-ab) = 32d4389a7fc2413d19fe8f66d6da9205effa710a SHA1 (patch-ac) = d47c6e1388f3d2d7ea5dbc074c5bec34adf14f1f SHA1 (patch-ad) = cb8e892e9fa561960da46c0bfea61bcf65246458 SHA1 (patch-ae) = 5bba08b0ae36e3a9b9b48b1dba9570035cf1a54d -SHA1 (patch-af) = 04b9683d1f4426240e83a47f9f14f7c0cc91a5e9 +SHA1 (patch-af) = 19367ee3112bfd0e5c054749347e642e6d0ff2ee SHA1 (patch-ag) = accb03154ee6fcd8771b5cd782bb4f4fb0c96b1b SHA1 (patch-ah) = 8ce7eff703079ca435bcffd125483285d8bade5c SHA1 (patch-ai) = 26222ea901448bf134bda6de0843f6fa6f220339 diff --git a/games/xdoom/patches/patch-af b/games/xdoom/patches/patch-af index 9c6ffd33019..8cf14aa283c 100644 --- a/games/xdoom/patches/patch-af +++ b/games/xdoom/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.4 2000/02/03 16:01:15 abs Exp $ +$NetBSD: patch-af,v 1.4.8.1 2002/08/20 13:10:31 wiz Exp $ --- linuxdoom-1.10/g_game.c.orig Mon Dec 22 20:35:29 1997 +++ linuxdoom-1.10/g_game.c Thu Feb 3 01:33:47 2000 @@ -11,7 +11,7 @@ $NetBSD: patch-af,v 1.4 2000/02/03 16:01:15 abs Exp $ { - fprintf( stderr, "Demo is from a different game version!\n"); + fprintf( stderr, "Demo is from a different game version (%.2f / %.2f)!\n", -+ demo_p[-1]/(float)100, VERSION/(float)100); ++ *demo_p/100.0, VERSION/100.0); gameaction = ga_nothing; return; } |