From 6bcde87560d9e63baa19f414f8e490f2e3b48ba2 Mon Sep 17 00:00:00 2001
From: dsainty <dsainty>
Date: Tue, 24 Oct 2006 11:51:55 +0000
Subject: Get malloc() prototype via stdlib.h instead of ancient C style
 function declaration.  Fixes build under SUSE Linux.

---
 time/xcal/distinfo         |  5 +++--
 time/xcal/patches/patch-af | 27 ++++++++++++++++++++++-----
 time/xcal/patches/patch-ag | 21 +++++++++++++++++++++
 3 files changed, 46 insertions(+), 7 deletions(-)
 create mode 100644 time/xcal/patches/patch-ag

(limited to 'time/xcal')

diff --git a/time/xcal/distinfo b/time/xcal/distinfo
index dc0eb1974c6..c1fd3027cb7 100644
--- a/time/xcal/distinfo
+++ b/time/xcal/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/12/07 15:49:46 joerg Exp $
+$NetBSD: distinfo,v 1.5 2006/10/24 11:51:55 dsainty Exp $
 
 SHA1 (xcal41.tar.Z) = dc2562b9c9fccdee230b3a0b0643d878eae0d014
 RMD160 (xcal41.tar.Z) = 41189d892b98cd4ec3e00f64e48c200169bbfb3e
@@ -8,4 +8,5 @@ SHA1 (patch-ab) = 847c05195281b468d8b913b26f18637964ffd43e
 SHA1 (patch-ac) = 82da3ea57db0ab225066f6b6fd354a83e8cccbc1
 SHA1 (patch-ad) = 5f8a8bc3adf0a90d996191b65599d0252a28de6e
 SHA1 (patch-ae) = d6000c3976bd672feadeda6b97cbf0a07c505418
-SHA1 (patch-af) = 63022fcd1157aa0aa4071c8c419a6339b39b703c
+SHA1 (patch-af) = 25a51c27827691d1978e2060a82027a006a52c33
+SHA1 (patch-ag) = 0ac3c4a363573b9b20927b7e09cecb2ad7916c66
diff --git a/time/xcal/patches/patch-af b/time/xcal/patches/patch-af
index cd78fea9947..d692ce2d112 100644
--- a/time/xcal/patches/patch-af
+++ b/time/xcal/patches/patch-af
@@ -1,8 +1,16 @@
-$NetBSD: patch-af,v 1.1 2005/12/07 15:49:46 joerg Exp $
+$NetBSD: patch-af,v 1.2 2006/10/24 11:51:55 dsainty Exp $
 
---- xcalpr/xcalpr.c.orig	2005-12-06 13:21:40.000000000 +0000
-+++ xcalpr/xcalpr.c
-@@ -86,7 +86,7 @@ static char	*daynames[]	= {"Sun", "Mon",
+--- xcalpr/xcalpr.c.orig	2006-10-20 16:38:40.000000000 +1300
++++ xcalpr/xcalpr.c	2006-10-24 11:08:56.000000000 +1300
+@@ -59,6 +59,7 @@
+  
+ ***/
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <ctype.h>
+ #include <string.h>
+ #include <time.h>
+@@ -86,7 +87,7 @@
  
  static char	*dayfiles[7];		/* connected contents of any dayfiles */
  
@@ -11,7 +19,16 @@ $NetBSD: patch-af,v 1.1 2005/12/07 15:49:46 joerg Exp $
  	
  static int mon[] = { 
      31, 28, 31, 30,
-@@ -132,6 +132,8 @@ main(argc, argv)
+@@ -100,8 +101,6 @@
+ static char	*memerr = "No more memory\n";
+ static char	*usage = "Usage: xcalpr [-d dir][-x][-c][-u user][-f file] [month list]\n";
+ 
+-char	*malloc();
+-
+ /*
+  * Routines
+  */
+@@ -132,6 +131,8 @@
  	int		ac;
  	int		yr;
  
diff --git a/time/xcal/patches/patch-ag b/time/xcal/patches/patch-ag
new file mode 100644
index 00000000000..d6f7124e352
--- /dev/null
+++ b/time/xcal/patches/patch-ag
@@ -0,0 +1,21 @@
+$NetBSD: patch-ag,v 1.1 2006/10/24 11:51:55 dsainty Exp $
+
+--- xcalev/xcalev.c.orig	2006-10-24 11:10:19.000000000 +1300
++++ xcalev/xcalev.c	2006-10-24 11:13:37.000000000 +1300
+@@ -52,6 +52,7 @@
+  
+ ***/
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <ctype.h>
+ #include <string.h>
+ #include <time.h>
+@@ -88,8 +89,6 @@
+ static char	*memerr = "No more memory\n";
+ static char	*usage = "Usage: xcalev [-f srcfile] [-d dir][-x][-r] [year]\n";
+ 
+-char	*malloc();
+-
+ /*
+  *	routines
+  */
-- 
cgit v1.2.3