diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile index 362c2785cdd..f30686433b6 100644 --- a/sysutils/gkrellm/Makefile +++ b/sysutils/gkrellm/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.18 2002/06/23 23:42:13 jcs Exp $ +# $OpenBSD: Makefile,v 1.19 2002/07/29 03:46:28 jcs Exp $ -DISTNAME= gkrellm-1.2.12 +DISTNAME= gkrellm-1.2.13 HOMEPAGE= http://www.gkrellm.net/ COMMENT= "single process stack of system monitors" CATEGORIES= sysutils -NEED_VERSION= 1.524 MAINTAINER= Joshua Stein MASTER_SITES= http://web.wt.net/~billw/gkrellm/ \ diff --git a/sysutils/gkrellm/distinfo b/sysutils/gkrellm/distinfo index d1cc0b83777..58911e7ba4a 100644 --- a/sysutils/gkrellm/distinfo +++ b/sysutils/gkrellm/distinfo @@ -1,3 +1,3 @@ -MD5 (gkrellm-1.2.12.tar.gz) = 156fc3f1dce54c3de5d46874fba545a5 -RMD160 (gkrellm-1.2.12.tar.gz) = 91e4410825a48dfec7b4996e777989d80143bbb8 -SHA1 (gkrellm-1.2.12.tar.gz) = 162b549f9ed71e13373a731d9f97dfea14f4ade4 +MD5 (gkrellm-1.2.13.tar.gz) = 03ea2a6f0b0053f923a3f0f93f9bed64 +RMD160 (gkrellm-1.2.13.tar.gz) = a56c7c57083034ad81f98862d3ccb7b2caaad67d +SHA1 (gkrellm-1.2.13.tar.gz) = 5df86795dbcc85c02bbc9136707893c34535a3be diff --git a/sysutils/gkrellm/patches/patch-src_Makefile_src b/sysutils/gkrellm/patches/patch-src_Makefile_src index 93a55edc7e2..ed8b5ea617f 100644 --- a/sysutils/gkrellm/patches/patch-src_Makefile_src +++ b/sysutils/gkrellm/patches/patch-src_Makefile_src @@ -1,27 +1,17 @@ -$OpenBSD: patch-src_Makefile_src,v 1.5 2002/01/20 23:51:31 jcs Exp $ ---- src/Makefile.src.orig Thu Dec 20 13:09:48 2001 -+++ src/Makefile.src Sun Jan 20 17:38:58 2002 -@@ -1,15 +1,15 @@ - GTK_CONFIG ?= gtk-config - EXTRAOBJS ?= md5c.o - BINMODE ?= 755 --INSTALLDIR ?= /usr/local/bin --INCLUDEDIR ?= /usr/local/include -+INSTALLDIR ?= ${PREFIX}/bin -+INCLUDEDIR ?= ${PREFIX}/include - INCLUDEMODE ?= 644 - INCLUDEDIRMODE ?= 755 --MANDIR ?= /usr/local/share/man/man1 -+MANDIR ?= ${PREFIX}/man/man1 +$OpenBSD: patch-src_Makefile_src,v 1.6 2002/07/29 03:46:28 jcs Exp $ +--- src/Makefile.src.orig Sun Jun 30 21:13:04 2002 ++++ src/Makefile.src Sun Jul 28 22:35:14 2002 +@@ -9,8 +9,7 @@ MANMODE ?= 644 MANDIRMODE ?= 755 INSTALL ?= install -LINK_FLAGS ?= -Wl,-E +-CC ?= gcc +LINK_FLAGS ?= -Wl + STRIP ?= -s GKRELLM_INCLUDES = gkrellm.h gkrellm_public_proto.h - -@@ -19,7 +19,7 @@ +@@ -21,7 +20,7 @@ GTK_LIB = `$(GTK_CONFIG) --libs gthread` IMLIB_LIB = `imlib-config --libs-gdk` @@ -30,17 +20,16 @@ $OpenBSD: patch-src_Makefile_src,v 1.5 2002/01/20 23:51:31 jcs Exp $ FLAGS+= $(PTHREAD_INC) LIBS = $(GTK_LIB) $(IMLIB_LIB) $(GTOP_LIBS) $(SYS_LIBS) -@@ -36,8 +36,7 @@ +@@ -38,7 +37,7 @@ FLAGS += -DHAVE_GETADDRINFO endif -- --CC = gcc -Wall $(FLAGS) $(CFLAGS) +-CC += -Wall $(FLAGS) +CFLAGS += $(FLAGS) OBJS = main.o alerts.o apm.o base64.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 \ -@@ -63,6 +62,9 @@ +@@ -70,6 +69,9 @@ netbsd: $(MAKE) PTHREAD_INC=-I/usr/local/include \ GTK_CONFIG=gtk-config GTOP_LIBS= EXTRAOBJS= SYS_LIBS="-lkvm" gkrellm diff --git a/sysutils/gkrellm/patches/patch-src_apm_c b/sysutils/gkrellm/patches/patch-src_apm_c new file mode 100644 index 00000000000..0e67a345471 --- /dev/null +++ b/sysutils/gkrellm/patches/patch-src_apm_c @@ -0,0 +1,23 @@ +$OpenBSD: patch-src_apm_c,v 1.3 2002/07/29 03:46:28 jcs Exp $ +--- src/apm.c.orig Sun Jul 28 22:36:18 2002 ++++ src/apm.c Sun Jul 28 22:38:27 2002 +@@ -159,7 +159,8 @@ + + /* ------- NetBSD ------------------------------------------------------- */ + +-#if (defined(__NetBSD__) || defined(__OpenBSD__)) && defined(__i386__) ++#if (defined(__NetBSD__) || defined(__OpenBSD__)) && (defined(__i386__) || \ ++defined(__powerpc__)) + + #include + #define APMDEV "/dev/apm" +@@ -242,7 +243,8 @@ + available = TRUE; + #endif + +-#if (defined(__NetBSD__) || defined(__OpenBSD__)) && defined(__i386__) ++#if (defined(__NetBSD__) || defined(__OpenBSD__)) && (defined(__i386__) || \ ++defined(__powerpc__)) + read_apm_data = read_netbsd_apm_data; + available = TRUE; + #endif