Initial import.

12 files changed, 294 insertions, 4 deletions

diff --git a/games-fps/d1x/ChangeLog b/games-fps/d1x/ChangeLog
new file mode 100644
index 000000000000..f22515ee5c56
--- /dev/null
+++ b/games-fps/d1x/ChangeLog
@@ -0,0 +1,10 @@
+# ChangeLog for games-fps/d1x
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/d1x/ChangeLog,v 1.1 2004/01/19 08:28:36 jbms Exp $
+
+*d1x-20040118 (19 Jan 2004)
+
+  19 Jan 2004; Jeremy Maitin-Shepard <jbms@gentoo.org> d1x-20040118.ebuild,
+  metadata.xml, files/d1x-makefile-linux.patch, files/d1x-missiondir.patch:
+  Initial import.
+
diff --git a/games-fps/d1x/Manifest b/games-fps/d1x/Manifest
index 86d79ec4a41c..b47f538a70ed 100644
--- a/games-fps/d1x/Manifest
+++ b/games-fps/d1x/Manifest
@@ -1,6 +1,6 @@
-MD5 a90f7f685aef0d74c5af0eba2e90bb45 ChangeLog 322
+MD5 e934dcba88bcd6ebfda040d966b5cb65 ChangeLog 406
 MD5 59f9d079172d0164a366133f9ef2ae34 metadata.xml 551
-MD5 1ef300d0112de7b916d850bc0d42e27c d1x-20040118.ebuild 3238
+MD5 fe67e539f76ec269f54aee2d051158ca d1x-20040118.ebuild 3332
 MD5 203a18187bcba9679a5b3102853fe7f4 files/digest-d1x-20040118 135
 MD5 fe21a7e67ef24de5864a502206052663 files/d1x-missiondir.patch 754
 MD5 951de74e67288963ee03c3719074f3fb files/d1x-makefile-linux.patch 1074
diff --git a/games-fps/d1x/d1x-20040118.ebuild b/games-fps/d1x/d1x-20040118.ebuild
new file mode 100644
index 000000000000..f43b6f364e89
--- /dev/null
+++ b/games-fps/d1x/d1x-20040118.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/d1x/d1x-20040118.ebuild,v 1.1 2004/01/19 08:28:36 jbms Exp $
+
+inherit games
+
+DESCRIPTION="Descent 1 Source Project"
+HOMEPAGE="http://d1x.warpcore.org"
+SRC_URI="mirror://gentoo/${P}.tar.bz2 mirror://gentoo/descent1.5-patch.tar.bz2"
+
+LICENSE="Descent1 D1X"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="opengl"
+DEPEND=">=dev-lang/nasm-0.97
+media-libs/libsdl
+opengl? ( virtual/opengl media-libs/libpng sys-libs/zlib )"
+
+S="${WORKDIR}/d1x"
+
+pkg_setup () {
+	games_get_cd descent
+	games_verify_cd "Descent 1"
+	games_pkg_setup
+}
+
+src_unpack () {
+	unpack ${A}
+
+	local dir="${WORKDIR}/descent1-data"
+	mkdir "${dir}" || die
+
+	# Copy data files
+	local src="${GAMES_CD}/descent"
+	cd "${src}" || die
+
+	for x in chaos.hog chaos.msn descent.b50 descent.dem descent.hog \
+		descent.m50 descent.phx descent.pig descent2.adv descentg.ini \
+		level18.dem miniboss.dem readme.txt descent.faq orderfrm.txt \
+		devteam.pcx; do
+	  cp "${x}" "${dir}" || die
+	done
+
+	# Apply 1.0 -> 1.5 patch
+	cd "${WORKDIR}/descent1.5-patch" || die
+	for x in *.patch; do
+		if patch "${dir}/${x%%.patch}" < "${x}" \
+			>/dev/null 2>/dev/null; then
+			einfo "Patched ${x%%.patch} to version 1.5"
+		fi
+	done
+
+	cd "${S}" || die
+	epatch "${FILESDIR}/d1x-missiondir.patch" || die
+
+	cp defines.in defines.mak || die
+	epatch "${FILESDIR}/d1x-makefile-linux.patch" || die
+
+	if use opengl; then
+		sed -i -e 's/^#\(SDLGL_IO = 1\)/\1/' defines.mak || die
+	else
+		sed -i -e 's/^#\(SDL_IO = 1\)/\1/' defines.mak || die
+	fi
+}
+
+src_compile () {
+	make dep || die
+	make || die
+}
+
+src_install () {
+
+	# Install D1X documentation
+	cd "${S}"
+	dodoc d1x.faq d1x.txt d1x140.txt readme.d1x readme.org todo.txt \
+		bugs.txt || die
+	dodir
+
+	# Copy data files
+	local src="${WORKDIR}/descent1-data"
+	local dir="${GAMES_DATADIR}/d1x"
+	cd "${src}" || die
+
+	dodir "${dir}"
+
+	insinto "${dir}"
+	for x in chaos.hog chaos.msn descent.b50 descent.dem descent.hog \
+		descent.m50 descent.phx descent.pig descent2.adv descentg.ini \
+		level18.dem miniboss.dem; do
+	  doins "${x}" || die
+	done
+
+	# Install original documentation files
+	dodoc "readme.txt" "descent.faq" "orderfrm.txt" "devteam.pcx" || die
+
+	# Copy d1x.ini
+	cd "${S}" || die
+	insinto "${dir}"
+	doins d1x.ini || die
+
+	# Install the binary executable
+	local binname
+	if use opengl; then
+		binname="d1x143_ogl"
+	else
+		binname="d1x143"
+	fi
+
+	insinto "${GAMES_LIBDIR}/${PN}"
+	insopts -m0750
+	doins "${binname}"
+
+	# Install the shell script wrapper
+	local tempbin
+	tempbin="${T}/d1x"
+	echo -en "#!/bin/sh\n" > "${tempbin}"
+	echo -en "if [ ! -e \"\${HOME}/.d1x\" ]; then\n" >> "${tempbin}"
+	echo -en "  mkdir \"\${HOME}/.d1x\"\n" >> "${tempbin}"
+	echo -en "  cp \"${dir}/d1x.ini\" \"\${HOME}/.d1x/\"\n" >> "${tempbin}"
+	echo -en "fi\n\n" >> "${tempbin}"
+	echo -en "cd \"\${HOME}/.d1x/\"\n" >> "${tempbin}"
+	echo -en "exec ${GAMES_LIBDIR}/${PN}/${binname} " >> "${tempbin}"
+	echo -en "-missiondir \"${dir}\" \"\$@\"\n" >> "${tempbin}"
+	dogamesbin "${tempbin}"
+
+	prepgamesdirs
+}
+
+pkg_postinst () {
+	games_pkg_postinst
+	echo
+	einfo "You may want to install the additional map package, which contains"
+	einfo "popular third-party multiplayer maps."
+	echo
+	einfo "To do so, run: emerge games-fps/descent1-maps"
+}
diff --git a/games-fps/d1x/files/d1x-makefile-linux.patch b/games-fps/d1x/files/d1x-makefile-linux.patch
new file mode 100644
index 000000000000..21ebedd84485
--- /dev/null
+++ b/games-fps/d1x/files/d1x-makefile-linux.patch
@@ -0,0 +1,42 @@
+--- defines.mak.orig	2004-01-18 22:48:53.176558208 -0500
++++ defines.mak	2004-01-18 22:56:45.215797336 -0500
+@@ -1,5 +1,5 @@
+ # NOERROR:       make sure there are no warnings in compile
+-NOERROR = 1
++#NOERROR = 1
+ 
+ # NO_ASM:       don't use assembler
+ #NO_ASM = 1
+@@ -38,12 +38,12 @@
+ RELEASE = 1
+ 
+ # environment
+-ENV_DJGPP = 1
++#ENV_DJGPP = 1
+ #ENV_DJGPP_REALDOS =1
+ #ENV_MINGW32 = 1
+ #ENV_CYGWIN = 1
+ #ENV_MSVC = 1
+-#ENV_LINUX = 1
++ENV_LINUX = 1
+ 
+ # if compiling with Cygwin, you need extra mingw compatible c++ libraries (see compile.txt)
+ #MINGW_EXTRA = /Cygnus/mingw/
+@@ -79,7 +79,7 @@
+ #GLX_IO = 1
+ 
+ # linux audio options (choose one)
+-#SDL_AUDIO = 1
++SDL_AUDIO = 1
+ #ALSA_AUDIO = 1
+ 
+ # secondary compiler options
+@@ -93,7 +93,7 @@
+ #sound options for dos: choose which
+ #MIKMOD = 1     #MikMod digital, can be used with allg_midi
+ #ALLG_MIDI = 1  #Allegro midi, can be used with mikmod
+-ALLEGRO = 1     #Allegro for midi and digi, should be used alone
++#ALLEGRO = 1     #Allegro for midi and digi, should be used alone
+ 
+ #music options for linux:
+ #HMIPLAY = 1
diff --git a/games-fps/d1x/files/d1x-missiondir.patch b/games-fps/d1x/files/d1x-missiondir.patch
new file mode 100644
index 000000000000..ace675cb6d9f
--- /dev/null
+++ b/games-fps/d1x/files/d1x-missiondir.patch
@@ -0,0 +1,27 @@
+diff -ur d1x.orig/main/inferno.c d1x/main/inferno.c
+--- d1x.orig/main/inferno.c	2003-11-18 23:31:29.000000000 -0500
++++ d1x/main/inferno.c	2004-01-18 22:48:53.122566416 -0500
+@@ -1144,6 +1144,11 @@
+ 	// Things to initialize before anything else
+ 	arch_init_start();
+ 
++	if ((t = FindArg( "-missiondir" )))
++		cfile_use_alternate_hogdir(Args[t+1]);
++        else
++                cfile_use_alternate_hogdir("");
++
+ 	load_text();
+ 
+ //	set_exit_message("\n\n%s", TXT_THANKS);
+@@ -1172,11 +1177,6 @@
+          }
+ //end this section addition - VR
+ 
+-	if ((t = FindArg( "-missiondir" )))
+-		cfile_use_alternate_hogdir(Args[t+1]);
+-        else
+-                cfile_use_alternate_hogdir("");
+-
+ 	if ((t=FindArg("-tmap"))){
+ 		select_tmap(Args[t+1]);
+ 	}else
diff --git a/games-fps/d1x/files/digest-d1x-20040118 b/games-fps/d1x/files/digest-d1x-20040118
new file mode 100644
index 000000000000..46832e95a0cb
--- /dev/null
+++ b/games-fps/d1x/files/digest-d1x-20040118
@@ -0,0 +1,2 @@
+MD5 882b249c0b5c6bf0f0a830cba2c0234d d1x-20040118.tar.bz2 1372821
+MD5 f761763c7b3b0e0597db84dfdf4496ac descent1.5-patch.tar.bz2 193041
diff --git a/games-fps/d1x/metadata.xml b/games-fps/d1x/metadata.xml
new file mode 100644
index 000000000000..02d50bdd2acd
--- /dev/null
+++ b/games-fps/d1x/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>d1x</herd>
+<maintainer>
+  <email>jbms@gentoo.org</email>
+  <name>Jeremy Maitin-Shepard</name>
+</maintainer>
+<longdescription>
+Descent 1 is a classic first-person shooter released in 1995 by Interplay and Parallax.  It was one of the first games with true 3-dimensional graphics, movement, and light sourcing.  D1X is a modification of the Descent 1 source that was released by Parallax.
+</longdescription>
+</pkgmetadata>
diff --git a/games-fps/descent1-maps/ChangeLog b/games-fps/descent1-maps/ChangeLog
new file mode 100644
index 000000000000..dfa1fdbf4cc5
--- /dev/null
+++ b/games-fps/descent1-maps/ChangeLog
@@ -0,0 +1,10 @@
+# ChangeLog for games-fps/descent1-maps
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/descent1-maps/ChangeLog,v 1.1 2004/01/19 08:28:12 jbms Exp $
+
+*descent1-maps-1.0 (19 Jan 2004)
+
+  19 Jan 2004; Jeremy Maitin-Shepard <jbms@gentoo.org>
+  descent1-maps-1.0.ebuild, metadata.xml:
+  Initial import.
+
diff --git a/games-fps/descent1-maps/Manifest b/games-fps/descent1-maps/Manifest
index 374fd5e69c52..d42fe469853e 100644
--- a/games-fps/descent1-maps/Manifest
+++ b/games-fps/descent1-maps/Manifest
@@ -1,4 +1,4 @@
-MD5 74e5639b0ea94056dd3f6f680bc6d16f descent1-maps-1.0.ebuild 631
-MD5 548032cec5fe1055e2e09878ee5f8595 ChangeLog 282
+MD5 24145b3df7614b838bc45a7035f66225 descent1-maps-1.0.ebuild 740
+MD5 a0e73e5d78daf465cf2d6fe7882128d1 ChangeLog 376
 MD5 9ff97a899ab69f912a5e08972642e35f metadata.xml 364
 MD5 9f31e00c2eaa7bc81aee308cafd24a70 files/digest-descent1-maps-1.0 69
diff --git a/games-fps/descent1-maps/descent1-maps-1.0.ebuild b/games-fps/descent1-maps/descent1-maps-1.0.ebuild
new file mode 100644
index 000000000000..be6d2abc179c
--- /dev/null
+++ b/games-fps/descent1-maps/descent1-maps-1.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/descent1-maps/descent1-maps-1.0.ebuild,v 1.1 2004/01/19 08:28:12 jbms Exp $
+
+inherit games
+
+DESCRIPTION="Descent 1 third-party multiplayer maps"
+HOMEPAGE="http://d1x.warpcore.org"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86"
+DEPEND="games-fps/d1x"
+
+S="${WORKDIR}/${P}"
+
+src_install () {
+
+	local dir="${GAMES_DATADIR}/d1x"
+	cd "${S}" || die
+
+	# Install map data
+
+	dodir "${dir}"
+
+	insinto "${dir}"
+	for x in *.rdl *.msn; do
+		doins "${x}" || die
+	done
+
+	# Install documentation
+	for x in *.txt; do
+		dodoc "${x}" || die
+	done
+
+	prepgamesdirs
+}
diff --git a/games-fps/descent1-maps/files/digest-descent1-maps-1.0 b/games-fps/descent1-maps/files/digest-descent1-maps-1.0
new file mode 100644
index 000000000000..f1ff1239bcb9
--- /dev/null
+++ b/games-fps/descent1-maps/files/digest-descent1-maps-1.0
@@ -0,0 +1 @@
+MD5 b2b884b683e99d25def1e04ee3c4e43d descent1-maps-1.0.tar.bz2 22811
diff --git a/games-fps/descent1-maps/metadata.xml b/games-fps/descent1-maps/metadata.xml
new file mode 100644
index 000000000000..93805bcd0524
--- /dev/null
+++ b/games-fps/descent1-maps/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>jbms@gentoo.org</email>
+  <name>Jeremy Maitin-Shepard</name>
+</maintainer>
+<longdescription>
+This package includes two popular multiplayer maps, Minerva and NYSA.
+</longdescription>
+</pkgmetadata>