From alejandro@varnet.biz  Thu Sep 22 00:21:00 2005
Return-Path: <alejandro@varnet.biz>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C07B316A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 22 Sep 2005 00:21:00 +0000 (GMT)
	(envelope-from alejandro@varnet.biz)
Received: from relay02.pair.com (relay02.pair.com [209.68.5.16])
	by mx1.FreeBSD.org (Postfix) with SMTP id 63C4843D46
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 22 Sep 2005 00:21:00 +0000 (GMT)
	(envelope-from alejandro@varnet.biz)
Received: (qmail 14668 invoked from network); 22 Sep 2005 00:20:58 -0000
Received: from unknown (HELO phobos.mars.bsd) (unknown)
  by unknown with SMTP; 22 Sep 2005 00:20:58 -0000
Message-Id: <1127348469.0@phobos.mars.bsd>
Date: Wed, 21 Sep 2005 21:21:09 -0300
From: "Alejandro Pulver" <alejandro@varnet.biz>
To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@freebsd.org>
Subject: [UPDATE] games/doom: integrate with "doom-data"
X-Send-Pr-Version: gtk-send-pr 0.4.6 
X-GNATS-Notify:

>Number:         86445
>Category:       ports
>Synopsis:       [UPDATE] games/doom: integrate with "doom-data"
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jmz
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 22 00:30:05 GMT 2005
>Closed-Date:    Thu Nov 17 12:08:57 GMT 2005
>Last-Modified:  Thu Nov 17 12:08:57 GMT 2005
>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@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
-@dirrm share/doom
 @dirrm libexec/doom
--- doom.diff ends here ---



>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->jmz 
Responsible-Changed-By: barner 
Responsible-Changed-When: Thu Sep 22 12:58:42 GMT 2005 
Responsible-Changed-Why:  
Over to maintainer. 

There is a whole bunch of doom PRs. 

A prerequisite for your port is ports/86439 (doom datafiles). 

There are also updates for various other doom ports in order to 
integrate them with the new datafiles port, so you'd need to 
contact their maintainers: 

games/deng, ip@doom.homeunix.org, ports/86440 
games/doomlegacy, bock@bock.nnov.ru, ports/86446 
games/prboom, robin.schoonover@gmail.com, ports/86447 
games/vavoom, ip@doom.homeunix.org, ports/86448 

There are also various new ports depending on the new doom 
datafiles port, but I'd suggest migrating the old ports first. 

I'll forward the above PRs to their maintainers, and then 
we can see how to proceed. 

Generally, I think the integration is a good idea. 

Best regards, 
Simon 

http://www.freebsd.org/cgi/query-pr.cgi?pr=86445 

From: "Alejandro Pulver" <alejandro@varnet.biz>
To: "FreeBSD gnats submit" <bug-followup@freebsd.org>
Cc:  
Subject: Re: ports/86445: [UPDATE] games/doom: integrate with "doom-data"
Date: Thu, 22 Sep 2005 20:23:14 -0300

 >Submitter-Id:	current-users 
 >Originator:	Alejandro Pulver 
 >Organization:	 
 >Confidential:	no 
 >Synopsis:	Re: ports/86445: [UPDATE] games/doom: integrate with "doom-data" 
 >Severity:	non-critical 
 >Priority:	low 
 >Category:	ports 
 >Class:		update 
 >Release:	FreeBSD 5.4-RELEASE i386 
 >Environment:
 
 
 
 
 
 >Description:
 
 
 This patch has to be applied to the previous patch.
 
 Changes:
 * Respect possible changes of the DMDIR variable.
 
 
 >How-To-Repeat:
 
 
 
 
 
 >Fix:
 
 
 --- new.diff begins here ---
 --- ../../pkgd/sent/doom/doom.diff	Wed Sep 21 21:18:27 2005
 +++ doom.diff	Thu Sep 22 20:19:51 2005
 @@ -1,7 +1,7 @@
  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 @@
 ++++ doom/Makefile	Thu Sep 22 20:19:31 2005
 +@@ -9,52 +9,39 @@
   PORTVERSION=	1.8
   PORTREVISION=	1
   CATEGORIES=	games
 @@ -37,6 +37,8 @@
  -	@${MAKE} ${.MAKEFLAGS} do-fetch __REAL_FETCH__=YES \
  -	DISTFILES="${DISTFILES2}" MASTER_SITES="${MASTER_SITES2}"
  -.endif
 ++DATADIR=	${DMDIR}
 ++
   post-extract:
   	@cd ${WRKDIR} && ${TAR} xzf linuxdoom-1.10.src.tgz && ${TAR} xzf sndserv.tgz
   
 --- new.diff ends here ---
 
 
 
State-Changed-From-To: open->closed 
State-Changed-By: barner 
State-Changed-When: Thu Nov 17 12:08:56 GMT 2005 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=86445 
>Unformatted:
