diff options
| author | abs <abs> | 2001-07-27 11:05:58 +0000 |
|---|---|---|
| committer | abs <abs> | 2001-07-27 11:05:58 +0000 |
| commit | c1b2755607b87c68b38223f3dec61c589d45b3cb (patch) | |
| tree | c9b9b8e508e6c0f1231edfbc83800ac9671f32c7 /games | |
| parent | 96b6347b0e85b3010b3ef6ce6e7b385bc534418a (diff) | |
| download | pkgsrc-c1b2755607b87c68b38223f3dec61c589d45b3cb.tar.gz | |
Work with xpkgwedge
Diffstat (limited to 'games')
| -rw-r--r-- | games/xdoom/Makefile | 7 | ||||
| -rw-r--r-- | games/xdoom/distinfo | 4 | ||||
| -rw-r--r-- | games/xdoom/patches/patch-aa | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/games/xdoom/Makefile b/games/xdoom/Makefile index 8072c0a7325..48af3dc0cdf 100644 --- a/games/xdoom/Makefile +++ b/games/xdoom/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/03/27 03:19:58 hubertf Exp $ +# $NetBSD: Makefile,v 1.15 2001/07/27 11:05:58 abs Exp $ DISTNAME= linuxdoom-1.10 PKGNAME= xdoom-1.10nb1 @@ -20,14 +20,15 @@ EXTRACT_ONLY= doomsrc.zip EXTRACT_CMD= unzip -qo ${DISTDIR}/${EXTRACT_ONLY} USE_X11BASE= yes USE_GMAKE= yes +MAKE_ENV+= X11BASE=${X11BASE} INSTALL_PREFIX=${X11PREFIX} post-extract: (cd ${WRKDIR}; ${GTAR} xzf linuxdoom-1.10.src.tgz) (cd ${WRKDIR}; ${GTAR} xzf sndserv.tgz) do-build: - cd ${WRKSRC}/${DISTNAME} ; ${GMAKE} X11BASE=${X11BASE} - cd ${WRKSRC}/sndserv ; ${GMAKE} X11BASE=${X11BASE} + cd ${WRKSRC}/${DISTNAME} ; ${GMAKE} + cd ${WRKSRC}/sndserv ; ${GMAKE} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${DISTNAME}/linux/linuxxdoom ${PREFIX}/bin/xdoom diff --git a/games/xdoom/distinfo b/games/xdoom/distinfo index 4a8de578987..d4bbf8070ef 100644 --- a/games/xdoom/distinfo +++ b/games/xdoom/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 02:08:38 wiz Exp $ +$NetBSD: distinfo,v 1.3 2001/07/27 11:05:58 abs Exp $ SHA1 (doomsrc.zip) = ffd07e0bd95b7c6ba0cd003fb6ff5ebd535d6f99 Size (doomsrc.zip) = 362698 bytes SHA1 (doom-1.8.wad.gz) = e43334e5f31d93cadaf8f1ede6cd432f9b0aca68 Size (doom-1.8.wad.gz) = 1756050 bytes -SHA1 (patch-aa) = 5e5091bd2451e8ae5b8316231da99cab3ac5849c +SHA1 (patch-aa) = 6b9927779c14d2a91238c531e7429a86835656df SHA1 (patch-ab) = 32d4389a7fc2413d19fe8f66d6da9205effa710a SHA1 (patch-ac) = d47c6e1388f3d2d7ea5dbc074c5bec34adf14f1f SHA1 (patch-ad) = cb8e892e9fa561960da46c0bfea61bcf65246458 diff --git a/games/xdoom/patches/patch-aa b/games/xdoom/patches/patch-aa index 5d69acb86f7..246b165bdd8 100644 --- a/games/xdoom/patches/patch-aa +++ b/games/xdoom/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.5 2000/02/03 16:01:15 abs Exp $ +$NetBSD: patch-aa,v 1.6 2001/07/27 11:05:58 abs Exp $ --- linuxdoom-1.10/Makefile.orig Mon Dec 22 19:55:36 1997 +++ linuxdoom-1.10/Makefile Thu Feb 3 13:22:41 2000 @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.5 2000/02/03 16:01:15 abs Exp $ -LIBS=-lXext -lX11 -lnsl -lm +X11BASE?=/usr/X11R6 + -+CFLAGS=-O2 -Wall -DNORMALUNIX -DSNDSRV -DINSTALL_PREFIX=\"$(X11BASE)\" #-DUSEASM ++CFLAGS=-O2 -Wall -DNORMALUNIX -DSNDSRV -DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\" #-DUSEASM +CFLAGS+= -I$(X11BASE)/include +LDFLAGS=-Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib +LIBS=-lXext -lX11 -lm |