summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2015-02-22 08:58:17 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2015-02-22 08:58:17 +0000
commit140fc361ad6f3ef77ed0168763b2c265f1c7cf7b (patch)
tree68323391fd7491243bed2e3840093df7e2ebaef2
parentStable for HPPA (bug #530842). (diff)
downloadgentoo-2-140fc361ad6f3ef77ed0168763b2c265f1c7cf7b.tar.gz
gentoo-2-140fc361ad6f3ef77ed0168763b2c265f1c7cf7b.tar.bz2
gentoo-2-140fc361ad6f3ef77ed0168763b2c265f1c7cf7b.zip
use pkg-config to get ncurses libs (bug #540614)
(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
-rw-r--r--games-roguelike/tomenet/ChangeLog6
-rw-r--r--games-roguelike/tomenet/files/tomenet-4.5.9-makefile.patch9
2 files changed, 14 insertions, 1 deletions
diff --git a/games-roguelike/tomenet/ChangeLog b/games-roguelike/tomenet/ChangeLog
index 2d79abd473f4..f915594a2cdc 100644
--- a/games-roguelike/tomenet/ChangeLog
+++ b/games-roguelike/tomenet/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-roguelike/tomenet
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tomenet/ChangeLog,v 1.24 2015/02/19 04:13:40 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tomenet/ChangeLog,v 1.25 2015/02/22 08:58:17 mr_bones_ Exp $
+
+ 22 Feb 2015; Michael Sterrett <mr_bones_@gentoo.org>
+ files/tomenet-4.5.9-makefile.patch:
+ use pkg-config to get ncurses libs (bug #540614)
19 Feb 2015; Michael Sterrett <mr_bones_@gentoo.org>
-files/tomenet-4.5.5-makefile.patch, -tomenet-4.5.5.ebuild:
diff --git a/games-roguelike/tomenet/files/tomenet-4.5.9-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.5.9-makefile.patch
index 4f0a3a0f0790..0dc9fb8171c3 100644
--- a/games-roguelike/tomenet/files/tomenet-4.5.9-makefile.patch
+++ b/games-roguelike/tomenet/files/tomenet-4.5.9-makefile.patch
@@ -54,6 +54,15 @@
##
## Without SDL
#CFLAGS = -g -pipe -Wall -DUSE_X11 -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937
+@@ -257,7 +270,7 @@
+ #
+ ## With SDL
+ CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -DSOUND_SDL `sdl-config --cflags` -D_DEFAULT_SOURCE -DACC32
+-LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm `sdl-config --libs` -lSDL_mixer
++LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 $(shell ${PKG_CONFIG} --libs ncurses) -lcrypt -lm $(shell sdl-config --libs) -lSDL_mixer
+ ##
+ ## Without SDL
+ #CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937
@@ -357,9 +370,6 @@
# Compile a client with 'test client' version/tag
tomenet.test: CFLAGS += -DTEST_CLIENT -O0