Tue Mar 10 07:21:53 2009 UTC ()
Fix extracting quake3arena-demo and quake3server on DragonFly the same way
as already done for heretic2-demo. Clarify the comment.


(hasso)
diff -r1.20 -r1.21 pkgsrc/games/heretic2-demo/Makefile
diff -r1.34 -r1.35 pkgsrc/games/quake3arena-demo/Makefile
diff -r1.12 -r1.13 pkgsrc/games/quake3server/Makefile
cvs diff -r1.20 -r1.21 pkgsrc/games/heretic2-demo/Makefile (expand / switch to unified diff)

--- pkgsrc/games/heretic2-demo/Makefile 2009/02/18 10:56:55 1.20
+++ pkgsrc/games/heretic2-demo/Makefile 2009/03/10 07:21:53 1.21
@@ -1,40 +1,41 @@ @@ -1,40 +1,41 @@
1# $NetBSD: Makefile,v 1.20 2009/02/18 10:56:55 abs Exp $ 1# $NetBSD: Makefile,v 1.21 2009/03/10 07:21:53 hasso Exp $
2# 2#
3 3
4DISTNAME= heretic2-demo-x86 4DISTNAME= heretic2-demo-x86
5PKGNAME= heretic2-demo-2.0 5PKGNAME= heretic2-demo-2.0
6PKGREVISION= 1 6PKGREVISION= 1
7CATEGORIES= games x11 7CATEGORIES= games x11
8MASTER_SITES= ftp://ftp.linuxgames.com/loki/demos/heretic2/ \ 8MASTER_SITES= ftp://ftp.linuxgames.com/loki/demos/heretic2/ \
9 ftp://download.linuxlords.com/pub/demos/heretic2/ \ 9 ftp://download.linuxlords.com/pub/demos/heretic2/ \
10 ftp://ftp.linux.tucows.com/pub/Loki/demos/heretic2/ 10 ftp://ftp.linux.tucows.com/pub/Loki/demos/heretic2/
11EXTRACT_SUFX= .run 11EXTRACT_SUFX= .run
12 12
13MAINTAINER= abs@NetBSD.org 13MAINTAINER= abs@NetBSD.org
14HOMEPAGE= http://www.lokigames.com/products/heretic2/ 14HOMEPAGE= http://www.lokigames.com/products/heretic2/
15COMMENT= Heretic2 - first person Quake 3D engine based (linux demo) 15COMMENT= Heretic2 - first person Quake 3D engine based (linux demo)
16 16
17PKG_DESTDIR_SUPPORT= user-destdir 17PKG_DESTDIR_SUPPORT= user-destdir
18 18
19NO_CONFIGURE= yes 19NO_CONFIGURE= yes
20EXTRACT_CMD= ${SED} '1,/^END_OF_STUB$$/d' ${DOWNLOADED_DISTFILE} | \ 20EXTRACT_CMD= ${SED} '1,/^END_OF_STUB$$/d' ${DOWNLOADED_DISTFILE} | \
21 ${GTAR} xzf - 21 ${GTAR} xzf -
22USE_TOOLS+= gtar pax 22USE_TOOLS+= gtar pax
23 23
24.include "../../mk/bsd.prefs.mk" 24.include "../../mk/bsd.prefs.mk"
25 25
26.if ${OPSYS} == "DragonFly" 26.if ${OPSYS} == "DragonFly"
27# system gzip doesn't like the file, but zlib does. 27# DragonFly sed(1) adds trailing newline and it confuses gzip(1). Bsdtar,
 28# which doesn't use gzip but zlib, extracts the archive fine though.
