ports/86445: [UPDATE] games/doom: integrate with "doom-data"

[Alejandro Pulver]

>Number:         86445
>Category:       ports
>Synopsis:       [UPDATE] games/doom: integrate with "doom-data"
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 22 00:30:05 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Alejandro Pulver
>Release:        FreeBSD 5.4-RELEASE i386
>Organization:
>Environment:





>Description:


Changes:
* Integrate with "doom-data".
* Use REINPLACE_CMD instead of PERL (to convert dos text files).
* Update MASTER_SITES.


>How-To-Repeat:





>Fix:


--- doom.diff begins here ---
diff -urN /usr/ports/games/doom/Makefile doom/Makefile
--- /usr/ports/games/doom/Makefile	Wed Feb  4 02:20:20 2004
+++ doom/Makefile	Wed Sep 21 21:17:37 2005
@@ -9,52 +9,37 @@
 PORTVERSION=	1.8
 PORTREVISION=	1
 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/
+MASTER_SITES=	ftp://ftp.idsoftware.com/idstuff/source/
 DISTNAME=	doomsrc
 
 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
-
 ONLY_FOR_ARCHS=	i386
 
-USE_PERL5_BUILD=yes
+USE_GMAKE=	yes
+USE_REINPLACE=	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"
+	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} \
+		-E -e 's|#include +<malloc.h>|#include <stdlib.h>|g'
 
 do-build:
 	@cd ${WRKDIR}/linuxdoom-1.10 && ${GMAKE}
 	@cd ${WRKDIR}/sndserv && ${GMAKE}
 
 do-install:
-	@${MKDIR} ${PREFIX}/libexec/doom ${PREFIX}/share/doom
+	@${MKDIR} ${PREFIX}/libexec/doom
 	@${INSTALL_PROGRAM} ${WRKDIR}/linuxdoom-1.10/linux/linuxxdoom ${PREFIX}/libexec/doom/xdoom
 	@${INSTALL_PROGRAM} ${WRKDIR}/sndserv/linux/sndserver ${PREFIX}/libexec/doom/sndserver
-	@(${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
+	@(${ECHO_CMD} "#!${SH}"; ${ECHO_CMD} "cd ${PREFIX}/libexec/doom"; \
+	  ${ECHO_CMD} 'export PATH=.:$$PATH';${ECHO_CMD} "export DOOMWADDIR=${DATADIR}"; ${ECHO_CMD} "./xdoom $$*") > ${PREFIX}/bin/doom
 	@${CHMOD} ugo+x ${PREFIX}/bin/doom
-	@${GZCAT} ${DISTDIR}/${DISTFILES2} > ${PREFIX}/share/doom/doom1.wad
 
 .include <bsd.port.mk>
diff -urN /usr/ports/games/doom/distinfo doom/distinfo
--- /usr/ports/games/doom/distinfo	Wed Mar 17 23:27:35 2004
+++ doom/distinfo	Sat Sep 17 19:39:17 2005
@@ -1,4 +1,2 @@
 MD5 (doomsrc.zip) = 80b3fe460c59ca7bb809c56eec876515
 SIZE (doomsrc.zip) = 362698
-MD5 (doom1v18.wad.gz) = 5da027cbafb33b124f321f3c171cfed6
-SIZE (doom1v18.wad.gz) = 1765823
diff -urN /usr/ports/games/doom/pkg-plist doom/pkg-plist
--- /usr/ports/games/doom/pkg-plist	Wed Feb 10 00:53:31 1999
+++ doom/pkg-plist	Sat Sep 17 19:38:09 2005
@@ -1,6 +1,4 @@
 bin/doom
 libexec/doom/sndserver
 libexec/doom/xdoom
-share/doom/doom1.wad
- at dirrm share/doom
 @dirrm libexec/doom
--- doom.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: