summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sysutils/gkrellm/Makefile13
-rw-r--r--sysutils/gkrellm/distinfo8
-rw-r--r--sysutils/gkrellm/patches/patch-ab14
3 files changed, 18 insertions, 17 deletions
diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index caa9bf779a9..041fd3b81cb 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2001/06/11 19:44:30 zuntum Exp $
+# $NetBSD: Makefile,v 1.4 2001/08/06 14:27:39 wiz Exp $
#
-DISTNAME= gkrellm-1.0.8
+DISTNAME= gkrellm-1.2.1
CATEGORIES= sysutils
MASTER_SITES= http://web.wt.net/~billw/gkrellm/
@@ -9,10 +9,8 @@ MAINTAINER= anthony.mallet@ficus.yi.org
HOMEPAGE= http://gkrellm.net/
COMMENT= GTK based system monitor
-DEPENDS+= gtk+-1.2.*:../../x11/gtk
-DEPENDS+= imlib-*:../../graphics/imlib
-DEPENDS+= pth-*:../../devel/pth
-
+USE_BUILDLINK_ONLY= yes
+USE_BUILDLINK_X11= yes
USE_X11BASE= yes
USE_GMAKE= yes
@@ -34,4 +32,7 @@ do-install:
gkrellm_public_proto.h gkrellm_private_proto.h \
${PREFIX}/include/gkrellm
+.include "../../devel/pth/buildlink.mk"
+.include "../../graphics/imlib/buildlink.mk"
+.include "../../x11/gtk/buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gkrellm/distinfo b/sysutils/gkrellm/distinfo
index 791129dffef..a528d688ba3 100644
--- a/sysutils/gkrellm/distinfo
+++ b/sysutils/gkrellm/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/06/11 19:44:30 zuntum Exp $
+$NetBSD: distinfo,v 1.4 2001/08/06 14:27:39 wiz Exp $
-SHA1 (gkrellm-1.0.8.tar.gz) = d201ebfb1f0a7a8a05750f01d6827f3226f5ca26
-Size (gkrellm-1.0.8.tar.gz) = 375803 bytes
+SHA1 (gkrellm-1.2.1.tar.gz) = 7fee49e1d9b7429567110dcb137d999687c2e560
+Size (gkrellm-1.2.1.tar.gz) = 470603 bytes
SHA1 (patch-aa) = a3ee2aa106e63d70cb50527710fe3564c30e2128
-SHA1 (patch-ab) = f18ea3c7c456d4c5638a3bf122e7ef0dbb217a93
+SHA1 (patch-ab) = 2c8fe74b7071159a50e03c5c873717706341f672
diff --git a/sysutils/gkrellm/patches/patch-ab b/sysutils/gkrellm/patches/patch-ab
index d04360fd7d6..edb10edc543 100644
--- a/sysutils/gkrellm/patches/patch-ab
+++ b/sysutils/gkrellm/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/03/13 17:53:29 zuntum Exp $
+$NetBSD: patch-ab,v 1.2 2001/08/06 14:27:39 wiz Exp $
---- src/Makefile.src.orig Sun Jan 14 21:18:32 2001
-+++ src/Makefile.src
-@@ -13,7 +13,7 @@
+--- src/Makefile.src~ Sat Jul 21 21:59:58 2001
++++ src/Makefile.src Mon Aug 6 00:05:25 2001
+@@ -17,7 +17,7 @@
GTK_LIB = `$(GTK_CONFIG) --libs gthread`
IMLIB_LIB = `imlib-config --libs-gdk`
@@ -11,12 +11,12 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/03/13 17:53:29 zuntum Exp $
FLAGS+= $(PTHREAD_INC)
LIBS = $(GTK_LIB) $(IMLIB_LIB) $(GTOP_LIBS) $(SYS_LIBS)
-@@ -31,7 +31,7 @@
+@@ -35,7 +35,7 @@
endif
-CC = gcc -Wall $(FLAGS) $(CFLAGS)
-+CC+= -Wall $(FLAGS) $(CFLAGS)
++CC += -Wall $(FLAGS) $(CFLAGS)
- OBJS = main.o apm.o clock.o cpu.o disk.o fs.o hostname.o \
+ OBJS = main.o alerts.o apm.o clock.o cpu.o disk.o fs.o hostname.o \
inet.o mail.o meminfo.o net.o proc.o sensors.o uptime.o \