2 files changed, 159 insertions, 0 deletions

diff --git a/misc/wmwork/files/patch-Makefile b/misc/wmwork/files/patch-Makefile
new file mode 100644
index 000000000000..38e5e24f6d3d
--- /dev/null
+++ b/misc/wmwork/files/patch-Makefile
@@ -0,0 +1,61 @@
+$FreeBSD$
+
+--- Makefile.orig	Sun Mar  3 21:21:58 2002
++++ Makefile	Thu May 16 09:46:38 2002
+@@ -1,45 +1,18 @@
+-# $Id: Makefile,v 1.7 2002/03/03 15:21:58 godisch Exp $
++CC ?= gcc
++CFLAGS += -c -Wall -pedantic
++INCDIR = -I${X11BASE}/include -I/usr/local/include
++LIBDIR = -L${X11BASE}/lib -L/usr/local/lib
++LIBS   = -lXpm -lXext -lX11 -lgnugetopt
++OBJS =  wmwork.o wmgeneral.o
+ 
+-prefix      = /usr/local
+-exec_prefix = ${prefix}
+-bindir      = ${exec_prefix}/bin
+-mandir      = ${prefix}/share/man
++.c.o:
++	${CC} ${CFLAGS} ${INCDIR} $< -o $*.o -DSIGPOLL=SIGIO
+ 
+-DESTDIR     =
+-
+-CFLAGS      = -O2 -Wall -pedantic
+-LIBS        = -L/usr/X11R6/lib -lX11 -lXpm -lXext
++wmwork: $(OBJS)
++	${CC} -o wmwork $^ ${LIBDIR} ${LIBS}
+ 
+ all: wmwork
+ 
+-wmwork: wmwork.o wmgeneral.o
+-	$(CC) $(LIBS) -o $@ $^
+-
+-wmwork.o: wmwork.c wmwork.h wmwork.xpm
+-wmgeneral.o: wmgeneral.c wmgeneral.h
+-
+-install: install-bin install-doc
+-
+-install-bin: wmwork
+-	install -D -s -m 755 $< $(DESTDIR)$(bindir)/wmwork
+-
+-install-doc: wmwork.1
+-	install -D -m 644 $< $(DESTDIR)$(mandir)/man1/wmwork.1
+-
+-uninstall: uninstall-bin uninstall-doc
+-
+-uninstall-bin:
+-	rm -f $(DESTDIR)$(bindir)/wmwork
+-
+-uninstall-doc:
+-	rm -f $(DESTDIR)$(mandir)/man1/wmwork.1
+-
+ clean:
+ 	rm -f *.o
+-
+-distclean: clean
+-	rm -f wmwork
+-
+-.PHONY: all clean dist-clean install install-bin install-doc \
+-	uninstall uninstall-bin uninstall-doc
+-
++	rm -f wmwork core
diff --git a/misc/wmwork/files/patch-wmwork.c b/misc/wmwork/files/patch-wmwork.c
new file mode 100644
index 000000000000..c44de246827d
--- /dev/null
+++ b/misc/wmwork/files/patch-wmwork.c
@@ -0,0 +1,98 @@
+$FreeBSD$
+
+--- wmwork.c.orig	Thu May 16 09:48:59 2002
++++ wmwork.c	Thu May 16 09:46:29 2002
+@@ -11,10 +11,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <time.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
+-#include <sys/timeb.h>
++#include <sys/time.h>
+ #include <X11/xpm.h>
+
+ #include "wmgeneral.h"
+@@ -43,7 +43,8 @@
+ 
+ char wmwork_mask_bits[64*64];
+ char logname[MAX_STRING];
+-struct timeb now;
++struct timeval now;
++struct timezone tz;
+ struct Project
+ 	*current = NULL,
+ 	*first   = NULL;
+@@ -54,9 +55,9 @@
+ 	int n,
+ 		show_days = 0,
+ 		but_stat  = 0,
+-		millitm   = 0,
+ 		running   = 0;
+ 	long
++		microtm   = 0,
+ 		last_time = 0;
+ 	static int signals[] =
+ 		{SIGALRM, SIGHUP, SIGINT, SIGPIPE, SIGPOLL, SIGTERM, SIGUSR1, SIGUSR2, 0};
+@@ -89,17 +90,17 @@
+ 	AddMouseRegion(BUT_STOP,  41, 48, 58, 58);
+ 	AddMouseRegion(BUT_PREV,   5, 33, 16, 43);
+ 	AddMouseRegion(BUT_NEXT,  47, 33, 58, 43);
+-	drawTime(current->time, sess_time, millitm, show_days);
++	drawTime(current->time, sess_time, microtm, show_days);
+ 	drawProject(current->name);
+ 
+ 	while (1) {
+-		last_time = now.time;
+-		ftime(&now);
++		last_time = now.tv_sec;
++		gettimeofday(&now, &tz);
+ 		if (running) {
+-			current->time += now.time - last_time;
+-			sess_time     += now.time - last_time;
+-			millitm        = now.millitm;
+-			drawTime(current->time, sess_time, millitm, show_days);
++			current->time += now.tv_sec - last_time;
++			sess_time     += now.tv_sec - last_time;
++			microtm        = now.tv_usec;
++			drawTime(current->time, sess_time, microtm, show_days);
+ 			RedrawWindow();
+ 		}
+ 		while (XPending(display)) {
+@@ -159,7 +160,7 @@
+ 							current = current->next;
+ 						break;
+ 					}
+-					drawTime(current->time, sess_time, millitm, show_days);
++					drawTime(current->time, sess_time, microtm, show_days);
+ 					drawProject(current->name);
+ 				}
+ 				RedrawWindow();
+@@ -272,7 +273,7 @@
+ 	}
+ }
+ 
+-void drawTime(long time1, long time2, int millitm, int show_days)
++void drawTime(long time1, long time2, int microtm, int show_days)
+ {
+ 	long  d1 = 0, d2 = 0, h1 = 0, h2 = 0;
+ 	short m1 = 0, m2 = 0, s1 = 0, s2 = 0;
+@@ -337,7 +338,7 @@
+ 		copyXPMArea(TIMER_SRC_X(s2 %  10), TIMER_SRC_Y, 5, 7, 52, 20);
+ 	}
+ 
+-	if (millitm < 500) {
++	if (microtm < 500000) {
+ 		copyXPMArea(161, CHAR_SRC_Y1, 1, 7, 27,  6);
+ 		copyXPMArea(161, CHAR_SRC_Y1, 1, 7, 27, 20);
+ 		copyXPMArea(161, CHAR_SRC_Y1, 1, 7, 43,  6);
+@@ -502,7 +503,7 @@
+ 		perror("fopen");
+ 		return;
+ 	}
+-	strftime(t_buffer, 64, "%a %b %d %H:%M:%S %Z %Y", localtime(&now.time));
++	strftime(t_buffer, 64, "%a %b %d %H:%M:%S %Z %Y", localtime(&now.tv_sec));
+ 	fprintf(F, "%s %s %03li:%02li:%02li\n", t_buffer, current->name, sess_time / 3600, sess_time / 60 % 60, sess_time % 60);
+ 	fclose(F);
+ }