diff options
Diffstat (limited to 'audio/workman')
-rw-r--r-- | audio/workman/files/patch-Imakefile | 4 | ||||
-rw-r--r-- | audio/workman/files/patch-cdrom.c | 6 | ||||
-rw-r--r-- | audio/workman/files/patch-plat__freebsd.c (renamed from audio/workman/files/patch-plat_freebsd.c) | 12 | ||||
-rw-r--r-- | audio/workman/files/patch-workman.man | 82 | ||||
-rw-r--r-- | audio/workman/files/patch-workman__stubs.c (renamed from audio/workman/files/patch-workman_stubs.c) | 6 |
5 files changed, 48 insertions, 62 deletions
diff --git a/audio/workman/files/patch-Imakefile b/audio/workman/files/patch-Imakefile index f661990..2afc538 100644 --- a/audio/workman/files/patch-Imakefile +++ b/audio/workman/files/patch-Imakefile @@ -1,5 +1,5 @@ ---- Imakefile.orig Fri Feb 27 10:08:37 2004 -+++ Imakefile Fri Feb 27 10:09:01 2004 +--- Imakefile.orig 1995-06-05 00:10:44 UTC ++++ Imakefile @@ -1,19 +1,19 @@ -/**/# @(#)Imakefile 1.16 04 Jun 1995 +# @(#)Imakefile 1.16 04 Jun 1995 diff --git a/audio/workman/files/patch-cdrom.c b/audio/workman/files/patch-cdrom.c index 2b6e63f..801b462 100644 --- a/audio/workman/files/patch-cdrom.c +++ b/audio/workman/files/patch-cdrom.c @@ -1,6 +1,6 @@ ---- cdrom.c.orig 1997-06-15 10:05:03.000000000 +0200 -+++ cdrom.c 2013-10-16 13:14:49.440566031 +0200 -@@ -531,7 +531,7 @@ +--- cdrom.c.orig 1997-06-15 08:05:03 UTC ++++ cdrom.c +@@ -531,7 +531,7 @@ find_trkind(track, index, start) int top = 0, bottom, current, interval, ret = 0, i; if (cur_cdmode == EJECTED || cd == NULL) diff --git a/audio/workman/files/patch-plat_freebsd.c b/audio/workman/files/patch-plat__freebsd.c index f73fb3a..8c90722 100644 --- a/audio/workman/files/patch-plat_freebsd.c +++ b/audio/workman/files/patch-plat__freebsd.c @@ -1,5 +1,5 @@ ---- plat_freebsd.c.orig Mon Feb 20 17:29:55 1995 -+++ plat_freebsd.c Tue Oct 13 03:24:22 1998 +--- plat_freebsd.c.orig 1995-02-20 17:29:55 UTC ++++ plat_freebsd.c @@ -5,6 +5,9 @@ * * Todd Pfaff, 3/20/94 @@ -10,7 +10,7 @@ */ static char *ident = "@(#)plat_freebsd.c 1.2 2/20/95"; -@@ -22,21 +25,17 @@ +@@ -22,21 +25,17 @@ static char *ident = "@(#)plat_freebsd.c #include <string.h> #include <sys/ioctl.h> #include <sys/cdio.h> @@ -33,7 +33,7 @@ void *malloc(); -@@ -163,7 +162,7 @@ +@@ -163,7 +162,7 @@ gen_get_drive_status(d, oldmode, mode, p } if (ioctl(d->fd, CDIOCREADSUBCHANNEL, &sc)) { @@ -42,7 +42,7 @@ /* we need to release the device so the kernel will notice reloaded media */ (void) close(d->fd); -@@ -261,6 +260,9 @@ +@@ -261,6 +260,9 @@ gen_set_volume(d, left, right) bzero((char *)&vol, sizeof(vol)); @@ -52,7 +52,7 @@ vol.vol[LEFT_PORT] = left; vol.vol[RIGHT_PORT] = right; -@@ -345,12 +347,12 @@ +@@ -345,12 +347,12 @@ gen_eject(d) if (fstatfs(stbuf.st_rdev, &buf) == 0) return (-3); diff --git a/audio/workman/files/patch-workman.man b/audio/workman/files/patch-workman.man index 8bb81d7..7df3be8 100644 --- a/audio/workman/files/patch-workman.man +++ b/audio/workman/files/patch-workman.man @@ -1,48 +1,34 @@ -diff -c --recursive ./workman.man ../workman.new/./workman.man -*** ./workman.man Thu Jun 15 23:52:13 1995 ---- ../workman.new/./workman.man Sun Nov 26 03:28:54 1995 -*************** -*** 151,157 **** - .TP - .I \-p file - Write the program's process ID to a different \fIfile\fP. By default, the -! PID is written to "/tmp/.wm_pid" to allow signals to be sent more easily - (see the SIGNALS section below.) - .TP - .I \-n ---- 151,157 ---- - .TP - .I \-p file - Write the program's process ID to a different \fIfile\fP. By default, the -! PID is written to "/var/run/workman.pid" to allow signals to be sent more easily - (see the SIGNALS section below.) - .TP - .I \-n -*************** -*** 510,515 **** ---- 510,516 ---- - SVR4 port by Baruch Cochavy <bcochavy@iil.intel.com>. - .LP - FreeBSD port by Todd Pfaff <todd@flex.eng.mcmaster.ca>. -+ Modified to work under FreeBSD 2.x by Donald Burr <d_burr@ix.netcom.com>. - .LP - OSF/1 port by R.J. Edwards <rje@escact.ksc.nasa.gov>. - .LP -diff -c --recursive ./workman_stubs.c ../workman.new/./workman_stubs.c -*** ./workman_stubs.c Fri Jun 16 10:44:40 1995 ---- ../workman.new/./workman_stubs.c Sun Nov 26 03:26:57 1995 -*************** -*** 56,62 **** ---- 56,67 ---- - Panel_item quitbutton; - char *getenv(), *WMstrdup(); - -+ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) -+ /* FreeBSD has a special directory for pidfiles, I guess. */ -+ char *pidfile = "/var/run/workman.pid"; -+ #else - char *pidfile = "/tmp/.wm_pid"; -+ #endif - char * empty = ""; - extern char *cd_device; - +--- workman.man.orig 1995-06-16 06:52:13 UTC ++++ workman.man +@@ -151,7 +151,7 @@ Exit automatically when the CD is ejecte + .TP + .I \-p file + Write the program's process ID to a different \fIfile\fP. By default, the +-PID is written to "/tmp/.wm_pid" to allow signals to be sent more easily ++PID is written to "/var/run/workman.pid" to allow signals to be sent more easily + (see the SIGNALS section below.) + .TP + .I \-n +@@ -510,6 +510,7 @@ BSD/386 port by John T. Kohl <jtk@kolvir + SVR4 port by Baruch Cochavy <bcochavy@iil.intel.com>. + .LP + FreeBSD port by Todd Pfaff <todd@flex.eng.mcmaster.ca>. ++Modified to work under FreeBSD 2.x by Donald Burr <d_burr@ix.netcom.com>. + .LP + OSF/1 port by R.J. Edwards <rje@escact.ksc.nasa.gov>. + .LP +--- workman_stubs.c.orig 1997-06-11 18:14:01 UTC ++++ workman_stubs.c +@@ -58,7 +58,12 @@ void show_cdinfo(), + Panel_item quitbutton; + char *getenv(), *WMstrdup(); + ++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ++/* FreeBSD has a special directory for pidfiles, I guess. */ ++char *pidfile = "/var/run/workman.pid"; ++#else + char *pidfile = "/tmp/.wm_pid"; ++#endif + char * empty = ""; + extern char *cd_device; + diff --git a/audio/workman/files/patch-workman_stubs.c b/audio/workman/files/patch-workman__stubs.c index e09eb38..7eb2a47 100644 --- a/audio/workman/files/patch-workman_stubs.c +++ b/audio/workman/files/patch-workman__stubs.c @@ -1,6 +1,6 @@ ---- workman_stubs.c.orig Sat Feb 14 08:47:37 1998 -+++ workman_stubs.c Sat Feb 14 08:50:16 1998 -@@ -163,6 +163,9 @@ +--- workman_stubs.c.orig 1997-06-11 18:14:01 UTC ++++ workman_stubs.c +@@ -158,6 +158,9 @@ main(argc, argv) "Workman.Db.Shared", dbfiles); if (dbfiles) dbfiles = WMstrdup(dbfiles); |