28TOOLS_PLATFORM.gtar= /usr/bin/bsdtar 29TOOLS_PLATFORM.gtar= /usr/bin/bsdtar
29.endif 30.endif
30 31
31ONLY_FOR_PLATFORM=*-*-i386 32ONLY_FOR_PLATFORM=*-*-i386
32 33
33DISTBINNAME= heretic2_demo.x86 34DISTBINNAME= heretic2_demo.x86
34BINNAME= heretic2-demo 35BINNAME= heretic2-demo
35 36
36WRKSRC= ${WRKDIR} 37WRKSRC= ${WRKDIR}
37DIST_SUBDIR= lokigames 38DIST_SUBDIR= lokigames
38LIBDIR= ${PREFIX}/lib/lokigames/${BINNAME} 39LIBDIR= ${PREFIX}/lib/lokigames/${BINNAME}
39SHAREDIR= ${PREFIX}/share/doc/lokigames 40SHAREDIR= ${PREFIX}/share/doc/lokigames
40 41
cvs diff -r1.34 -r1.35 pkgsrc/games/quake3arena-demo/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/games/quake3arena-demo/Attic/Makefile 2008/05/26 02:13:19 1.34
+++ pkgsrc/games/quake3arena-demo/Attic/Makefile 2009/03/10 07:21:53 1.35
@@ -1,38 +1,45 @@ @@ -1,38 +1,45 @@
1# $NetBSD: Makefile,v 1.34 2008/05/26 02:13:19 joerg Exp $ 1# $NetBSD: Makefile,v 1.35 2009/03/10 07:21:53 hasso Exp $
2 2
3DISTNAME= linuxq3ademo-1_11-6_x86_gz 3DISTNAME= linuxq3ademo-1_11-6_x86_gz
4PKGREVISION= 3 4PKGREVISION= 3
5PKGNAME= quake3arena-demo-1.11.6 5PKGNAME= quake3arena-demo-1.11.6
6CATEGORIES= games x11 6CATEGORIES= games x11
7MASTER_SITES= ftp://ftp.idsoftware.com/idstuff/quake3/linux/ \ 7MASTER_SITES= ftp://ftp.idsoftware.com/idstuff/quake3/linux/ \
8 ftp://mirrors.xmission.com/idsoftware/quake3/linux/ 8 ftp://mirrors.xmission.com/idsoftware/quake3/linux/
9EXTRACT_SUFX= .sh 9EXTRACT_SUFX= .sh
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.quake3arena.com/ 12HOMEPAGE= http://www.quake3arena.com/
13COMMENT= Quake 3 Arena -- first person shooter (linux demo) 13COMMENT= Quake 3 Arena -- first person shooter (linux demo)
14 14
15CONFLICTS= quake3arena-[0-9]* 15CONFLICTS= quake3arena-[0-9]*
16 16
17EMUL_PLATFORMS= linux-i386 17EMUL_PLATFORMS= linux-i386
18EMUL_MODULES.linux= base x11 glx 18EMUL_MODULES.linux= base x11 glx
19 19
20PKG_DESTDIR_SUPPORT= user-destdir 20PKG_DESTDIR_SUPPORT= user-destdir
21 21
22USE_TOOLS+= gtar pax 22USE_TOOLS+= gtar pax
23EXTRACT_CMD= ${SED} '1,/^END_OF_STUB$$/d' ${DOWNLOADED_DISTFILE} | \ 23EXTRACT_CMD= ${SED} '1,/^END_OF_STUB$$/d' ${DOWNLOADED_DISTFILE} | \
24 ${GTAR} xzf - 24 ${GTAR} xzf -
25 25
 26.include "../../mk/bsd.prefs.mk"
 27.if ${OPSYS} == "DragonFly"
 28# DragonFly sed(1) adds trailing newline and it confuses gzip(1). Bsdtar,
 29# which doesn't use gzip but zlib, extracts the archive fine though.
 30TOOLS_PLATFORM.gtar= /usr/bin/bsdtar
 31.endif
 32
