summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2011-06-14 10:42:55 +0000
committerAlfredo Tupone <tupone@gentoo.org>2011-06-14 10:42:55 +0000
commitf9a4a60aa0f75e45439a3b4700b793d6672bdd3a (patch)
tree9a8fccbb11658e2f77caa12812553b968f9e6047 /games-roguelike
parentVersion bump, bug #370783 thank tman for report. (diff)
downloadgentoo-2-f9a4a60aa0f75e45439a3b4700b793d6672bdd3a.tar.gz
gentoo-2-f9a4a60aa0f75e45439a3b4700b793d6672bdd3a.tar.bz2
gentoo-2-f9a4a60aa0f75e45439a3b4700b793d6672bdd3a.zip
Fix underlink. Bug #368889
(Portage version: 2.1.10.2/cvs/Linux x86_64)
Diffstat (limited to 'games-roguelike')
-rw-r--r--games-roguelike/crossfire-client/ChangeLog9
-rw-r--r--games-roguelike/crossfire-client/crossfire-client-1.12.0.ebuild10
-rw-r--r--games-roguelike/crossfire-client/files/crossfire-client-1.12.0-underlink.patch11
3 files changed, 24 insertions, 6 deletions
diff --git a/games-roguelike/crossfire-client/ChangeLog b/games-roguelike/crossfire-client/ChangeLog
index 766f85c2128f..3e2bb8d0afc8 100644
--- a/games-roguelike/crossfire-client/ChangeLog
+++ b/games-roguelike/crossfire-client/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for games-roguelike/crossfire-client
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/ChangeLog,v 1.24 2010/09/16 16:57:08 scarabeus Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/ChangeLog,v 1.25 2011/06/14 10:42:55 tupone Exp $
+
+ 14 Jun 2011; Tupone Alfredo <tupone@gentoo.org>
+ crossfire-client-1.12.0.ebuild,
+ +files/crossfire-client-1.12.0-underlink.patch:
+ Fix underlink. Bug #368889 by Diego Elio Pettenò
16 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
crossfire-client-1.12.0.ebuild:
diff --git a/games-roguelike/crossfire-client/crossfire-client-1.12.0.ebuild b/games-roguelike/crossfire-client/crossfire-client-1.12.0.ebuild
index 371958e7c9a4..cd9332209ef5 100644
--- a/games-roguelike/crossfire-client/crossfire-client-1.12.0.ebuild
+++ b/games-roguelike/crossfire-client/crossfire-client-1.12.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/crossfire-client-1.12.0.ebuild,v 1.5 2010/09/16 16:57:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/crossfire-client-1.12.0.ebuild,v 1.6 2011/06/14 10:42:55 tupone Exp $
EAPI=2
-inherit eutils games
+inherit eutils autotools games
DESCRIPTION="Client for the nethack-style but more in the line of UO"
HOMEPAGE="http://crossfire.real-time.com/"
@@ -29,7 +29,9 @@ src_prepare() {
-r '/^.TH/s:$: 6:' \
$(find . -name "*man") \
|| die "sed failed"
- epatch "${FILESDIR}/${P}-lua.patch"
+ epatch "${FILESDIR}/${P}-lua.patch" \
+ "${FILESDIR}"/${P}-underlink.patch
+ eautoreconf
}
src_configure() {
diff --git a/games-roguelike/crossfire-client/files/crossfire-client-1.12.0-underlink.patch b/games-roguelike/crossfire-client/files/crossfire-client-1.12.0-underlink.patch
new file mode 100644
index 000000000000..3d1428702352
--- /dev/null
+++ b/games-roguelike/crossfire-client/files/crossfire-client-1.12.0-underlink.patch
@@ -0,0 +1,11 @@
+--- x11/Makefile.am.old 2011-06-14 12:31:30.676664440 +0200
++++ x11/Makefile.am 2011-06-14 12:31:57.661423436 +0200
+@@ -42,7 +42,7 @@
+
+ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/pixmaps
+
+-crossfire_client_x11_LDADD = $(DMALLOC_LIB) $(X_LIBS) ../common/libcfclient.a @LUA_LIBS@
++crossfire_client_x11_LDADD = $(DMALLOC_LIB) $(X_LIBS) ../common/libcfclient.a @LUA_LIBS@ -lpthread
+
+ ../common/libcfclient.a:
+ ( cd ../common ; make libcfclient.a )