diff options
author | Fabian Groffen <grobian@gentoo.org> | 2005-11-22 22:07:03 +0000 |
---|---|---|
committer | Fabian Groffen <grobian@gentoo.org> | 2005-11-22 22:07:03 +0000 |
commit | 01a8c98bf8906a3628f1eae081f337b44ef18c56 (patch) | |
tree | 594a63bfc03a550cd2a4770ed5197231094e97e5 /games-roguelike/nethack | |
parent | Marked stable on amd64 (diff) | |
download | gentoo-2-01a8c98bf8906a3628f1eae081f337b44ef18c56.tar.gz gentoo-2-01a8c98bf8906a3628f1eae081f337b44ef18c56.tar.bz2 gentoo-2-01a8c98bf8906a3628f1eae081f337b44ef18c56.zip |
Adding small patch for OSX and compilation helper. Marked ~ppc-macos (bug #106117)
(Portage version: 2.0.51.22-r3)
Diffstat (limited to 'games-roguelike/nethack')
-rw-r--r-- | games-roguelike/nethack/ChangeLog | 7 | ||||
-rw-r--r-- | games-roguelike/nethack/Manifest | 15 | ||||
-rw-r--r-- | games-roguelike/nethack/files/3.4.3-macos.patch | 11 | ||||
-rw-r--r-- | games-roguelike/nethack/nethack-3.4.3-r1.ebuild | 12 |
4 files changed, 33 insertions, 12 deletions
diff --git a/games-roguelike/nethack/ChangeLog b/games-roguelike/nethack/ChangeLog index 0d43c4f3d359..303a52fb2316 100644 --- a/games-roguelike/nethack/ChangeLog +++ b/games-roguelike/nethack/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-roguelike/nethack # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/ChangeLog,v 1.17 2005/11/22 01:59:44 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/ChangeLog,v 1.18 2005/11/22 22:07:03 grobian Exp $ + + 22 Nov 2005; Fabian Groffen <grobian@gentoo.org> +files/3.4.3-macos.patch, + nethack-3.4.3-r1.ebuild: + Adding small patch for OSX and compilation helper. Marked ~ppc-macos (bug + #106117) 22 Nov 2005; <jer@gentoo.org> nethack-3.4.3-r1.ebuild: Added ~hppa keyword (bug 109191). diff --git a/games-roguelike/nethack/Manifest b/games-roguelike/nethack/Manifest index 921c248fd3d9..810433de05ca 100644 --- a/games-roguelike/nethack/Manifest +++ b/games-roguelike/nethack/Manifest @@ -1,12 +1,13 @@ +MD5 611aa4befed1efc0d09e2de666b9ab88 nethack-3.4.3-r1.ebuild 5142 MD5 d11c747e08a496fd7591a57ab504d7cb ChangeLog 5177 -MD5 7dfa79bba03a240cb7bba2e84d8178ef files/3.4.3-GNOME-support.patch 1316 -MD5 004669e4ce554b5f7f92daaea2e2cebb files/3.4.3-QT-GNOME-support.patch 1507 -MD5 d573c7b87f4add06cf21d3770b3c2f8f files/3.4.3-QT-support.patch 792 +MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 MD5 68200eaa7e6d116868700aab23e7e1d5 files/3.4.3-X-support.patch 920 +MD5 ed68fbd43d4e591eee4930aa4578a012 files/digest-nethack-3.4.3-r1 65 +MD5 f128c014d1efb8861cec5dae19eedb5b files/dot.nethackrc 2717 +MD5 bbf4b9ccced679d68ffb476b32c1a4e8 files/3.4.3-macos.patch 307 +MD5 004669e4ce554b5f7f92daaea2e2cebb files/3.4.3-QT-GNOME-support.patch 1507 MD5 92e6ae792ae140b534fa7e8edb248842 files/3.4.3-bison.patch 603 MD5 b4d0d816b1b1f1977abb48258913cf4e files/3.4.3-default-options.patch 1262 +MD5 d573c7b87f4add06cf21d3770b3c2f8f files/3.4.3-QT-support.patch 792 +MD5 7dfa79bba03a240cb7bba2e84d8178ef files/3.4.3-GNOME-support.patch 1316 MD5 a33605f7cde87f4aafa5c42998a9feb2 files/3.4.3-gentoo-paths.patch 576 -MD5 ed68fbd43d4e591eee4930aa4578a012 files/digest-nethack-3.4.3-r1 65 -MD5 f128c014d1efb8861cec5dae19eedb5b files/dot.nethackrc 2717 -MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 -MD5 e196283e2a1ca780ccb9945b7ac10d55 nethack-3.4.3-r1.ebuild 5008 diff --git a/games-roguelike/nethack/files/3.4.3-macos.patch b/games-roguelike/nethack/files/3.4.3-macos.patch new file mode 100644 index 000000000000..d5aad3810878 --- /dev/null +++ b/games-roguelike/nethack/files/3.4.3-macos.patch @@ -0,0 +1,11 @@ +--- nethack-3.4.3/win/Qt/qt_win.cpp.orig 2005-11-22 21:24:03.000000000 +0100 ++++ nethack-3.4.3/win/Qt/qt_win.cpp 2005-11-22 21:25:26.000000000 +0100 +@@ -102,7 +102,7 @@ + #include "qt_xpms.h" + + #include <dirent.h> +-#ifdef Q_WS_MACX ++#ifdef __APPLE__ + # include <sys/malloc.h> + #else + # include <malloc.h> diff --git a/games-roguelike/nethack/nethack-3.4.3-r1.ebuild b/games-roguelike/nethack/nethack-3.4.3-r1.ebuild index 1064f6dd3547..a1703a121359 100644 --- a/games-roguelike/nethack/nethack-3.4.3-r1.ebuild +++ b/games-roguelike/nethack/nethack-3.4.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/nethack-3.4.3-r1.ebuild,v 1.9 2005/11/22 01:59:44 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/nethack-3.4.3-r1.ebuild,v 1.10 2005/11/22 22:07:03 grobian Exp $ inherit eutils toolchain-funcs flag-o-matic games @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/nethack/${PN}-${MY_PV}-src.tgz" LICENSE="nethack" SLOT="0" -KEYWORDS="x86 ppc sparc amd64 ~hppa" +KEYWORDS="amd64 ~hppa ppc ~ppc-macos sparc x86" IUSE="X qt gnome" DEPEND="virtual/libc @@ -35,6 +35,7 @@ src_unpack() { epatch "${FILESDIR}/${PV}-gentoo-paths.patch" epatch "${FILESDIR}/${PV}-default-options.patch" epatch "${FILESDIR}/${PV}-bison.patch" + epatch "${FILESDIR}/${PV}-macos.patch" sed -i \ -e "s:GENTOO_STATEDIR:${GAMES_STATEDIR}/${PN}:" include/unixconf.h \ @@ -67,6 +68,9 @@ src_unpack() { src_compile() { local qtver= + local lflags="-L/usr/X11R6/lib" + + use ppc-macos && lflags="${lflags} -undefined dynamic_lookup" has_version =x11-libs/qt-3* \ && qtver=3 \ @@ -78,14 +82,14 @@ src_compile() { QTDIR=/usr/qt/${qtver} \ CC="$(tc-getCC)" \ CFLAGS="${CFLAGS}" \ - LFLAGS="-L/usr/X11R6/lib" \ + LFLAGS="${lflags}" \ ../util/makedefs \ || die "initial makedefs build failed" emake \ QTDIR=/usr/qt/${qtver} \ CC="$(tc-getCC)" \ CFLAGS="${CFLAGS}" \ - LFLAGS="-L/usr/X11R6/lib" \ + LFLAGS="${lflags}" \ || die "main build failed" cd ${S}/util emake CFLAGS="${CFLAGS}" recover || die "util build failed" |