ports/87111: [patch] sanitize games/doom fetch target (and other patches)
Edwin Groothuis
edwin at mavetju.org
Sat Oct 8 08:10:21 UTC 2005
>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 at 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 at 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 +<malloc.h>@#include <stdlib.h>@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 <bsd.port.mk>
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 <malloc.h>
+@@ -32,9 +32,9 @@
+ #include <string.h>
+ #include <unistd.h>
+-#include <malloc.h>
++#include <stdlib.h>
#include <fcntl.h>
#include <sys/stat.h>
-#include <alloca.h>
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 <sys/ioctl.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <sys/stat.h>
+ #include <sys/time.h>
+
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 <malloc.h>
++#include <stdlib.h>
+ #include <fcntl.h>
+ #include <sys/stat.h>
+ #include <stdio.h>
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list