diff options
| author | cube <cube> | 2004-02-24 23:35:52 +0000 |
|---|---|---|
| committer | cube <cube> | 2004-02-24 23:35:52 +0000 |
| commit | 076b06d9650861907da31f60be7eb7087fdacb07 (patch) | |
| tree | 611a1705dab4d66af3bce334116bcca72698699d /net/gkrellm-wireless/patches | |
| parent | ac3b9c2d48aeaacfa51f4646443c446ec8c564f7 (diff) | |
| download | pkgsrc-076b06d9650861907da31f60be7eb7087fdacb07.tar.gz | |
Update to version 2.0.3. This is the GKrellM-2 port of the wireless
plugin.
Diffstat (limited to 'net/gkrellm-wireless/patches')
| -rw-r--r-- | net/gkrellm-wireless/patches/patch-aa | 51 | ||||
| -rw-r--r-- | net/gkrellm-wireless/patches/patch-ab | 25 |
2 files changed, 45 insertions, 31 deletions
diff --git a/net/gkrellm-wireless/patches/patch-aa b/net/gkrellm-wireless/patches/patch-aa index 285e88007ad..060a6c0cc14 100644 --- a/net/gkrellm-wireless/patches/patch-aa +++ b/net/gkrellm-wireless/patches/patch-aa @@ -1,35 +1,38 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/10/31 00:30:21 damon Exp $ +$NetBSD: patch-aa,v 1.2 2004/02/24 23:35:52 cube Exp $ ---- Makefile.orig Sun Sep 9 10:12:41 2001 +--- Makefile.orig 2003-12-06 14:19:55.000000000 +0100 +++ Makefile -@@ -12,6 +12,9 @@ - GTK_CONFIG = gtk-config - endif +@@ -16,15 +16,15 @@ endif + GTK_CFLAGS = `$(GTK_CONFIG) --cflags` + GTK_LIB = `$(GTK_CONFIG) --libs` -+ifeq ($(OS),NetBSD) -+ GTK_CONFIG = gtk-config -+endif - - GTK_INCLUDE = `$(GTK_CONFIG) --cflags gthread` - GTK_LIB = `$(GTK_CONFIG) --libs gthread` -@@ -20,17 +23,17 @@ - IMLIB_LIB = `imlib-config --libs-gdk` - - --FLAGS = -g -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(INCLUDE) -+CFLAGS += -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(INCLUDE) -I${PREFIX}/include - LIBS = $(GTK_LIB) $(IMLIB_LIB) +-FLAGS = -O2 -Wall -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE) ++CFLAGS += -O2 -Wall -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE) + LIBS = $(GTK_LIB) LFLAGS = -shared -CC = gcc $(CFLAGS) $(FLAGS) -+CC = gcc $(CFLAGS) ++#CC = gcc $(CFLAGS) $(FLAGS) OBJS = wireless.o - INSTALL = install -c -s - INSTALL_PERMS = -m 755 --PLUGIN_DIR = /usr/lib/gkrellm/plugins -+PLUGIN_DIR = ${PREFIX}/lib/gkrellm/plugins - +-PLUGIN_DIR = /usr/lib/gkrellm2/plugins ++PLUGIN_DIR = ${PREFIX}/lib/gkrellm2/plugins + INSTALL = install -c + INSTALL_PROGRAM = $(INSTALL) -s +@@ -32,12 +32,12 @@ INSTALL_PROGRAM = $(INSTALL) -s all: wireless.so + + wireless.so: $(OBJS) +- $(CC) $(OBJS) -o wireless.so $(LFLAGS) $(LIBS) ++ $(CC) $(CFLAGS) $(OBJS) -o wireless.so $(LFLAGS) $(LIBS) + + clean: + rm -f *.o core *.so* *.bak *~ + + install : +- $(INSTALL) $(INSTALL_PERMS) wireless.so $(PLUGIN_DIR) ++ $(BSD_INSTALL_DATA) wireless.so $(PLUGIN_DIR) + wireless.o: wireless.c + diff --git a/net/gkrellm-wireless/patches/patch-ab b/net/gkrellm-wireless/patches/patch-ab index 615df690522..f308a186875 100644 --- a/net/gkrellm-wireless/patches/patch-ab +++ b/net/gkrellm-wireless/patches/patch-ab @@ -1,17 +1,28 @@ -$NetBSD: patch-ab,v 1.1 2002/06/27 11:02:09 fredb Exp $ +$NetBSD: patch-ab,v 1.2 2004/02/24 23:35:52 cube Exp $ ---- wireless.h.orig Sun Sep 9 09:25:55 2001 +--- wireless.h.orig Sat Dec 6 13:19:55 2003 +++ wireless.h -@@ -32,7 +32,11 @@ +@@ -34,12 +34,23 @@ + #endif + + #ifdef __NetBSD__ ++ #include <sys/param.h> ++ #include <sys/socket.h> ++ #include <sys/sockio.h> + #include <net/if.h> + #include <net/if_dl.h> #include <net/if_ether.h> #include <net/if_media.h> ++# if __NetBSD_Version__ > 106290000 ++ #include <net80211/ieee80211.h> ++#else #include <net/if_ieee80211.h> -- #include <dev/pcmcia/if_wi_ieee.h> ++#endif +# if __NetBSD_Version__ > 105210000 -+ #include <dev/ic/wi_ieee.h> ++ #include <dev/ic/wi_ieee.h> +# else -+ #include <dev/pcmcia/if_wi_ieee.h> + #include <dev/pcmcia/if_wi_ieee.h> +# endif #endif - #define PLUGIN_CONFIG_KEYWORD "gkrellmwireless" + #ifdef __linux__ |