From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Oct 8 08:10:20 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DF54016A41F for ; Sat, 8 Oct 2005 08:10:20 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 612DB43D46 for ; Sat, 8 Oct 2005 08:10:19 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j988AJTt013912 for ; Sat, 8 Oct 2005 08:10:19 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j988AJ19013911; Sat, 8 Oct 2005 08:10:19 GMT (envelope-from gnats) Resent-Date: Sat, 8 Oct 2005 08:10:19 GMT Resent-Message-Id: <200510080810.j988AJ19013911@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Edwin Groothuis Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5F63416A41F; Sat, 8 Oct 2005 08:05:15 +0000 (GMT) (envelope-from edwin@mavetju.org) Received: from mail3out.barnet.com.au (mail3out.barnet.com.au [202.83.176.17]) by mx1.FreeBSD.org (Postfix) with ESMTP id D247E43D48; Sat, 8 Oct 2005 08:05:14 +0000 (GMT) (envelope-from edwin@mavetju.org) Received: by mail3out.barnet.com.au (Postfix, from userid 27) id F227D877C53; Sat, 8 Oct 2005 18:05:12 +1000 (EST) Received: from mail3-auth.barnet.com.au (mail3.barnet.com.au [202.83.176.16]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.barnet.com.au", Issuer "BarNet Root Certificate Authority" (verified OK)) by mail3.barnet.com.au (Postfix) with ESMTP id B509E877C44; Sat, 8 Oct 2005 18:05:12 +1000 (EST) Received: from k7.mavetju (edwin-3.int.barnet.com.au [10.10.12.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "edwin.adsl.barnet.com.au", Issuer "BarNet Root Certificate Authority" (not verified)) by mail3-auth.barnet.com.au (Postfix) with ESMTP id E03D1877C32; Sat, 8 Oct 2005 18:05:11 +1000 (EST) Received: by k7.mavetju (Postfix, from userid 1001) id A20CA6129; Sat, 8 Oct 2005 18:05:10 +1000 (EST) Message-Id: <20051008080510.A20CA6129@k7.mavetju> Date: Sat, 8 Oct 2005 18:05:10 +1000 (EST) From: Edwin Groothuis To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: jmz@FreeBSD.org Subject: ports/87111: [patch] sanitize games/doom fetch target (and other patches) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Edwin Groothuis List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2005 08:10:21 -0000 >Number: 87111 >Category: ports >Synopsis: [patch] sanitize games/doom fetch target (and other patches) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Oct 08 08:10:18 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Edwin Groothuis >Release: FreeBSD 5.2.1-RELEASE i386 >Organization: - >Environment: System: FreeBSD k7.mavetju 5.2.1-RELEASE FreeBSD 5.2.1-RELEASE #8: Wed Dec 15 16:58:01 EST 2004 edwin@k7.mavetju:/usr/src-5.2.1/sys/i386/compile/k7 i386 >Description: games/doom has a very particular way to fetch the files... also the download tarball says version 1.10 and replace perl with real patch files >How-To-Repeat: check /usr/ports/games/doom/Makefile >Fix: Index: Makefile =================================================================== RCS file: /home/pcvs/ports/games/doom/Makefile,v retrieving revision 1.24 diff -u -r1.24 Makefile --- Makefile 4 Feb 2004 05:20:20 -0000 1.24 +++ Makefile 8 Oct 2005 08:04:13 -0000 @@ -6,44 +6,34 @@ # PORTNAME= doom -PORTVERSION= 1.8 -PORTREVISION= 1 +PORTVERSION= 1.10 CATEGORIES= games -MASTER_SITES?= ftp://ftp.idsoftware.com/idstuff/source/ \ - ftp://ftp.stomped.com/pub/idmirror/idstuff/source/ \ - ftp://ftp.cdrom.com/pub/idgames/idstuff/source/ -DISTNAME= doomsrc +MASTER_SITES= ftp://ftp.idsoftware.com/idstuff/source/:src \ + ftp://ftp.stomped.com/pub/idmirror/idstuff/source/:src \ + ftp://ftp.cdrom.com/pub/idgames/idstuff/source/:src \ + ${MASTER_SITE_SUNSITE:S/$/:wad/g} +MASTER_SITE_SUBDIR= games/doom/:wad +DISTFILES= ${SRCFILE}:src ${WADFILE}:wad +EXTRACT_ONLY= ${SRCFILE} MAINTAINER= jmz@FreeBSD.org COMMENT= DOOM: the game and the sound server NO_CDROM= requested by IDsoftware -MASTER_SITES2= ftp://sunsite.unc.edu/pub/Linux/games/doom/ \ - ftp://ftp.infomagic.com/pub/mirrors/linux/sunsite/games/doom/ \ - ftp://ftp.funet.fi/pub/mirrors/sunsite.unc.edu/pub/Linux/games/doom/ -DISTFILES2= doom1v18.wad.gz +WADFILE= doom1v18.wad.gz +SRCFILE= doomsrc${EXTRACT_SUFX} ONLY_FOR_ARCHS= i386 -USE_PERL5_BUILD=yes USE_XLIB= yes USE_ZIP= yes NO_WRKSUBDIR= yes USE_GMAKE= yes -.if !defined(__REAL_FETCH__) -do-fetch: - @${MAKE} ${.MAKEFLAGS} do-fetch __REAL_FETCH__=YES - @${MAKE} ${.MAKEFLAGS} do-fetch __REAL_FETCH__=YES \ - DISTFILES="${DISTFILES2}" MASTER_SITES="${MASTER_SITES2}" -.endif post-extract: @cd ${WRKDIR} && ${TAR} xzf linuxdoom-1.10.src.tgz && ${TAR} xzf sndserv.tgz -post-patch: - @${FIND} ${WRKSRC} -type f | ${XARGS} ${PERL} -pi -e "s@#include +@#include @g" - do-build: @cd ${WRKDIR}/linuxdoom-1.10 && ${GMAKE} @cd ${WRKDIR}/sndserv && ${GMAKE} @@ -55,6 +45,6 @@ @(${ECHO_CMD} "#!/bin/sh"; ${ECHO_CMD} "cd ${PREFIX}/libexec/doom"; \ ${ECHO_CMD} 'export PATH=.:$$PATH';${ECHO_CMD} "export DOOMWADDIR=${PREFIX}/share/doom"; ${ECHO_CMD} "./xdoom $$*") > ${PREFIX}/bin/doom @${CHMOD} ugo+x ${PREFIX}/bin/doom - @${GZCAT} ${DISTDIR}/${DISTFILES2} > ${PREFIX}/share/doom/doom1.wad + @${GZCAT} ${DISTDIR}/${WADFILE} > ${PREFIX}/share/doom/doom1.wad .include Index: files/patch-ag =================================================================== RCS file: /home/pcvs/ports/games/doom/files/patch-ag,v retrieving revision 1.1 diff -u -r1.1 patch-ag --- files/patch-ag 15 Jan 1999 02:54:20 -0000 1.1 +++ files/patch-ag 8 Oct 2005 08:04:13 -0000 @@ -1,7 +1,10 @@ --- linuxdoom-1.10/w_wad.c~ Mon Dec 22 22:05:36 1997 +++ linuxdoom-1.10/w_wad.c Mon Dec 14 03:29:18 1998 -@@ -34,7 +34,7 @@ - #include +@@ -32,9 +32,9 @@ + #include + #include +-#include ++#include #include #include -#include Index: files/patch-sndserv__soundsrv.c =================================================================== RCS file: files/patch-sndserv__soundsrv.c diff -N files/patch-sndserv__soundsrv.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-sndserv__soundsrv.c 8 Oct 2005 08:04:13 -0000 @@ -0,0 +1,11 @@ +--- sndserv/soundsrv.c.orig Sat Oct 8 17:15:28 2005 ++++ sndserv/soundsrv.c Sat Oct 8 17:15:33 2005 +@@ -47,7 +47,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + Index: files/patch-sndserv__wadread.c =================================================================== RCS file: files/patch-sndserv__wadread.c diff -N files/patch-sndserv__wadread.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-sndserv__wadread.c 8 Oct 2005 08:04:13 -0000 @@ -0,0 +1,11 @@ +--- sndserv/wadread.c.orig Sat Oct 8 17:15:05 2005 ++++ sndserv/wadread.c Sat Oct 8 17:15:09 2005 +@@ -39,7 +39,7 @@ + + + +-#include ++#include + #include + #include + #include >Release-Note: >Audit-Trail: >Unformatted: