add quake-data to search path #29710

4 files changed, 66 insertions, 19 deletions

diff --git a/games-fps/nprquake-sdl/ChangeLog b/games-fps/nprquake-sdl/ChangeLog
index 7ef0469f263c..0876e9532866 100644
--- a/games-fps/nprquake-sdl/ChangeLog
+++ b/games-fps/nprquake-sdl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/nprquake-sdl
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/nprquake-sdl/ChangeLog,v 1.2 2003/09/10 16:08:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/nprquake-sdl/ChangeLog,v 1.3 2003/09/29 00:26:45 vapier Exp $
+
+*nprquake-sdl-1-r1 (28 Sep 2003)
+
+  28 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add ${GAMES_DATADIR}/quake-data to the pak file search path #29710.
 
 *nprquake-sdl-1 (17 Jul 2003)
 
diff --git a/games-fps/nprquake-sdl/files/1-gentoo.patch b/games-fps/nprquake-sdl/files/1-gentoo.patch
index 6cf215f946f5..35b206e69300 100644
--- a/games-fps/nprquake-sdl/files/1-gentoo.patch
+++ b/games-fps/nprquake-sdl/files/1-gentoo.patch
@@ -1,27 +1,66 @@
-diff -ur NPRQuake-SDL-orig/Makefile NPRQuake-SDL/Makefile
---- NPRQuake-SDL-orig/Makefile	2003-07-16 23:58:48.000000000 -0400
-+++ NPRQuake-SDL/Makefile	2003-07-16 23:58:59.000000000 -0400
+diff -ur NPRQuake-SDL.orig/Makefile NPRQuake-SDL/Makefile
+--- NPRQuake-SDL.orig/Makefile	2003-09-28 20:09:29.010852408 -0400
++++ NPRQuake-SDL/Makefile	2003-09-28 20:09:29.521774736 -0400
 @@ -1,4 +1,4 @@
 -RELEASE_CFLAGS=-Dstricmp=strcasecmp -mcpu=i586 -march=i586 -O6 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations
-+RELEASE_CFLAGS=-Dstricmp=strcasecmp GENTOO_CFLAGS -O6 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations
++RELEASE_CFLAGS=-Dstricmp=strcasecmp $(OPTFLAGS) -DGENTOO_LIBDIR='\"$(GENTOO_LIBDIR)\"' -DGENTOO_DATADIR='\"$(GENTOO_DATADIR)\"'
  
  DEBUG_CFLAGS=-Dstricmp=strcasecmp -g
  
-diff -ur NPRQuake-SDL-orig/NPRQuakeSrc/Makefile NPRQuake-SDL/NPRQuakeSrc/Makefile
---- NPRQuake-SDL-orig/NPRQuakeSrc/Makefile	2003-07-16 23:58:48.000000000 -0400
-+++ NPRQuake-SDL/NPRQuakeSrc/Makefile	2003-07-16 23:59:38.000000000 -0400
+diff -ur NPRQuake-SDL.orig/NPRQuakeSrc/Makefile NPRQuake-SDL/NPRQuakeSrc/Makefile
+--- NPRQuake-SDL.orig/NPRQuakeSrc/Makefile	2003-09-28 20:09:29.065844048 -0400
++++ NPRQuake-SDL/NPRQuakeSrc/Makefile	2003-09-28 20:09:43.153702368 -0400
 @@ -29,7 +29,7 @@
  
  CC=gcc
  
 -RELEASE_CFLAGS=$(BASE_CFLAGS) -mcpu=i586 -march=i586 -O6 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations
-+RELEASE_CFLAGS=$(BASE_CFLAGS) GENTOO_CFLAGS -O6 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations
++RELEASE_CFLAGS=$(BASE_CFLAGS) $(OPTFLAGS) -DGENTOO_LIBDIR='\"$(GENTOO_LIBDIR)\"' -DGENTOO_DATADIR='\"$(GENTOO_DATADIR)\"'
  DEBUG_CFLAGS=$(BASE_CFLAGS) -g
  LDFLAGS=-lm
  CFLAGS=$(RELEASE_CFLAGS)
-diff -ur NPRQuake-SDL-orig/NPRQuakeSrc/gl_rmisc.c NPRQuake-SDL/NPRQuakeSrc/gl_rmisc.c
---- NPRQuake-SDL-orig/NPRQuakeSrc/gl_rmisc.c	2003-07-16 23:58:49.000000000 -0400
-+++ NPRQuake-SDL/NPRQuakeSrc/gl_rmisc.c	2003-07-17 00:00:39.000000000 -0400
+@@ -176,7 +176,7 @@
+ 	$(DO_GL_CC)
+ 
+ $(BUILDDIR)/glquake/common.o :       common.c
+-	$(DO_GL_DEBUG_CC)
++	$(DO_GL_CC)
+ 
+ $(BUILDDIR)/glquake/console.o :      console.c
+ 	$(DO_GL_CC)
+diff -ur NPRQuake-SDL.orig/NPRQuakeSrc/common.c NPRQuake-SDL/NPRQuakeSrc/common.c
+--- NPRQuake-SDL.orig/NPRQuakeSrc/common.c	2003-09-28 20:09:29.140832648 -0400
++++ NPRQuake-SDL/NPRQuakeSrc/common.c	2003-09-28 20:09:29.525774128 -0400
+@@ -1775,11 +1775,16 @@
+ // start up with GAMENAME by default (id1)

