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
--- 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,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2009/02/18 10:56:55 abs Exp $
+# $NetBSD: Makefile,v 1.21 2009/03/10 07:21:53 hasso Exp $
#
DISTNAME= heretic2-demo-x86
@@ -24,7 +24,8 @@
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "DragonFly"
-# system gzip doesn't like the file, but zlib does.
+# DragonFly sed(1) adds trailing newline and it confuses gzip(1). Bsdtar,
+# which doesn't use gzip but zlib, extracts the archive fine though.
TOOLS_PLATFORM.gtar= /usr/bin/bsdtar
.endif
--- 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,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2008/05/26 02:13:19 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2009/03/10 07:21:53 hasso Exp $
DISTNAME= linuxq3ademo-1_11-6_x86_gz
PKGREVISION= 3
@@ -22,6 +22,13 @@
USE_TOOLS+= gtar pax
EXTRACT_CMD= ${SED} '1,/^END_OF_STUB$$/d' ${DOWNLOADED_DISTFILE} | \
${GTAR} xzf -
+
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "DragonFly"
+# DragonFly sed(1) adds trailing newline and it confuses gzip(1). Bsdtar,
+# which doesn't use gzip but zlib, extracts the archive fine though.
+TOOLS_PLATFORM.gtar= /usr/bin/bsdtar
+.endif
DISTBINNAME= q3demo
BINNAME= quake3arena-demo
--- 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,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/05/20 20:27:00 tnn Exp $
+# $NetBSD: Makefile,v 1.13 2009/03/10 07:21:53 hasso Exp $
DISTNAME= linuxq3apoint-1.32b.x86
PKGNAME= quake3server-1.32b
@@ -22,6 +22,13 @@
WRKSRC= ${WRKDIR}
BASEDOCDIR= ${PREFIX}/share/doc/lokigames/quake3server
RCD_SCRIPTS= quake3server
+
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "DragonFly"
+# DragonFly sed(1) adds trailing newline and it confuses gzip(1). Bsdtar,
+# which doesn't use gzip but zlib, extracts the archive fine though.
+TOOLS_PLATFORM.gtar= /usr/bin/bsdtar
+.endif
SPECIAL_PERMS+= ${Q3ROOTDIR}/q3ded nobody nogroup 0500