From 8c08468ac0adfe82e852bac1ef637b954c9a22b1 Mon Sep 17 00:00:00 2001 From: richard Date: Sat, 17 Sep 2016 14:28:59 +0000 Subject: Add -lX11 -lm and -lgmodule-2.0 for Linux builds. --- sysutils/gkrellm/distinfo | 4 ++-- sysutils/gkrellm/patches/patch-Makefile.inc | 18 ++++++++++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/sysutils/gkrellm/distinfo b/sysutils/gkrellm/distinfo index 27a305b2a88..798e6ee7430 100644 --- a/sysutils/gkrellm/distinfo +++ b/sysutils/gkrellm/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.44 2016/04/21 14:04:32 jperkin Exp $ +$NetBSD: distinfo,v 1.45 2016/09/17 14:28:59 richard Exp $ SHA1 (gkrellm-2.2.10.tar.bz2) = 329d0ba5600998f21b75491937c3c2924ab6ed40 RMD160 (gkrellm-2.2.10.tar.bz2) = 6694838015716c09291887ae598daceb4f4b440f SHA512 (gkrellm-2.2.10.tar.bz2) = f3bc055c54bd18c20a59fae471e27c7f4067067525cbc351a0e9fb80a70f7da59c220f36ecabae341e73e0b0e93546edabebff896eed863b515c6d8408a5670a Size (gkrellm-2.2.10.tar.bz2) = 718894 bytes -SHA1 (patch-Makefile.inc) = 4cce7349b07ef5a5ac6dca759b9dc42bb01a6cf3 +SHA1 (patch-Makefile.inc) = 958f3f402b3f13c2d81520eda62fe4293ac784ab SHA1 (patch-aa) = 1cf9b98520b37aa75c6c5b9d0398e8d92204a12e SHA1 (patch-ab) = e900c811ddea106efee5cbfc04d0cf14cc6e6451 SHA1 (patch-ac) = 8890d5a5e8eaf21508a1bf91de788183fd6f7a75 diff --git a/sysutils/gkrellm/patches/patch-Makefile.inc b/sysutils/gkrellm/patches/patch-Makefile.inc index 5b904bddb81..11577566531 100644 --- a/sysutils/gkrellm/patches/patch-Makefile.inc +++ b/sysutils/gkrellm/patches/patch-Makefile.inc @@ -1,9 +1,10 @@ -$NetBSD: patch-Makefile.inc,v 1.3 2016/04/21 14:04:32 jperkin Exp $ +$NetBSD: patch-Makefile.inc,v 1.4 2016/09/17 14:28:59 richard Exp $ Match OPSYS with what pkgsrc uses. Add an explicit -lm and -lgmodule-2.0 for Solaris. +And -lX11, -lm and -lgmodule-2.0 for Linux ---- Makefile.inc.orig 2016-04-21 14:00:24.328321129 +0000 +--- Makefile.inc.orig 2016-09-17 12:12:43.663376387 +0000 +++ Makefile.inc @@ -8,8 +8,8 @@ INSTALLDIR?= $(INSTALLROOT)/bin INCLUDEDIR?= $(INSTALLROOT)/include @@ -48,3 +49,16 @@ Add an explicit -lm and -lgmodule-2.0 for Solaris. else SYS_LIBS+= -lnsl endif +@@ -134,6 +134,12 @@ BINGROUP= kmem + NEED_MD5= no + MD5_LIBS= -lmd + SYS_LIBS= -lkvm -lkinfo -ldevstat -lX11 -lm -lgmodule-2.0 ++ else ++ ifeq (${OPSYS},Linux) ++ ifeq ($(MODULE),src) ++SYS_LIBS+= -lX11 -lm -lgmodule-2.0 ++ endif ++ endif + endif + endif + endif -- cgit v1.2.3