diff options
Diffstat (limited to 'sysutils/gkrellm/patches/patch-ab')
| -rw-r--r-- | sysutils/gkrellm/patches/patch-ab | 37 |
1 files changed, 28 insertions, 9 deletions
diff --git a/sysutils/gkrellm/patches/patch-ab b/sysutils/gkrellm/patches/patch-ab index 651640227dc..8570faac717 100644 --- a/sysutils/gkrellm/patches/patch-ab +++ b/sysutils/gkrellm/patches/patch-ab @@ -1,14 +1,22 @@ -$NetBSD: patch-ab,v 1.4 2001/09/08 21:53:57 zuntum Exp $ +$NetBSD: patch-ab,v 1.5 2001/10/30 13:31:48 damon Exp $ ---- src/Makefile.src.orig Sat Jul 21 20:59:58 2001 +--- src/Makefile.src.orig Fri Oct 12 09:01:04 2001 +++ src/Makefile.src -@@ -1,4 +1,4 @@ --GTK_CONFIG ?= gtk-config -+#GTK_CONFIG ?= gtk-config +@@ -1,10 +1,10 @@ + GTK_CONFIG ?= gtk-config BINMODE ?= 755 - INSTALLDIR ?= /usr/local/bin - INCLUDEDIR ?= /usr/local/include -@@ -12,15 +12,17 @@ +-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 + MANMODE ?= 644 + MANDIRMODE ?= 755 + INSTALL ?= install +@@ -13,15 +13,17 @@ GKRELLM_INCLUDES = gkrellm.h gkrellm_public_proto.h GTK_INCLUDE = `$(GTK_CONFIG) --cflags gthread` @@ -30,7 +38,7 @@ $NetBSD: patch-ab,v 1.4 2001/09/08 21:53:57 zuntum Exp $ ifeq ($(debug),1) FLAGS += -g -@@ -35,7 +37,7 @@ +@@ -36,7 +38,7 @@ endif @@ -39,3 +47,14 @@ $NetBSD: patch-ab,v 1.4 2001/09/08 21:53:57 zuntum Exp $ 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 \ +@@ -59,8 +61,8 @@ + SYS_LIBS="-lkvm -ldevstat" gkrellm + + netbsd: +- $(MAKE) PTHREAD_INC=-I/usr/local/include \ +- GTK_CONFIG=gtk-config GTOP_LIBS= SYS_LIBS="-lkvm" gkrellm ++ $(MAKE) PTHREAD_INC=-I$(BUILDLINK_DIR)/include \ ++ GTK_CONFIG=$(GTK_CONFIG) GTOP_LIBS= SYS_LIBS="-lkvm" gkrellm + + solaris: + $(MAKE) CFLAGS="-Wno-implicit-int" \ |