+ //

+ 	COM_AddGameDirectory (va("%s/"GAMENAME, basedir) );

++	COM_AddGameDirectory (GENTOO_DATADIR"/"GAMENAME);
+ 

+-	if (COM_CheckParm ("-rogue"))

++	if (COM_CheckParm ("-rogue")) {

+ 		COM_AddGameDirectory (va("%s/rogue", basedir) );

+-	if (COM_CheckParm ("-hipnotic"))

++		COM_AddGameDirectory (GENTOO_DATADIR"/rogue");
++	}
++	if (COM_CheckParm ("-hipnotic")) {

+ 		COM_AddGameDirectory (va("%s/hipnotic", basedir) );

++		COM_AddGameDirectory (GENTOO_DATADIR"/hipnotic");
++	}
+ 

+ //

+ // -game <gamedir>

+@@ -1790,6 +1795,7 @@
+ 	{

+ 		com_modified = true;

+ 		COM_AddGameDirectory (va("%s/%s", basedir, com_argv[i+1]));

++		COM_AddGameDirectory (va(GENTOO_DATADIR"/%s", com_argv[i+1]));
+ 	}

+ 

+ //

+diff -ur NPRQuake-SDL.orig/NPRQuakeSrc/gl_rmisc.c NPRQuake-SDL/NPRQuakeSrc/gl_rmisc.c
+--- NPRQuake-SDL.orig/NPRQuakeSrc/gl_rmisc.c	2003-09-28 20:09:29.139832800 -0400
++++ NPRQuake-SDL/NPRQuakeSrc/gl_rmisc.c	2003-09-28 20:09:29.529773520 -0400
 @@ -563,13 +563,15 @@
  
      // this should be as big as the number of functions we pull out.
@@ -39,4 +78,3 @@ diff -ur NPRQuake-SDL-orig/NPRQuakeSrc/gl_rmisc.c NPRQuake-SDL/NPRQuakeSrc/gl_rm
  #endif
  
      if( hnewlib == NULL ) {
-Only in NPRQuake-SDL/NPRQuakeSrc: gl_rmisc.c.orig
diff --git a/games-fps/nprquake-sdl/files/digest-nprquake-sdl-1 b/games-fps/nprquake-sdl/files/digest-nprquake-sdl-1-r1
index 92143820f8c2..92143820f8c2 100644
--- a/games-fps/nprquake-sdl/files/digest-nprquake-sdl-1
+++ b/games-fps/nprquake-sdl/files/digest-nprquake-sdl-1-r1
diff --git a/games-fps/nprquake-sdl/nprquake-sdl-1.ebuild b/games-fps/nprquake-sdl/nprquake-sdl-1-r1.ebuild
index d5bf7f6c39ac..dca4670edd48 100644
--- a/games-fps/nprquake-sdl/nprquake-sdl-1.ebuild
+++ b/games-fps/nprquake-sdl/nprquake-sdl-1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/nprquake-sdl/nprquake-sdl-1.ebuild,v 1.1 2003/09/09 18:10:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/nprquake-sdl/nprquake-sdl-1-r1.ebuild,v 1.1 2003/09/29 00:26:45 vapier Exp $
 
 inherit games eutils
 
@@ -18,23 +18,27 @@ S=${WORKDIR}/NPRQuake-SDL
 
 src_unpack() {
 	unpack ${A}
+	cp -rf ${S}{,.orig}
 	cd ${S}
 	epatch ${FILESDIR}/${PV}-gentoo.patch
-	sed -i "s:GENTOO_CFLAGS:${CFLAGS}:" Makefile NPRQuakeSrc/Makefile
-	echo "#define GENTOO_LIBDIR \"${GAMES_LIBDIR}/${PN}\"" >> NPRQuakeSrc/quakedef.h
 }
 
 src_compile() {
-	make release || die
+	make \
+		GENTOO_LIBDIR="${GAMES_LIBDIR}/${PN}" \
+		GENTOO_DATADIR="${GAMES_DATADIR}/quake-data" \
+		OPTFLAGS="${CFLAGS}" \
+		release \
+		|| die
 }
 
 src_install() {
+	dodoc README CHANGELOG
 	newgamesbin NPRQuakeSrc/release*/bin/* nprquake-sdl
 	dodir ${GAMES_LIBDIR}/${PN}
 	cp -r build/* ${D}/${GAMES_LIBDIR}/${PN}/
-	cd ${GAMES_LIBDIR}/${PN}
+	cd ${D}/${GAMES_LIBDIR}/${PN}
 	mv dr_default.so default.so
 	ln -s sketch.so dr_default.so
-	dodoc README CHANGELOG
 	prepgamesdirs
 }