Upgrade, 3.4 -> 3.5.

PR:		3181 3372
Submitted by:	 Andrey Zakhvatov <andy@icc.surw.chel.su>

2 files changed, 43 insertions, 35 deletions

diff --git a/deskutils/cal/files/patch-aa b/deskutils/cal/files/patch-aa
index 86a9da909e50..c4e647ffac84 100644
--- a/deskutils/cal/files/patch-aa
+++ b/deskutils/cal/files/patch-aa
@@ -1,16 +1,15 @@
-*** Makefile	Thu Dec 28 05:29:16 1995
---- /home/andy/ports/cal/src/source/Makefile	Thu Jun 13 23:33:23 1996
+*** makefile.unx.orig	Tue Mar  5 06:36:27 1996
+--- makefile.unx	Mon May 12 15:23:42 1997
 ***************
-*** 7,13 ****
---- 7,17 ----
-  # To use, enter "make -f makefile.unx"
-  
+*** 10,15 ****
+--- 10,19 ----
   CC=gcc
+  CFLAGS=-O -Wall -DUNIX -DUSE_REMINDER
+  
 + .ifdef PREFIX
-+ CFLAGS+=-DUNIX -DPREFIX="\"${PREFIX}\""
-+ .else
-  CFLAGS=-DUNIX
++ CFLAGS+=-DPREFIX="\"${PREFIX}\""
 + .endif
-  
-  default: cal
++ 
+  BINDIR=/usr/bin
+  MANDIR=/usr/man
   
diff --git a/deskutils/cal/files/patch-ab b/deskutils/cal/files/patch-ab
index 200d34f582b6..88ce105c56f4 100644
--- a/deskutils/cal/files/patch-ab
+++ b/deskutils/cal/files/patch-ab
@@ -1,29 +1,38 @@
-*** cal.c	Thu Dec 28 05:43:12 1995
---- /home/andy/ports/cal/src/source/cal.c	Sat Jun 22 15:47:26 1996
+*** cal.c.orig	Fri Jul 12 04:36:33 1996
+--- cal.c	Mon May 12 15:23:51 1997
 ***************
-*** 128,133 ****
---- 128,137 ----
-  #define stricmp(a,b) strcasecmp(a,b) /* case-insensitive string comparison */
-  #endif
-  
-+ #ifdef __FreeBSD__        /* Make FreeBSD compatible with stricmp() */
+*** 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 __ZTC__            /* make Zortech compatible with stricmp() */
-  #define stricmp(a,b) strcmpl(a,b) /* case-insensitive string comparison */
-  #endif /* __ZTC__ */
++  
+  #ifdef __linux__          /* Make linux compatible with stricmp() */
+  #define stricmp(a,b) strcasecmp(a,b) /* case-insensitive string comparison */
+  #endif
 ***************
-*** 1090,1096 ****
---- 1094,1104 ----
-         strcpy(str, file);
-         if ((fp = fopen(str, mode)) == NULL) {
-            /* If still not found then look in a lib directory */
-+ #ifdef PREFIX
-+           strcpy(str, PREFIX "/etc/cal/");
-+ #else
-            strcpy(str, "/usr/lib/");
+*** 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);
-            }
+                  strcat(str,file);
+                  fp = fopen(str, mode);
+              }