Fetch the .wad file so that the game is playable.

Files are now installed in share/doom/ and libexec/doom/. bin/doom is now
a script.
Now the linuxddom port is useful only if one wants joystick support or
the musserver program.

3 files changed, 42 insertions, 8 deletions

diff --git a/games/doom/Makefile b/games/doom/Makefile
index 3eca129..5d21c44 100644
--- a/games/doom/Makefile
+++ b/games/doom/Makefile
@@ -3,22 +3,27 @@
 # Date created:         Mon Dec 14 21:03:01 MET 1998
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.9 1999/01/18 08:44:41 asami Exp $
+# $Id: Makefile,v 1.10 1999/02/03 11:11:43 asami Exp $
 #
 
 DISTNAME=	doomsrc-1.8
 PKGNAME=	doom-1.8
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.idsoftware.com/idstuff/source/ \
+MASTER_SITES?=	ftp://ftp.idsoftware.com/idstuff/source/ \
 		ftp://ftp.stomped.com/pub/idmirror/idstuff/source/ \
 		ftp://ftp.cdrom.com/pub/idgames/idstuff/source/ \
 		ftp://ftp.gamesnet.net/idsoftware/source/
-DISTFILES=	doomsrc.zip
+DISTFILES?=	doomsrc.zip
 
 MAINTAINER=	jmz@FreeBSD.org
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
+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
+
 USE_XLIB=	yes
 EXTRACT_CMD=	unzip
 EXTRACT_BEFORE_ARGS=	-q
@@ -26,6 +31,12 @@ EXTRACT_AFTER_ARGS=	# empty
 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
 
@@ -34,7 +45,12 @@ do-build:
 	@cd ${WRKDIR}/sndserv && ${GMAKE}
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKDIR}/linuxdoom-1.10/linux/linuxxdoom ${PREFIX}/bin/doom
-	@${INSTALL_PROGRAM} ${WRKDIR}/sndserv/linux/sndserver ${PREFIX}/bin/sndserver
+	@${MKDIR} ${PREFIX}/libexec/doom ${PREFIX}/share/doom
+	@${INSTALL_PROGRAM} ${WRKDIR}/linuxdoom-1.10/linux/linuxxdoom ${PREFIX}/libexec/doom/xdoom
+	@${INSTALL_PROGRAM} ${WRKDIR}/sndserv/linux/sndserver ${PREFIX}/libexec/doom/sndserver
+	@(${ECHO} "#!/bin/sh"; ${ECHO} "cd ${PREFIX}/libexec/doom"; \
+	  ${ECHO} 'export PATH=.:$$PATH';${ECHO} "export DOOMWADDIR=${PREFIX}/share/doom"; ${ECHO} "./xdoom $$*") > ${PREFIX}/bin/doom
+	@/bin/chmod ugo+x ${PREFIX}/bin/doom
+	@${GZCAT} ${DISTDIR}/${DISTFILES2} > ${PREFIX}/share/doom/doom1.wad
 
 .include <bsd.port.mk>
diff --git a/games/doom/files/patch-ac b/games/doom/files/patch-ac
index 1bce7c6..100d158 100644
--- a/games/doom/files/patch-ac
+++ b/games/doom/files/patch-ac
@@ -1,5 +1,5 @@
---- linuxdoom-1.10/i_sound.c~	Mon Dec 22 20:57:15 1997
-+++ linuxdoom-1.10/i_sound.c	Mon Dec 14 03:22:43 1998
+--- linuxdoom-1.10/i_sound.c.orig	Mon Dec 22 20:57:15 1997
++++ linuxdoom-1.10/i_sound.c	Wed Feb 10 04:18:53 1999
 @@ -42,7 +42,7 @@
  #include <sys/ioctl.h>
  
@@ -9,3 +9,17 @@
  
  // Timer stuff. Experimental.
  #include <time.h>
+@@ -740,11 +740,13 @@
+ #ifdef SNDSERV
+   char buffer[256];
+   
++#if jmz
+   if (getenv("DOOMWADDIR"))
+     sprintf(buffer, "%s/%s",
+ 	    getenv("DOOMWADDIR"),
+ 	    sndserver_filename);
+   else
++#endif
+     sprintf(buffer, "%s", sndserver_filename);
+   
+   // start sound process
diff --git a/games/doom/pkg-plist b/games/doom/pkg-plist
index 8f9862b..103e5b9 100644
--- a/games/doom/pkg-plist
+++ b/games/doom/pkg-plist
@@ -1,2 +1,6 @@
 bin/doom
-bin/sndserver
+libexec/doom/sndserver
+libexec/doom/xdoom
+share/doom/doom1.wad
+@dirrm share/doom
+@dirrm libexec/doom