6 files changed, 64 insertions, 49 deletions

diff --git a/x11-clocks/dclock/files/patch-Dclock.ad b/x11-clocks/dclock/files/patch-Dclock.ad
new file mode 100644
index 000000000000..c04f47343b36
--- /dev/null
+++ b/x11-clocks/dclock/files/patch-Dclock.ad
@@ -0,0 +1,30 @@
+--- Dclock.ad.orig	Sun Dec 18 00:18:10 2005
++++ Dclock.ad	Sun Dec 18 00:20:00 2005
+@@ -1,14 +1,14 @@
+ !       sample dclock defaults
+-dclock*geometry:                240x87+271+5
+-dclock*foreground:              chartreuse
+-dclock*background:              DarkSlateGray
+-dclock*led_off:              	DarkGreen
+-dclock*borderColor:             white
+-dclock*borderWidth:		2
+-dclock*widthFactor:		0.143
+-dclock*spaceFactor:		0.062
+-dclock*bellFile:		/usr/share/sounds/bell.wav
+-dclock*alarmFile:		/usr/share/sounds/digital.wav
+-dclock*font:                    *helvetica-medium-r-normal--14*
+-dclock*audioPlay:		/usr/bin/play
+-dclock.input:			true
++*geometry:	240x87+271+5
++*foreground:	chartreuse
++*background:	DarkSlateGray
++*led_off:	DarkGreen
++*borderColor:	white
++*borderWidth:	2
++*widthFactor:	0.143
++*spaceFactor:	0.062
++*bellFile:	%%DATADIR%%/sounds/bell.wav
++*alarmFile:	%%DATADIR%%/sounds/digital.wav
++*font:		*helvetica-medium-r-normal--14*
++*audioPlay:	%%LOCALBASE%%/bin/play
++.input:		true
diff --git a/x11-clocks/dclock/files/patch-Dclock.c b/x11-clocks/dclock/files/patch-Dclock.c
new file mode 100644
index 000000000000..2f63600bcc93
--- /dev/null
+++ b/x11-clocks/dclock/files/patch-Dclock.c
@@ -0,0 +1,23 @@
+--- Dclock.c.orig	Sat Dec 17 23:46:28 2005
++++ Dclock.c	Sat Dec 17 23:47:28 2005
+@@ -9,9 +9,9 @@
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <string.h>
+-#include <values.h>
++#include <limits.h>
+ #include <time.h>
+-#include <wait.h>
++#include <sys/wait.h>
+ #include <errno.h>
+ #include <X11/IntrinsicP.h>
+ #include <X11/Xos.h>
+@@ -171,7 +171,7 @@
+     { XtNbellFile, "bellFile", XtRString, sizeof(String),
+ 	XtOffset(DclockWidget,dclock.bellfile), XtRString, (String)NULL},
+     { XtNaudioPlay, "audioPlay", XtRString, sizeof(String),
+-	XtOffset(DclockWidget,dclock.audioplay), XtRString, "/usr/bin/play"},
++	XtOffset(DclockWidget,dclock.audioplay), XtRString, "%%LOCALBASE%%/bin/play"},
+ };
+ 
+ /* Define the Dclock widget */
diff --git a/x11-clocks/dclock/files/patch-ab b/x11-clocks/dclock/files/patch-ab
deleted file mode 100644
index 8aa7c7fbb465..000000000000
--- a/x11-clocks/dclock/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- Dclock.h.orig	Mon Jun  6 08:00:00 1994
-+++ Dclock.h	Sun Dec 19 15:59:17 1999
-@@ -58,7 +58,7 @@
- #define XtNfadeRate	"fadeRate"
- #define XtNtails	"tails"
- #define XtNdate		"date"
--#define XtNmilitaryTime	"militaryTime"
-+#define XtNmilitaryTime	"miltime"
- #define XtNlanguage     "language"
- #define XtNhours_snd    "hours_snd"
- #define XtNhalf_hours_snd    "half_hours_snd"
diff --git a/x11-clocks/dclock/files/patch-ac b/x11-clocks/dclock/files/patch-ac
deleted file mode 100644
index caa7dae4961e..000000000000
--- a/x11-clocks/dclock/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- d_clock.c.orig	Fri Jun  3 08:00:00 1994
-+++ d_clock.c	Sun Dec 19 16:01:36 1999
-@@ -131,7 +131,7 @@
-     else
- 	name = argv[0];
- 
--    toplevel = XtInitialize(name, "DClock", options, XtNumber(options),
-+    toplevel = XtInitialize(name, "Dclock", options, XtNumber(options),
- 			    &argc, argv);
-     XtAddActions(actionsList, 1);
- 
diff --git a/x11-clocks/dclock/files/patch-ad b/x11-clocks/dclock/files/patch-ad
deleted file mode 100644
index 2ff8cbfb2954..000000000000
--- a/x11-clocks/dclock/files/patch-ad
+++ /dev/null
@@ -1,27 +0,0 @@
---- Dclock.c.orig	Tue Jan  4 14:01:53 2000
-+++ Dclock.c	Tue Jan  4 14:01:55 2000
-@@ -967,7 +967,7 @@
- {
-     char datestr[128];
-     register char *datep = datestr, *p;
--    int x;
-+    int x, year = now->tm_year + 1900;
- 
-     if (!w->dclock.display_time)
- 	datep += strlen(strcpy(datep, "Push HERE to Set/Unset Alarm"));
-@@ -1000,11 +1000,12 @@
-                     *datep++ = (now->tm_mday / 10 + '0');
-                 *datep++ = now->tm_mday % 10 + '0';
-             when 'Y':
--                *datep++ = '1', *datep++ = '9';
-+		*datep++ = (year / 1000) % 10 + '0';
-+		*datep++ = (year / 100) % 10 + '0';
-             /* fall thru */
-             case 'y':
--                *datep++ = now->tm_year / 10 + '0';
--                *datep++ = now->tm_year % 10 + '0';
-+                *datep++ = (year / 10) % 10 + '0';
-+                *datep++ = year % 10 + '0';
-             when '%':
-                 *datep++ = *p;
-             otherwise: ; /* nothing */
diff --git a/x11-clocks/dclock/files/patch-dclock.1 b/x11-clocks/dclock/files/patch-dclock.1
new file mode 100644
index 000000000000..80240b11a1fd
--- /dev/null
+++ b/x11-clocks/dclock/files/patch-dclock.1
@@ -0,0 +1,11 @@
+--- dclock.1.orig	Sat Dec 17 23:23:39 2005
++++ dclock.1	Sat Dec 17 23:24:21 2005
+@@ -304,7 +304,7 @@
+ .B audioPlay (\fPclass\fB String)
+ Specifies an executable to use to play the bell and alarm audio files, if
+ they are specified.  Otherwise, the system bell is used (default is
+-"/usr/bin/play").
++"%%LOCALBASE%%/bin/play").
+ .SH ENVIRONMENT
+ .PP
+ .TP 8