diff options
| author |   Tristan Heaven <tristan@gentoo.org> | 2013-06-16 23:40:08 +0000 |
|---|---|---|
| committer | Tristan Heaven <tristan@gentoo.org> | 2013-06-16 23:40:08 +0000 |
| commit | ba6c92e8abd79cb9fd8ad5b2911d400eef87c0ce (patch) | |
| tree | a12ed030a92f433df7676ee65502e0d935869ad0 /games-mud | |
| parent | Version bump, update live ebuild, and remove old. Drop python2_5 and pypy sup... (diff) | |
| download | gentoo-2-ba6c92e8abd79cb9fd8ad5b2911d400eef87c0ce.tar.gz gentoo-2-ba6c92e8abd79cb9fd8ad5b2911d400eef87c0ce.tar.bz2 gentoo-2-ba6c92e8abd79cb9fd8ad5b2911d400eef87c0ce.zip | |
Fix building with ncurses[tinfo], bug #459764
(Portage version: 2.2.0_alpha180/cvs/Linux x86_64, signed Manifest commit with key 668310D9)
Diffstat (limited to 'games-mud')
| -rw-r--r-- | games-mud/crystal/ChangeLog | 6 | ||||
| -rw-r--r-- | games-mud/crystal/crystal-0.2.4.ebuild | 19 | ||||
| -rw-r--r-- | games-mud/crystal/files/crystal-0.2.4-build.patch | 28 |
3 files changed, 43 insertions, 10 deletions
diff --git a/games-mud/crystal/ChangeLog b/games-mud/crystal/ChangeLog index 5e7279ee990a..ee1cf639d198 100644 --- a/games-mud/crystal/ChangeLog +++ b/games-mud/crystal/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-mud/crystal # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-mud/crystal/ChangeLog,v 1.13 2013/01/24 00:15:31 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-mud/crystal/ChangeLog,v 1.14 2013/06/16 23:40:08 tristan Exp $ + + 16 Jun 2013; Tristan Heaven <tristan@gentoo.org> crystal-0.2.4.ebuild, + +files/crystal-0.2.4-build.patch: + Fix building with ncurses[tinfo], bug #459764 24 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org> -crystal-0.2.2.ebuild, -files/crystal-0.2.2-64bit.patch, -files/crystal-0.2.2-gcc43.patch, diff --git a/games-mud/crystal/crystal-0.2.4.ebuild b/games-mud/crystal/crystal-0.2.4.ebuild index d7ff7f3e4de9..1a63218530f4 100644 --- a/games-mud/crystal/crystal-0.2.4.ebuild +++ b/games-mud/crystal/crystal-0.2.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-mud/crystal/crystal-0.2.4.ebuild,v 1.4 2012/03/06 20:37:57 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-mud/crystal/crystal-0.2.4.ebuild,v 1.5 2013/06/16 23:40:08 tristan Exp $ EAPI=2 -inherit eutils games +inherit autotools eutils games DESCRIPTION="The crystal MUD client" HOMEPAGE="http://www.evilmagic.org/crystal/" @@ -14,19 +14,20 @@ SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="" -DEPEND="sys-libs/zlib +RDEPEND="sys-libs/zlib sys-libs/ncurses dev-libs/openssl virtual/libiconv" +DEPEND="${RDEPEND} + virtual/pkgconfig" src_prepare() { - epatch "${FILESDIR}"/${P}-gcc43.patch + epatch \ + "${FILESDIR}"/${P}-gcc43.patch \ + "${FILESDIR}"/${P}-build.patch # avoid colliding with xscreensaver (bug #281191) - sed -i \ - -e '/^man_MANS/s/crystal/crystal-mud/' \ - Makefile.in \ - || die "sed failed" mv crystal.6 crystal-mud.6 + eautoreconf } src_configure() { diff --git a/games-mud/crystal/files/crystal-0.2.4-build.patch b/games-mud/crystal/files/crystal-0.2.4-build.patch new file mode 100644 index 000000000000..147447f3c9a8 --- /dev/null +++ b/games-mud/crystal/files/crystal-0.2.4-build.patch @@ -0,0 +1,28 @@ +--- configure.in ++++ configure.in +@@ -31,7 +31,9 @@ + AC_PROG_CXX + AC_CHECK_FUNCS(select socket strerror strstr) + +-AC_CHECK_LIB(curses, main, [LIBS=" -lcurses "], AC_CHECK_LIB(ncurses, main, [LIBS=" -lncurses "], AC_MSG_ERROR([No curses]))) ++PKG_CHECK_MODULES([NCURSES], [ncurses]) ++AC_SUBST([NCURSES_CFLAGS]) ++AC_SUBST([NCURSES_LIBS]) + + AC_CHECK_LIB(z, main, [LIBS=$LIBS" -lz "; AC_DEFINE(HAVE_ZLIB)], AC_MSG_WARN([No zlib - MCCP support will not be built])) + +--- Makefile.am ++++ Makefile.am +@@ -5,7 +5,11 @@ + common.h crystal.h grid.h io.h telnet.h wcwidth.c \ + scripting.cc scripting.h + +-man_MANS = crystal.6 ++crystal_CPPFLAGS = $(NCURSES_CFLAGS) ++ ++crystal_LDADD = $(NCURSES_LIBS) ++ ++man_MANS = crystal-mud.6 + + DEBDIST = README.Debian debian/changelog.real debian/compat debian/control debian/copyright debian/crystal-default.ex debian/crystal.substvars debian/docs debian/rules debian/watch.ex + |