Fix building for different targets and keyword ~x86-fbsd, #167141 thanks to Emanuele A. "Zephyrus" Bagnaschi.

(Portage version: 2.1.3.6)

3 files changed, 27 insertions, 7 deletions

diff --git a/app-admin/gkrellm/ChangeLog b/app-admin/gkrellm/ChangeLog
index 1cae21662409..afdee13d7d69 100644
--- a/app-admin/gkrellm/ChangeLog
+++ b/app-admin/gkrellm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/gkrellm
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.143 2007/05/14 16:31:13 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.144 2007/08/21 14:24:43 uberlord Exp $
+
+  21 Aug 2007; Roy Marples <uberlord@gentoo.org>
+  +files/gkrellm-2.2.10-Makefile.patch, gkrellm-2.2.10.ebuild:
+  Fix building for different targets and keyword ~x86-fbsd, #167141 thanks to
+  Emanuele A. "Zephyrus" Bagnaschi.
 
   14 May 2007; Raúl Porcel <armin76@gentoo.org> gkrellm-2.2.10.ebuild:
   alpha stable wrt #169837
diff --git a/app-admin/gkrellm/files/gkrellm-2.2.10-Makefile.patch b/app-admin/gkrellm/files/gkrellm-2.2.10-Makefile.patch
new file mode 100644
index 000000000000..0648d3d0bc5e
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.2.10-Makefile.patch
@@ -0,0 +1,12 @@
+diff -Nru gkrellm-2.2.10/src/Makefile gkrellm-2.2.10_patched/src/Makefile
+--- gkrellm-2.2.10/src/Makefile	2007-02-15 17:50:03 +0100
++++ gkrellm-2.2.10_patched/src/Makefile	2007-02-15 17:50:49 +0100
+@@ -95,7 +95,7 @@
+ endif
+ 
+ 
+-override CC += -Wall $(FLAGS)
++CFLAGS += -Wall $(FLAGS)
+ 
+ OBJS =	main.o alerts.o battery.o base64.o clock.o cpu.o disk.o fs.o \
+ 	hostname.o inet.o mail.o mem.o net.o proc.o sensors.o uptime.o \
diff --git a/app-admin/gkrellm/gkrellm-2.2.10.ebuild b/app-admin/gkrellm/gkrellm-2.2.10.ebuild
index 36a36cd8f0c9..a6760305a04c 100644
--- a/app-admin/gkrellm/gkrellm-2.2.10.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.2.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.2.10.ebuild,v 1.9 2007/05/14 16:31:13 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.2.10.ebuild,v 1.10 2007/08/21 14:24:43 uberlord Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -10,8 +10,8 @@ SRC_URI="http://members.dslextreme.com/users/billw/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="gnutls lm_sensors nls ssl X"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="gnutls lm_sensors nls ssl X kernel_FreeBSD"
 
 RDEPEND=">=dev-libs/glib-2
 	gnutls? ( net-libs/gnutls )
@@ -26,6 +26,8 @@ DEPEND="${RDEPEND}
 pkg_setup() {
 	enewgroup gkrellmd
 	enewuser gkrellmd -1 -1 -1 gkrellmd
+	TARGET=
+	use kernel_FreeBSD && TARGET="freebsd"
 }
 
 src_unpack() {
@@ -33,6 +35,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${P}-build.patch
+	epatch "${FILESDIR}"/${P}-Makefile.patch
 	if use gnutls ; then
 		epatch "${FILESDIR}"/${P}-gnutls.patch
 	fi
@@ -48,7 +51,7 @@ src_unpack() {
 
 src_compile() {
 	if use X ; then
-		emake \
+		emake ${TARGET} \
 			CC=$(tc-getCC) \
 			INSTALLROOT=/usr \
 			INCLUDEDIR=/usr/include/gkrellm2 \
@@ -59,7 +62,7 @@ src_compile() {
 			|| die "emake failed"
 	else
 		cd server
-		emake \
+		emake ${TARGET} \
 			CC=$(tc-getCC) \
 			$(use lm_sensors || echo without-libsensors=yes) \
 			|| die "emake failed"
@@ -68,7 +71,7 @@ src_compile() {
 
 src_install() {
 	if use X ; then
-		emake install \
+		emake install${TARGET:+_}${TARGET} \
 			$(use nls || echo enable_nls=0) \
 			INSTALLDIR="${D}"/usr/bin \
 			INCLUDEDIR="${D}"/usr/include \