diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2009-08-06 20:15:22 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2009-08-06 20:15:22 +0000 |
| commit | 6fdb48b30cb0c8a4daeb5a87065ed96dfa8af069 (patch) | |
| tree | 273cae6f65ffb98a39a67e4786ea401f8f5248be /games-roguelike | |
| parent | x11-drivers/xf86-video-savage: drop old ebuilds (diff) | |
| download | gentoo-2-6fdb48b30cb0c8a4daeb5a87065ed96dfa8af069.tar.gz gentoo-2-6fdb48b30cb0c8a4daeb5a87065ed96dfa8af069.tar.bz2 gentoo-2-6fdb48b30cb0c8a4daeb5a87065ed96dfa8af069.zip | |
add patch for detecting tcl/tk85 (bug #267451)
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'games-roguelike')
| -rw-r--r-- | games-roguelike/zangband/ChangeLog | 6 | ||||
| -rw-r--r-- | games-roguelike/zangband/files/zangband-2.7.4c-tk85.patch | 19 | ||||
| -rw-r--r-- | games-roguelike/zangband/zangband-2.7.4c.ebuild | 12 |
3 files changed, 31 insertions, 6 deletions
diff --git a/games-roguelike/zangband/ChangeLog b/games-roguelike/zangband/ChangeLog index eb1de69c910e..0dd6c3c1f851 100644 --- a/games-roguelike/zangband/ChangeLog +++ b/games-roguelike/zangband/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-roguelike/zangband # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/ChangeLog,v 1.15 2009/08/02 04:45:24 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/ChangeLog,v 1.16 2009/08/06 20:15:22 mr_bones_ Exp $ + + 06 Aug 2009; Michael Sterrett <mr_bones_@gentoo.org> + zangband-2.7.4c.ebuild, +files/zangband-2.7.4c-tk85.patch: + add patch for detecting tcl/tk85 (bug #267451) 02 Aug 2009; Michael Sterrett <mr_bones_@gentoo.org> zangband-2.7.4c.ebuild: diff --git a/games-roguelike/zangband/files/zangband-2.7.4c-tk85.patch b/games-roguelike/zangband/files/zangband-2.7.4c-tk85.patch new file mode 100644 index 000000000000..0613ecb557f5 --- /dev/null +++ b/games-roguelike/zangband/files/zangband-2.7.4c-tk85.patch @@ -0,0 +1,19 @@ +--- configure.in.orig 2009-08-06 16:07:20.968296247 -0400 ++++ configure.in 2009-08-06 16:08:23.466167799 -0400 +@@ -141,12 +141,12 @@ + ]) + + if test "x$with_tcltk" != "xno" ; then +- AC_SEARCH_LIBS([Tcl_Init], [tcl84 tcl8.4 tcl83 tcl8.3], +- AC_SEARCH_LIBS([Tk_Init], [tk84 tk8.4 tk83 tk8.3], +- [AC_SEARCH_HEADERS(/usr/local/include/tcl.h /usr/local/include/tcl/tcl.h /usr/include/tcl.h /usr/include/tcl8.4/tcl.h /usr/local/include/tcl8.4/tcl.h /usr/include/tcl8.3/tcl.h /usr/local/include/tcl8.3/tcl.h ++ AC_SEARCH_LIBS([Tcl_Init], [tcl85 tcl8.5 tcl84 tcl8.4 tcl83 tcl8.3], ++ AC_SEARCH_LIBS([Tk_Init], [tk85 tk8.5 tk84 tk8.4 tk83 tk8.3], ++ [AC_SEARCH_HEADERS(/usr/local/include/tcl.h /usr/local/include/tcl/tcl.h /usr/include/tcl.h /usr/include/tcl8.5/tcl.h /usr/include/tcl8.4/tcl.h /usr/local/include/tcl8.4/tcl.h /usr/include/tcl8.3/tcl.h /usr/local/include/tcl8.3/tcl.h + ,BASE_TCL_DIR) + +- AC_SEARCH_HEADERS("$BASE_TCL_DIR/tk.h" /usr/local/include/tk.h /usr/local/include/tcl/tk.h /usr/include/tk.h /usr/include/tk8.4/tk.h /usr/local/include/tk8.4/tk.h /usr/include/tk8.3/tk.h /usr/local/include/tk8.3/tk.h ++ AC_SEARCH_HEADERS("$BASE_TCL_DIR/tk.h" /usr/local/include/tk.h /usr/local/include/tcl/tk.h /usr/include/tk.h /usr/include/tk8.5/tk.h /usr/include/tk8.4/tk.h /usr/local/include/tk8.4/tk.h /usr/include/tk8.3/tk.h /usr/local/include/tk8.3/tk.h + ,BASE_TK_DIR) + + dnl Checks for libraries. diff --git a/games-roguelike/zangband/zangband-2.7.4c.ebuild b/games-roguelike/zangband/zangband-2.7.4c.ebuild index 85a2060e99c1..2d33433babe9 100644 --- a/games-roguelike/zangband/zangband-2.7.4c.ebuild +++ b/games-roguelike/zangband/zangband-2.7.4c.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/zangband-2.7.4c.ebuild,v 1.6 2009/08/02 04:45:24 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/zangband-2.7.4c.ebuild,v 1.7 2009/08/06 20:15:22 mr_bones_ Exp $ EAPI=2 -inherit games +inherit autotools games DESCRIPTION="An enhanced version of the Roguelike game Angband" HOMEPAGE="http://www.zangband.org/" @@ -14,9 +14,6 @@ SLOT="0" KEYWORDS="~ppc ~x86 ~x86-fbsd" IUSE="tk" -# Dropping X use keyword: -# it had to be $(use_with X x11) -# but ebuild fails to link without-x11 RDEPEND="tk? ( dev-lang/tcl dev-lang/tk ) @@ -26,6 +23,11 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${PN} +src_prepare() { + epatch "${FILESDIR}"/${P}-tk85.patch + eautoreconf +} + src_configure() { egamesconf \ --datadir="${GAMES_DATADIR_BASE}" \ |