cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sync patches

Browse Source
This commit is contained in:
sthen 2012-12-06 22:30:22 +00:00
parent b05731fd7f
commit 65b16623a1
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sysutils/wmmon/patches/patch-wmmon_Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-wmmon_Makefile,v 1.3 2004/08/12 09:33:10 claudio Exp $
--- wmmon/Makefile.orig 1998-05-19 23:12:55.000000000 +0200
+++ wmmon/Makefile 2004-07-28 16:12:41.000000000 +0200
$OpenBSD: patch-wmmon_Makefile,v 1.4 2012/12/06 22:30:22 sthen Exp $
--- wmmon/Makefile.orig Tue May 19 22:13:16 1998
+++ wmmon/Makefile Thu Dec 6 22:30:02 2012
@@ -1,19 +1,27 @@
-LIBDIR = -L/usr/X11R6/lib
-LIBS = -lXpm -lXext -lX11
@ -8,7 +8,6 @@ $OpenBSD: patch-wmmon_Makefile,v 1.3 2004/08/12 09:33:10 claudio Exp $
- ../wmgeneral/wmgeneral.o \
- ../wmgeneral/misc.o \
- ../wmgeneral/list.o
-
+LIBDIR = -L${X11BASE}/lib
+LIBS = -lXpm -lXext -lX11 -lkvm
+CFLAGS ?= -O2 -Wall
@ -20,17 +19,18 @@ $OpenBSD: patch-wmmon_Makefile,v 1.3 2004/08/12 09:33:10 claudio Exp $
+PROG = wmmon
+PREFIX ?= /usr/local
-
.c.o:
- cc -c -O2 -Wall $< -o $*.o
+ ${CC} -c $(CFLAGS) $< -o $@
+
+$(PROG): $(OBJS)
+ ${CC} -o $@ $> $(LIBDIR) $(LIBS)
-wmmon: $(OBJS)
- cc -o wmmon $^ $(LIBDIR) $(LIBS)
+all:: $(PROG)
+$(PROG): $(OBJS)
+ ${CC} -o $@ $> $(LIBDIR) $(LIBS)
+all:: $(PROG)
+
clean::
- for i in $(OBJS) ; do \
- rm $$i;\

24
sysutils/wmmon/patches/patch-wmmon_wmmon_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-wmmon_wmmon_c,v 1.5 2006/09/23 15:49:36 ckuethe Exp $
--- wmmon/wmmon.c.orig Tue May 19 15:13:16 1998
+++ wmmon/wmmon.c Sat Sep 23 09:43:02 2006
$OpenBSD: patch-wmmon_wmmon_c,v 1.6 2012/12/06 22:30:22 sthen Exp $
--- wmmon/wmmon.c.orig Tue May 19 22:13:16 1998
+++ wmmon/wmmon.c Thu Dec 6 22:30:02 2012
@@ -28,6 +28,10 @@
Changes:
----
@ -49,7 +49,7 @@ $OpenBSD: patch-wmmon_wmmon_c,v 1.5 2006/09/23 15:49:36 ckuethe Exp $
/* functions */
void usage(void);
@@ -114,17 +128,15 @@ void DrawStats_io(int *, int, int, int,
@@ -114,17 +128,15 @@ void DrawStats_io(int *, int, int, int, int);
void wmmon_routine(int, char **);
@ -111,7 +111,7 @@ $OpenBSD: patch-wmmon_wmmon_c,v 1.5 2006/09/23 15:49:36 ckuethe Exp $
void DrawActive(char *);
void update_stat_cpu(stat_dev *);
@@ -213,8 +224,9 @@ void wmmon_routine(int argc, char **argv
@@ -213,8 +224,9 @@ void wmmon_routine(int argc, char **argv) {
long istat;
long idle;
@ -123,7 +123,7 @@ $OpenBSD: patch-wmmon_wmmon_c,v 1.5 2006/09/23 15:49:36 ckuethe Exp $
char *p;
int xpm_X = 0, xpm_Y = 0;
@@ -223,22 +235,36 @@ void wmmon_routine(int argc, char **argv
@@ -223,22 +235,36 @@ void wmmon_routine(int argc, char **argv) {
long ref_time = 0;
long cnt_time;
@ -170,7 +170,7 @@ $OpenBSD: patch-wmmon_wmmon_c,v 1.5 2006/09/23 15:49:36 ckuethe Exp $
stat_device[i].hisaddcnt = 0;
}
@@ -246,38 +272,40 @@ void wmmon_routine(int argc, char **argv
@@ -246,38 +272,40 @@ void wmmon_routine(int argc, char **argv) {
if (RIGHT_ACTION) right_action = strdup(RIGHT_ACTION);
if (MIDDLE_ACTION) middle_action = strdup(MIDDLE_ACTION);
@ -228,7 +228,7 @@ $OpenBSD: patch-wmmon_wmmon_c,v 1.5 2006/09/23 15:49:36 ckuethe Exp $
if (stat_current == 2) {
xpm_X = 64;
setMaskXY(-64, 0);
@@ -288,7 +316,7 @@ void wmmon_routine(int argc, char **argv
@@ -288,7 +316,7 @@ void wmmon_routine(int argc, char **argv) {
DrawActive(stat_device[stat_current].name);
while (1) {
@ -237,7 +237,7 @@ $OpenBSD: patch-wmmon_wmmon_c,v 1.5 2006/09/23 15:49:36 ckuethe Exp $
waitpid(0, NULL, WNOHANG);
@@ -338,7 +366,7 @@ void wmmon_routine(int argc, char **argv
@@ -338,7 +366,7 @@ void wmmon_routine(int argc, char **argv) {
/*----------- online tijd neerzetten! ----------*/
@ -246,7 +246,7 @@ $OpenBSD: patch-wmmon_wmmon_c,v 1.5 2006/09/23 15:49:36 ckuethe Exp $
/* cnt_time = uptime in seconden */
/*
@@ -405,7 +433,6 @@ void wmmon_routine(int argc, char **argv
@@ -405,7 +433,6 @@ void wmmon_routine(int argc, char **argv) {
case DestroyNotify:
XCloseDisplay(display);
exit(0);
@ -254,7 +254,7 @@ $OpenBSD: patch-wmmon_wmmon_c,v 1.5 2006/09/23 15:49:36 ckuethe Exp $
case ButtonPress:
but_stat = CheckMouseRegion(Event.xbutton.x, Event.xbutton.y);
break;
@@ -430,7 +457,6 @@ void wmmon_routine(int argc, char **argv
@@ -430,7 +457,6 @@ void wmmon_routine(int argc, char **argv) {
}
case 1:
stat_current++;
@ -262,7 +262,7 @@ $OpenBSD: patch-wmmon_wmmon_c,v 1.5 2006/09/23 15:49:36 ckuethe Exp $
if (stat_current == stat_online)
stat_current = 0;
@@ -460,146 +486,116 @@ void wmmon_routine(int argc, char **argv
@@ -460,146 +486,116 @@ void wmmon_routine(int argc, char **argv) {
void update_stat_cpu(stat_dev *st) {