ver bump

7 files changed, 205 insertions, 9 deletions

diff --git a/games-fps/duke3d/ChangeLog b/games-fps/duke3d/ChangeLog
index fc3fb23d0022..bd49f2a09073 100644
--- a/games-fps/duke3d/ChangeLog
+++ b/games-fps/duke3d/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-fps/duke3d
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/ChangeLog,v 1.14 2004/06/24 22:41:34 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/ChangeLog,v 1.15 2004/08/18 04:08:57 vapier Exp $
+
+*duke3d-20040817 (18 Aug 2004)
+
+  18 Aug 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/20040817-credits.patch, +files/20040817-duke3d-makefile-opts.patch,
+  -files/duke3d, +duke3d-20040817.ebuild:
+  Version bump #60578.
 
   07 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org>
   duke3d-20030817-r1.ebuild:
diff --git a/games-fps/duke3d/Manifest b/games-fps/duke3d/Manifest
index f2e8120379b0..2a4d71d678f3 100644
--- a/games-fps/duke3d/Manifest
+++ b/games-fps/duke3d/Manifest
@@ -1,10 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 028e37e7e82d18a9e6153c7e8904f68b ChangeLog 2250
 MD5 4f8ea93527f1b7723438a4d1a207030b duke3d-20030817-r1.ebuild 2783
-MD5 1c740daf3460757602485cb92494b92c ChangeLog 2027
 MD5 3a1f336e4cfd9b74bc9bacb21ea0b300 metadata.xml 2684
-MD5 d9b4e6eca1f10d7502ce7c8b360ba16b files/network.cfg 398
-MD5 7c4ac6336d128a410fc4fb603ad8b8c7 files/20030817-duke3d-makefile-opts.patch 864
+MD5 95a1be21fd5a473fa8d93d40b662e06d duke3d-20040817.ebuild 2732
 MD5 f61d663b18e338844d9bdab8cd8a113d files/20030817-buildengine-makefile-cflags.patch 523
-MD5 b31ef5149ad5b5e9f0ea1d64d6cf47fb files/duke3d 45
+MD5 7c4ac6336d128a410fc4fb603ad8b8c7 files/20030817-duke3d-makefile-opts.patch 864
+MD5 73621a8c90765f4722208283a01319f7 files/digest-duke3d-20030817-r1 66
 MD5 ccf71074bb15e3a511194a887a3a7040 files/duke3d.cfg 4314
+MD5 d9b4e6eca1f10d7502ce7c8b360ba16b files/network.cfg 398
 MD5 dfe6b67444e51a0fa3ff5c5bf76261d8 files/20030817-credits.patch 1273
-MD5 73621a8c90765f4722208283a01319f7 files/digest-duke3d-20030817-r1 66
+MD5 7c796eee05f2a392dd0449339bc37804 files/digest-duke3d-20040817 69
+MD5 6ba6bae3aa96076fbb7dc72e06d93d3d files/20040817-credits.patch 1267
+MD5 50643150138fd99d9cfb2ed68df15e7d files/20040817-duke3d-makefile-opts.patch 863
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBItZpHTu7gpaalycRAnBBAJ9QvPasKngOB23vvGdhI59zZEN7twCePk78
+2MWlANJ6fAOe96vEOdgcLXs=
+=zKw1
+-----END PGP SIGNATURE-----
diff --git a/games-fps/duke3d/duke3d-20040817.ebuild b/games-fps/duke3d/duke3d-20040817.ebuild
new file mode 100644
index 000000000000..a9dbeb8c43e7
--- /dev/null
+++ b/games-fps/duke3d/duke3d-20040817.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/duke3d-20040817.ebuild,v 1.1 2004/08/18 04:08:57 vapier Exp $
+
+fromcvs=0
+ECVS_MODULE="duke3d"
+if [ ${fromcvs} -eq 1 ] ; then
+ECVS_PASS="anonymous"
+ECVS_SERVER="icculus.org:/cvs/cvsroot"
+inherit cvs
+fi
+inherit eutils flag-o-matic games
+
+DESCRIPTION="port of the original DukeNukem 3D"
+HOMEPAGE="http://icculus.org/projects/duke3d/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc"
+IUSE="perl opengl" # nophysfs"
+
+RDEPEND="virtual/x11
+	media-libs/libsdl
+	media-libs/sdl-mixer
+	media-sound/timidity++
+	media-sound/timidity-eawpatches
+	perl? ( dev-lang/perl )
+	opengl? ( virtual/opengl )"
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )
+	>=sys-apps/sed-4"
+
+S="${WORKDIR}/${ECVS_MODULE}"
+
+use_tf() { useq ${1} && echo "true" || echo "false"; }
+
+src_unpack() {
+	if [ ${fromcvs} -eq 1 ] ; then
+		cvs_src_unpack
+		cd duke3d/source
+		ECVS_MODULE="buildengine"
+		cvs_src_unpack
+	else
+		unpack ${A}
+	fi
+
+	# configure buildengine
+	cd ${S}/source/buildengine
+	sed -i \
+		-e "/^useperl := / s:=.*:= $(use_tf perl):" \
+		-e "/^useopengl := / s:=.*:= $(use_tf opengl):" \
+		-e "/^usephysfs := / s:=.*:= false:" \
+		-e 's:-O3::' -e 's: -g : :' \
+		-e 's:/usr/lib/perl5/i386-linux/CORE/libperl.a::' \
+		Makefile \
+		|| die "sed build Makefile failed"
+
+	# configure duke3d
+	cd ${S}/source
+	epatch "${FILESDIR}/${PV}-credits.patch"
+	epatch "${FILESDIR}/${PV}-duke3d-makefile-opts.patch" # need to sync features with build engine
+	sed -i \
+		-e "/^useopengl := / s:=.*:= $(use_tf opengl):" \
+		-e "/^usephysfs := / s:=.*:= false:" \
+		Makefile \
+		|| die "sed duke3d Makefile failed"
+	if use x86 ; then
+		sed -i -e 's:^#USE_ASM:USE_ASM:' buildengine/Makefile
+		sed -i -e '/^#use_asm := /s:#::' Makefile
+	fi
+
+	# causes crazy redefine errors with gcc-3.[2-4].x
+	replace-flags -O3 -O2
+}
+
+src_compile() {
+	cd source/buildengine
+	emake OPTFLAGS="${CFLAGS}" || die "buildengine failed"
+	cd ..
+	emake OPTIMIZE="${CFLAGS}" || die "duke3d failed"
+}
+
+src_install() {
+	games_make_wrapper duke3d "${GAMES_BINDIR}/duke3d.bin" "${GAMES_DATADIR}/${PN}"
+	newgamesbin source/duke3d duke3d.bin || die "newgamesbin failed"
+
+	dodoc readme.txt
+
+	cd testdata
+	insinto "${GAMES_DATADIR}/${PN}"
+	newins defs.con DEFS.CON
+	newins game.con GAME.CON
+	newins user.con USER.CON
+	doins "${FILESDIR}/network.cfg"
+	insinto "${GAMES_SYSCONFDIR}"
+	doins "${FILESDIR}/duke3d.cfg"
+	dosym "${GAMES_SYSCONFDIR}/duke3d.cfg" "${GAMES_DATADIR}/${PN}/DUKE3D.CFG"
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	einfo "Just put the data files in ${GAMES_DATADIR}/${PN}"
+	einfo "before playing !"
+}
diff --git a/games-fps/duke3d/files/20040817-credits.patch b/games-fps/duke3d/files/20040817-credits.patch
new file mode 100644
index 000000000000..176fcd74752b
--- /dev/null
+++ b/games-fps/duke3d/files/20040817-credits.patch
@@ -0,0 +1,38 @@
+--- menues.c	2003-08-17 22:16:10.000000000 +0200
++++ menues.c	2004-03-29 01:59:28.000000000 +0200
+@@ -1747,9 +1747,10 @@
+         case 996:
+         case 997:
+ 
+-//            rotatesprite(c<<16,200<<15,65536L,0,MENUSCREEN,16,0,10+64,0,0,xdim-1,ydim-1);
+-//            rotatesprite(c<<16,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1);
+-//            menutext(c,24,0,0,"CREDITS");
++            c = (320>>1);
++            rotatesprite(c<<16,200<<15,65536L,0,MENUSCREEN,16,0,10+64,0,0,xdim-1,ydim-1);
++            rotatesprite(c<<16,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1);
++            menutext(c,24,0,0,"CREDITS");
+ 
+             if(KB_KeyPressed(sc_Escape)) { cmenu(0); break; }
+ 
+@@ -1926,6 +1927,21 @@
+ 
+             menutext(c,67+16+16+16+16+16,SHX(-7),PHX(-7),"QUIT");
+ 
++    gametext(c,67+16+16+16+16+16+16+16,"Duke Nukem 3D for "
++#if defined PLATFORM_MACOSX
++            "MacOS"
++#elif defined PLATFORM_DOS
++            "MS-Dos"
++#elif defined PLATFORM_WIN32
++            "Win32"
++#elif defined PLATFORM_UNIX
++            "Gentoo"
++#else       
++            "unknown"
++#endif      
++            ,16,2+8+16);
++    gametext(c,67+16+16+16+16+16+16+16+9,"build " __DATE__ " " __TIME__,16,2+8+16);
++
+             break;
+ // CTW END - MODIFICATION
+ 
diff --git a/games-fps/duke3d/files/20040817-duke3d-makefile-opts.patch b/games-fps/duke3d/files/20040817-duke3d-makefile-opts.patch
new file mode 100644
index 000000000000..d23f7a118f77
--- /dev/null
+++ b/games-fps/duke3d/files/20040817-duke3d-makefile-opts.patch
@@ -0,0 +1,33 @@
+--- Makefile.orig	2003-08-17 17:45:35.948650760 -0400
++++ Makefile	2003-08-17 17:46:36.894385600 -0400
+@@ -4,6 +4,8 @@
+ beos := false
+ macosx := false
+ #use_asm := true
++use_opengl := true
++use_physfs := false
+ 
+ #-----------------------------------------------------------------------------#
+ # If this makefile fails to detect Cygwin correctly, or you want to force
+@@ -80,6 +81,10 @@
+ 	buildengine/pragmas.o \
+ 	buildengine/unix_compat.o
+ 
++ifeq ($(strip $(use_opengl)),true)
++	BUILDOBJS += buildengine/buildgl.o
++endif
++
+ ifeq ($(strip $(use_asm)),true)
+ 	BUILDOBJS += buildengine/a_gnu.o buildengine/a_nasm.o
+ else
+@@ -106,6 +106,10 @@
+ 
+ LDLIBS = $(SDL_LDFLAGS) -lSDL -lSDL_mixer $(EXTRALDFLAGS)
+ 
++ifeq ($(strip $(use_physfs)),true)
++	LDLIBS += -lphysfs
++endif
++
+ # !!! FIXME: Do we even need this? It doesn't fly on MacOS X.  --ryan.
+ #LDLIBS += -Wl,-E
+ 
diff --git a/games-fps/duke3d/files/digest-duke3d-20040817 b/games-fps/duke3d/files/digest-duke3d-20040817
new file mode 100644
index 000000000000..f463266a5a86
--- /dev/null
+++ b/games-fps/duke3d/files/digest-duke3d-20040817
@@ -0,0 +1 @@
+MD5 0f16c909d56dc9c7b3f8bdbd80b8ab45 duke3d-20040817.tar.bz2 1509273
diff --git a/games-fps/duke3d/files/duke3d b/games-fps/duke3d/files/duke3d
deleted file mode 100644
index 6845e3e01216..000000000000
--- a/games-fps/duke3d/files/duke3d
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd GENTOO_DIR
-exec duke3d.bin "$@"