From 8deae8d43cc950584f3a087ed4ade060f6d2bee0 Mon Sep 17 00:00:00 2001 From: naddy Date: Wed, 1 Jan 2003 21:21:00 +0000 Subject: [PATCH] sync patches --- .../gkrellm/patches/patch-Makefile_top_enable_nls | 10 +++++----- sysutils/gkrellm/patches/patch-po_Makefile | 8 ++++---- sysutils/gkrellm/patches/patch-src_Makefile_src | 14 +++++++------- sysutils/gkrellm/patches/patch-src_apm_c | 10 +++++----- sysutils/gkrellm/patches/patch-src_main_c | 8 ++++---- sysutils/gkrellm/patches/patch-src_plugins_c | 8 ++++---- 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/sysutils/gkrellm/patches/patch-Makefile_top_enable_nls b/sysutils/gkrellm/patches/patch-Makefile_top_enable_nls index 46ecb9a4e8d..d57e034bf81 100644 --- a/sysutils/gkrellm/patches/patch-Makefile_top_enable_nls +++ b/sysutils/gkrellm/patches/patch-Makefile_top_enable_nls @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile_top_enable_nls,v 1.2 2002/01/20 23:51:31 jcs Exp $ ---- Makefile.top_enable_nls.orig Wed Dec 5 01:41:15 2001 -+++ Makefile.top_enable_nls Sun Jan 20 17:36:54 2002 -@@ -79,15 +79,15 @@ +$OpenBSD: patch-Makefile_top_enable_nls,v 1.3 2003/01/01 21:21:00 naddy Exp $ +--- Makefile.top_enable_nls.orig Mon Jul 1 04:13:13 2002 ++++ Makefile.top_enable_nls Wed Jan 1 22:16:09 2003 +@@ -81,15 +81,15 @@ GTOP_INCLUDE = -I$(GTOP_PREFIX)/include GTOP_LIBS = -L$(GTOP_PREFIX)/lib -lgtop -lgtop_common -lgtop_sysdeps -lXau @@ -21,7 +21,7 @@ $OpenBSD: patch-Makefile_top_enable_nls,v 1.2 2002/01/20 23:51:31 jcs Exp $ export GTK_CONFIG GTOP_INCLUDE GTOP_LIBS SYS_LIBS EXTRAOBJS BINMODE export INSTALLDIR INCLUDEDIR INCLUDEMODE INCLUDEDIRMODE LOCALEDIR -@@ -139,8 +139,7 @@ +@@ -152,8 +152,7 @@ netbsd: openbsd: (cd po && ${MAKE} all) (cd src && ${MAKE} GTK_CONFIG=gtk-config GTOP_LIBS= GTOP_INCLUDE= \ diff --git a/sysutils/gkrellm/patches/patch-po_Makefile b/sysutils/gkrellm/patches/patch-po_Makefile index b30503939b2..1106ea7b573 100644 --- a/sysutils/gkrellm/patches/patch-po_Makefile +++ b/sysutils/gkrellm/patches/patch-po_Makefile @@ -1,7 +1,7 @@ -$OpenBSD: patch-po_Makefile,v 1.2 2002/01/06 21:06:50 jcs Exp $ ---- po/Makefile.orig Sun Jan 6 14:40:53 2002 -+++ po/Makefile Sun Jan 6 14:41:11 2002 -@@ -6,7 +6,7 @@ +$OpenBSD: patch-po_Makefile,v 1.3 2003/01/01 21:21:00 naddy Exp $ +--- po/Makefile.orig Wed Dec 5 09:28:32 2001 ++++ po/Makefile Wed Jan 1 22:16:09 2003 +@@ -6,7 +6,7 @@ SUB_DIRS = FILES_PO:=$(wildcard *.po) FILES_MO:=$(FILES_PO:.po=.mo) diff --git a/sysutils/gkrellm/patches/patch-src_Makefile_src b/sysutils/gkrellm/patches/patch-src_Makefile_src index ed8b5ea617f..40594412a6e 100644 --- a/sysutils/gkrellm/patches/patch-src_Makefile_src +++ b/sysutils/gkrellm/patches/patch-src_Makefile_src @@ -1,7 +1,7 @@ -$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 @@ +$OpenBSD: patch-src_Makefile_src,v 1.7 2003/01/01 21:21:01 naddy Exp $ +--- src/Makefile.src.orig Mon Jul 1 04:13:04 2002 ++++ src/Makefile.src Wed Jan 1 22:16:09 2003 +@@ -9,8 +9,7 @@ MANDIR ?= /usr/local/share/man/man1 MANMODE ?= 644 MANDIRMODE ?= 755 INSTALL ?= install @@ -11,7 +11,7 @@ $OpenBSD: patch-src_Makefile_src,v 1.6 2002/07/29 03:46:28 jcs Exp $ STRIP ?= -s GKRELLM_INCLUDES = gkrellm.h gkrellm_public_proto.h -@@ -21,7 +20,7 @@ +@@ -21,7 +20,7 @@ IMLIB_INCLUDE = `imlib-config --cflags-g GTK_LIB = `$(GTK_CONFIG) --libs gthread` IMLIB_LIB = `imlib-config --libs-gdk` @@ -20,7 +20,7 @@ $OpenBSD: patch-src_Makefile_src,v 1.6 2002/07/29 03:46:28 jcs Exp $ FLAGS+= $(PTHREAD_INC) LIBS = $(GTK_LIB) $(IMLIB_LIB) $(GTOP_LIBS) $(SYS_LIBS) -@@ -38,7 +37,7 @@ +@@ -38,7 +37,7 @@ ifeq ($(HAVE_GETADDRINFO),1) FLAGS += -DHAVE_GETADDRINFO endif @@ -29,7 +29,7 @@ $OpenBSD: patch-src_Makefile_src,v 1.6 2002/07/29 03:46:28 jcs Exp $ 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 \ -@@ -70,6 +69,9 @@ +@@ -70,6 +69,9 @@ darwin: 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 index 0e67a345471..0ae5a1c6fb7 100644 --- a/sysutils/gkrellm/patches/patch-src_apm_c +++ b/sysutils/gkrellm/patches/patch-src_apm_c @@ -1,7 +1,7 @@ -$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 @@ +$OpenBSD: patch-src_apm_c,v 1.4 2003/01/01 21:21:01 naddy Exp $ +--- src/apm.c.orig Tue May 14 21:26:37 2002 ++++ src/apm.c Wed Jan 1 22:16:09 2003 +@@ -159,7 +159,8 @@ read_linux_apm_data(void) /* ------- NetBSD ------------------------------------------------------- */ @@ -11,7 +11,7 @@ $OpenBSD: patch-src_apm_c,v 1.3 2002/07/29 03:46:28 jcs Exp $ #include #define APMDEV "/dev/apm" -@@ -242,7 +243,8 @@ +@@ -242,7 +243,8 @@ setup_apm_interface(void) available = TRUE; #endif diff --git a/sysutils/gkrellm/patches/patch-src_main_c b/sysutils/gkrellm/patches/patch-src_main_c index d23bab3d96a..a70526f55f6 100644 --- a/sysutils/gkrellm/patches/patch-src_main_c +++ b/sysutils/gkrellm/patches/patch-src_main_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_main_c,v 1.1 2002/11/20 01:51:42 jcs Exp $ ---- src/main.c.orig Tue Nov 19 19:47:46 2002 -+++ src/main.c Tue Nov 19 19:48:35 2002 -@@ -1904,12 +1904,12 @@ +$OpenBSD: patch-src_main_c,v 1.2 2003/01/01 21:21:01 naddy Exp $ +--- src/main.c.orig Mon Jul 1 04:17:27 2002 ++++ src/main.c Wed Jan 1 22:16:09 2003 +@@ -1904,12 +1904,12 @@ main (int argc, char *argv[]) * the folowing function should be performed here just for that reason. */ solaris_list_harddisks(); diff --git a/sysutils/gkrellm/patches/patch-src_plugins_c b/sysutils/gkrellm/patches/patch-src_plugins_c index 00f64c7117d..d68380dbb08 100644 --- a/sysutils/gkrellm/patches/patch-src_plugins_c +++ b/sysutils/gkrellm/patches/patch-src_plugins_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_plugins_c,v 1.2 2002/01/06 21:06:50 jcs Exp $ ---- src/plugins.c.orig Sun Jan 6 14:47:33 2002 -+++ src/plugins.c Sun Jan 6 14:47:52 2002 -@@ -730,6 +730,9 @@ +$OpenBSD: patch-src_plugins_c,v 1.3 2003/01/01 21:21:01 naddy Exp $ +--- src/plugins.c.orig Sat Jun 22 21:08:41 2002 ++++ src/plugins.c Wed Jan 1 22:16:09 2003 +@@ -794,6 +794,9 @@ install_plugin(gchar *plugin_name) plugin_log(buf, NULL); return NULL; }