3 files changed, 35 insertions, 45 deletions

diff --git a/deskutils/cal/files/patch-cal.1 b/deskutils/cal/files/patch-cal.1
index 0d4634c1968d..5208947b67f2 100644
--- a/deskutils/cal/files/patch-cal.1
+++ b/deskutils/cal/files/patch-cal.1
@@ -1,6 +1,6 @@
---- cal.1.orig	Sat Jul  6 02:55:52 1996
-+++ cal.1	Mon Mar 29 16:02:33 1999
-@@ -375,12 +375,12 @@
+--- cal.1.orig	1996-07-05 17:55:52 UTC
++++ cal.1
+@@ -375,12 +375,12 @@ Unix local color file
  .TP
  .B caldat
  .TP
diff --git a/deskutils/cal/files/patch-cal.c b/deskutils/cal/files/patch-cal.c
index 88ce105c56f4..ef363a9b2d59 100644
--- a/deskutils/cal/files/patch-cal.c
+++ b/deskutils/cal/files/patch-cal.c
@@ -1,38 +1,27 @@
-*** cal.c.orig	Fri Jul 12 04:36:33 1996
---- cal.c	Mon May 12 15:23:51 1997
-***************
-*** 130,135 ****
---- 130,139 ----
-  /* Note: Other unix systems may require this next re-define to work. */
-  /* I believe that SCO is one such system.  Please send in any fixes  */
-  /* needed to get your system running.                                */
-+ #ifdef __FreeBSD__          /* Make FreeBSD compatible with stricmp() */
-+ #define stricmp(a,b) strcasecmp(a,b) /* case-insensitive string comparison */
-+ #endif
-+  
-  #ifdef __linux__          /* Make linux compatible with stricmp() */
-  #define stricmp(a,b) strcasecmp(a,b) /* case-insensitive string comparison */
-  #endif
-***************
-*** 1401,1408 ****
-              strcpy(str, ".");
-              strcpy(str, file);
-              if ((fp = fopen(str, mode)) == NULL) {
-!                 /* If still not found then look in a lib directory */
-                  strcpy(str, "/usr/lib/");
-                  strcat(str,file);
-                  fp = fopen(str, mode);
-              }
---- 1405,1416 ----
-              strcpy(str, ".");
-              strcpy(str, file);
-              if ((fp = fopen(str, mode)) == NULL) {
-!                 /* If still not found then look in config directory */
-! #ifdef PREFIX
-!                 strcpy(str, PREFIX "/etc/cal/");
-! #else
-                  strcpy(str, "/usr/lib/");
-+ #endif
-                  strcat(str,file);
-                  fp = fopen(str, mode);
-              }
+--- cal.c.orig	1996-07-11 19:36:33 UTC
++++ cal.c
+@@ -130,6 +130,10 @@ BASIC DATA STRUCTURE:                   
+ /* Note: Other unix systems may require this next re-define to work. */
+ /* I believe that SCO is one such system.  Please send in any fixes  */
+ /* needed to get your system running.                                */
++#ifdef __FreeBSD__          /* Make FreeBSD compatible with stricmp() */
++#define stricmp(a,b) strcasecmp(a,b) /* case-insensitive string comparison */
++#endif
++ 
+ #ifdef __linux__          /* Make linux compatible with stricmp() */
+ #define stricmp(a,b) strcasecmp(a,b) /* case-insensitive string comparison */
+ #endif
+@@ -1401,8 +1405,12 @@ FILE *efopen(const char *file, const cha
+             strcpy(str, ".");
+             strcpy(str, file);
+             if ((fp = fopen(str, mode)) == NULL) {
+-                /* If still not found then look in a lib directory */
++                /* If still not found then look in config directory */
++#ifdef PREFIX
++                strcpy(str, PREFIX "/etc/cal/");
++#else
+                 strcpy(str, "/usr/lib/");
++#endif
+                 strcat(str,file);
+                 fp = fopen(str, mode);
+             }
diff --git a/deskutils/cal/files/patch-makefile.unx b/deskutils/cal/files/patch-makefile.unx
index 55adbfb0c831..e5ce64735937 100644
--- a/deskutils/cal/files/patch-makefile.unx
+++ b/deskutils/cal/files/patch-makefile.unx
@@ -1,12 +1,13 @@
---- makefile.unx.orig	1996-03-05 06:36:27.000000000 +0900
-+++ makefile.unx	2013-10-19 20:15:02.149614385 +0900
+--- makefile.unx.orig	1996-03-04 21:36:27 UTC
++++ makefile.unx
 @@ -7,9 +7,13 @@
  # To use, enter "make -f makefile.unx"
  
  RM=rm -f
 -CC=gcc
-+CC=cc
- CFLAGS=-O -Wall -DUNIX -DUSE_REMINDER
++CC?=gcc
+-CFLAGS=-O -Wall -DUNIX -DUSE_REMINDER
++CFLAGS+=-Wall -DUNIX -DUSE_REMINDER
  
 +.ifdef PREFIX
 +CFLAGS+=-DPREFIX="\"${PREFIX}\""