compile time fix #35167

diff --git a/games-rpg/openglad/ChangeLog b/games-rpg/openglad/ChangeLog
index 87036530e0b100d3fc58be4ab467bc4e850f4d0d..5eccd7fdba300ed1f31ded2259f65ac7d31e831b 100644 (file)
--- a/games-rpg/openglad/ChangeLog
+++ b/games-rpg/openglad/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for games-rpg/openglad
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/openglad/ChangeLog,v 1.2 2003/09/10 16:09:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/openglad/ChangeLog,v 1.3 2003/12/31 19:03:05 vapier Exp $
 
 *openglad-0.98 (01 Aug 2003)
 
+  31 Dec 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add patch from Paul Taylor <birder@ozemail.com.au> to fix compile #35167.
+
   01 Aug 2003; Michael Sterrett <msterret@gentoo.org> openglad-0.98.ebuild:
   initial commit.  ebuild submitted by Rob Cakebread (modified) via bug 24844
 

diff --git a/games-rpg/openglad/files/0.98-gladpack.c.patch b/games-rpg/openglad/files/0.98-gladpack.c.patch
new file mode 100644 (file)
index 0000000..061ccbf
--- /dev/null
+++ b/games-rpg/openglad/files/0.98-gladpack.c.patch
@@ -0,0 +1,13 @@
+--- openglad-0.98.orig/util/gladpack.c 2002-09-14 18:37:50.000000000 +1000
++++ openglad-0.98/util/gladpack.c      2003-12-06 12:42:31.393812945 +1100
+@@ -9,8 +9,8 @@
+ 
+ int main(int argc, char **argv)
+ {
+-      if (argc > 1 && !strcmp(argv[1], "p")) pack(argc, argv);
+-      else if (argc > 1 && !strcmp(argv[1], "u")) unpack(argc, argv);
++      if (argc > 1 && !strcmp(argv[1], "p")) return pack(argc, argv);
++      else if (argc > 1 && !strcmp(argv[1], "u")) return unpack(argc, argv);
+       else
+       {
+               printf("Usage: gladpack (p|u) ...\n");

diff --git a/games-rpg/openglad/openglad-0.98.ebuild b/games-rpg/openglad/openglad-0.98.ebuild
index 7b799729c811acb80ee7b1d33ef5823a44806e06..ffbb4dcdc788f89fd361e6c8ba05183d3d58757d 100644 (file)
--- a/games-rpg/openglad/openglad-0.98.ebuild
+++ b/games-rpg/openglad/openglad-0.98.ebuild
@@ -1,31 +1,41 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/openglad/openglad-0.98.ebuild,v 1.1 2003/09/10 06:26:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/openglad/openglad-0.98.ebuild,v 1.2 2003/12/31 19:03:05 vapier Exp $
 
-inherit games
+inherit games eutils
 
 DESCRIPTION="An SDL clone of Gladiator, a classic RPG game"
-HOMEPAGE="http://snowstorm.sf.net/"
+HOMEPAGE="http://snowstorm.sourceforge.net/"
 SRC_URI="mirror://sourceforge/snowstorm/${P}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="x86"
 SLOT="0"
-IUSE=""
+KEYWORDS="x86"
 
 DEPEND=">=media-libs/sdl-mixer-1.2.5
        >=media-libs/sdl-image-1.2.2
        >=media-libs/libsdl-1.2.0"
 
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+       epatch ${FILESDIR}/${PV}-gladpack.c.patch
+}
+
 src_compile() {
-       egamesconf --datadir=/usr/share/games/openglad \
-               --prefix=/usr --bindir=/usr/games/bin || die
+       egamesconf \
+               --prefix=/usr \
+               --bindir=${GAMES_BINDIR} \
+               --datadir=${GAMES_DATADIR}/${PN} \
+                || die
        emake || die "emake failed"
 }
 
 src_install() {
-       make DESTDIR=${D} install || die "make install failed"
-
-       rm ${D}${GAMES_DATADIR_BASE}/doc/${PN}/COPYING
-       gzip -9 ${D}${GAMES_DATADIR_BASE}/doc/${PN}/*
+       make install \
+               DESTDIR=${D} \
+               docdir=${D}/usr/share/doc/${PF} \
+               || die "make install failed"
+       prepalldocs
        prepgamesdirs
 }