26DISTBINNAME= q3demo 33DISTBINNAME= q3demo
27BINNAME= quake3arena-demo 34BINNAME= quake3arena-demo
28 35
29DIST_SUBDIR= lokigames 36DIST_SUBDIR= lokigames
30WRKSRC= ${WRKDIR} 37WRKSRC= ${WRKDIR}
31LIBDIR= ${PREFIX}/lib/lokigames/${BINNAME} 38LIBDIR= ${PREFIX}/lib/lokigames/${BINNAME}
32SHAREDIR= ${PREFIX}/share/doc/lokigames 39SHAREDIR= ${PREFIX}/share/doc/lokigames
33 40
34INSTALLATION_DIRS= bin ${LIBDIR} ${SHAREDIR} 41INSTALLATION_DIRS= bin ${LIBDIR} ${SHAREDIR}
35 42
36do-build: 43do-build:
37 ${SED} -e 's#@@PREFIX@@#${PREFIX}#g' \ 44 ${SED} -e 's#@@PREFIX@@#${PREFIX}#g' \
38 -e 's#@@LIBDIR@@#${LIBDIR}#g' \ 45 -e 's#@@LIBDIR@@#${LIBDIR}#g' \
cvs diff -r1.12 -r1.13 pkgsrc/games/quake3server/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/games/quake3server/Attic/Makefile 2008/05/20 20:27:00 1.12
+++ pkgsrc/games/quake3server/Attic/Makefile 2009/03/10 07:21:53 1.13
@@ -1,38 +1,45 @@ @@ -1,38 +1,45 @@
1# $NetBSD: Makefile,v 1.12 2008/05/20 20:27:00 tnn Exp $ 1# $NetBSD: Makefile,v 1.13 2009/03/10 07:21:53 hasso Exp $
2 2
3DISTNAME= linuxq3apoint-1.32b.x86 3DISTNAME= linuxq3apoint-1.32b.x86
4PKGNAME= quake3server-1.32b 4PKGNAME= quake3server-1.32b
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= games net 6CATEGORIES= games net
7MASTER_SITES= ftp://ftp.bluesnews.com/idstuff/quake3/linux/ \ 7MASTER_SITES= ftp://ftp.bluesnews.com/idstuff/quake3/linux/ \
8 ftp://ftp.idsoftware.com/idstuff/quake3/linux/ 8 ftp://ftp.idsoftware.com/idstuff/quake3/linux/
9EXTRACT_SUFX= .run 9EXTRACT_SUFX= .run
10 10
11MAINTAINER= david@silicium.ath.cx 11MAINTAINER= david@silicium.ath.cx
12COMMENT= Quake III Arena Dedicated Server for Linux 12COMMENT= Quake III Arena Dedicated Server for Linux
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16.include "../../games/quake3server/Makefile.common" 16.include "../../games/quake3server/Makefile.common"
17 17
18USE_TOOLS+= gtar 18USE_TOOLS+= gtar
19EXTRACT_CMD= ${SED} '1,265d' ${DOWNLOADED_DISTFILE} | ${GTAR} xzf - 19EXTRACT_CMD= ${SED} '1,265d' ${DOWNLOADED_DISTFILE} | ${GTAR} xzf -
20NO_BUILD= yes 20NO_BUILD= yes
21 21
22WRKSRC= ${WRKDIR} 22WRKSRC= ${WRKDIR}
23BASEDOCDIR= ${PREFIX}/share/doc/lokigames/quake3server 23BASEDOCDIR= ${PREFIX}/share/doc/lokigames/quake3server
24RCD_SCRIPTS= quake3server 24RCD_SCRIPTS= quake3server
25 25
 26.include "../../mk/bsd.prefs.mk"
 27.if ${OPSYS} == "DragonFly"
 28# DragonFly sed(1) adds trailing newline and it confuses gzip(1). Bsdtar,
 29# which doesn't use gzip but zlib, extracts the archive fine though.
 30TOOLS_PLATFORM.gtar= /usr/bin/bsdtar
 31.endif
 32
26SPECIAL_PERMS+= ${Q3ROOTDIR}/q3ded nobody nogroup 0500 33SPECIAL_PERMS+= ${Q3ROOTDIR}/q3ded nobody nogroup 0500
27 34
28do-install: 35do-install:
29 ${INSTALL_DATA_DIR} ${DESTDIR}${Q3ROOTDIR}/pb \ 36 ${INSTALL_DATA_DIR} ${DESTDIR}${Q3ROOTDIR}/pb \
30 ${DESTDIR}${Q3ROOTDIR}/baseq3 \ 37 ${DESTDIR}${Q3ROOTDIR}/baseq3 \
31 ${DESTDIR}${Q3ROOTDIR}/missionpack 38 ${DESTDIR}${Q3ROOTDIR}/missionpack
32.for bpak in 1 2 3 4 5 6 7 8 39.for bpak in 1 2 3 4 5 6 7 8
33 ${INSTALL_DATA} ${WRKSRC}/baseq3/pak${bpak}.pk3 \ 40 ${INSTALL_DATA} ${WRKSRC}/baseq3/pak${bpak}.pk3 \
34 ${DESTDIR}${Q3ROOTDIR}/baseq3 41 ${DESTDIR}${Q3ROOTDIR}/baseq3
35.endfor 42.endfor
36.for mpak in 1 2 3 43.for mpak in 1 2 3
37 ${INSTALL_DATA} ${WRKSRC}/missionpack/pak${mpak}.pk3 \ 44 ${INSTALL_DATA} ${WRKSRC}/missionpack/pak${mpak}.pk3 \
38 ${DESTDIR}${Q3ROOTDIR}/missionpack 45 ${DESTDIR}${Q3ROOTDIR}/missionpack