diff options
| author |   Sam James <sam@gentoo.org> | 2021-04-19 07:30:04 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-04-19 20:09:48 +0100 |
| commit | 0cd3491b2d545c58355f3073a3357598c85835db (patch) | |
| tree | 22ddace69cc12019635869fb66f4dac9a72cdae6 /games-action | |
| parent | dev-games/clanlib: tidy up patches, respect ${PKG_CONFIG} (diff) | |
| download | gentoo-0cd3491b2d545c58355f3073a3357598c85835db.tar.gz gentoo-0cd3491b2d545c58355f3073a3357598c85835db.tar.bz2 gentoo-0cd3491b2d545c58355f3073a3357598c85835db.zip | |
games-action/battalion: respect ${PKG_CONFIG}
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'games-action')
3 files changed, 12 insertions, 12 deletions
diff --git a/games-action/battalion/battalion-1.4b-r1.ebuild b/games-action/battalion/battalion-1.4b-r1.ebuild index d601672cf212..ae310183dfe1 100644 --- a/games-action/battalion/battalion-1.4b-r1.ebuild +++ b/games-action/battalion/battalion-1.4b-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -8,19 +8,20 @@ inherit toolchain-funcs DESCRIPTION="Be a rampaging monster and destroy the city" HOMEPAGE="http://evlweb.eecs.uic.edu/aej/AndyBattalion.html" SRC_URI="http://evlweb.eecs.uic.edu/aej/BATTALION/${PN}${PV}.tar.bz2" +S="${WORKDIR}"/${PN}${PV} LICENSE="battalion HPND" SLOT="0" KEYWORDS="~x86" -IUSE="" DEPEND=" virtual/glu virtual/opengl x11-libs/libX11" -RDEPEND=${DEPEND} +RDEPEND="${DEPEND}" + +DEPEND+=" virtual/pkgconfig" -S=${WORKDIR}/${PN}${PV} PATCHES=( "${FILESDIR}"/${P}-warning.patch "${FILESDIR}"/${PN}-1.4b-fix-build-system.patch @@ -47,7 +48,7 @@ src_prepare() { } src_configure() { - tc-export CC + tc-export CC PKG_CONFIG } src_install() { diff --git a/games-action/battalion/files/battalion-1.4b-fix-build-system.patch b/games-action/battalion/files/battalion-1.4b-fix-build-system.patch index fe209e1db953..3ebfb15f4b09 100644 --- a/games-action/battalion/files/battalion-1.4b-fix-build-system.patch +++ b/games-action/battalion/files/battalion-1.4b-fix-build-system.patch @@ -13,8 +13,8 @@ #GLIB = -lMesaGL -lMesaGLU # or -GLIB = -lGL -lGLU -+GLIB_CFLAGS = `pkg-config --cflags gl` `pkg-config --cflags glu` -+GLIB_LIBS = `pkg-config --libs gl` `pkg-config --libs glu` ++GLIB_CFLAGS = `${PKG_CONFIG} --cflags gl` `${PKG_CONFIG} --cflags glu` ++GLIB_LIBS = `${PKG_CONFIG} --libs gl` `${PKG_CONFIG} --libs glu` # STEP 4: CHOOSE WHICH HARDWARE / OS YOU ARE RUNNING @@ -37,8 +37,8 @@ OBJ = battalion.o audio.o net.o gprim.o graphics.o objects.o text.o update.o tk.o font.o soundIt.o -LIBS = -L./. -L/usr/X11R6/lib -lm -lX11 -lXext -+my_CPPFLAGS = -lm `pkg-config --cflags x11` `pkg-config --cflags xext` -I./. $(AUDIODEF) $(OS) -+my_LIBS = -lm `pkg-config --libs x11` `pkg-config --libs xext` ++my_CPPFLAGS = -lm `${PKG_CONFIG} --cflags x11` `${PKG_CONFIG} --cflags xext` -I./. $(AUDIODEF) $(OS) ++my_LIBS = -lm `${PKG_CONFIG} --libs x11` `${PKG_CONFIG} --libs xext` all: $(TARGET) diff --git a/games-action/battalion/files/battalion-1.4b-warning.patch b/games-action/battalion/files/battalion-1.4b-warning.patch index 91fd8ee51d3b..d27ae5ceb9a1 100644 --- a/games-action/battalion/files/battalion-1.4b-warning.patch +++ b/games-action/battalion/files/battalion-1.4b-warning.patch @@ -1,6 +1,5 @@ -diff -ru battalion1.4b.orig/net.c battalion1.4b/net.c ---- battalion1.4b.orig/net.c 2002-05-06 09:57:01.000000000 -0400 -+++ battalion1.4b/net.c 2015-03-30 18:29:23.885306334 -0400 +--- a/net.c ++++ b/net.c @@ -378,7 +378,7 @@ /* nother copy of this elsewhere */ |