From f33e15d729226d1d8544db01b95647bba801880d Mon Sep 17 00:00:00 2001
From: jmmv <jmmv@pkgsrc.org>
Date: Wed, 24 Sep 2003 10:53:36 +0000
Subject: Fix build on SunOS and remove GCC specific bits. From Jonathan Perkin
 in PR pkg/22929.

---
 time/cal/patches/patch-aa | 14 ++++++++------
 time/cal/patches/patch-ab | 14 +++++++-------
 2 files changed, 15 insertions(+), 13 deletions(-)

(limited to 'time/cal/patches')

diff --git a/time/cal/patches/patch-aa b/time/cal/patches/patch-aa
index 015ad0294bb..35956860347 100644
--- a/time/cal/patches/patch-aa
+++ b/time/cal/patches/patch-aa
@@ -1,13 +1,15 @@
-$NetBSD: patch-aa,v 1.2 2003/01/03 22:22:10 jmmv Exp $
+$NetBSD: patch-aa,v 1.3 2003/09/24 10:53:36 jmmv Exp $
 
---- makefile.unx.orig	Mon Mar  4 22:36:27 1996
-+++ makefile.unx
-@@ -8,7 +8,7 @@
+--- makefile.unx.orig	Mon Mar  4 21:36:27 1996
++++ makefile.unx	Wed Sep 24 11:37:37 2003
+@@ -7,8 +7,8 @@
+ # To use, enter "make -f makefile.unx"
  
  RM=rm -f
- CC=gcc
+-CC=gcc
 -CFLAGS=-O -Wall -DUNIX -DUSE_REMINDER
-+CFLAGS+=-O -Wall -DUNIX -DUSE_REMINDER
++#CC=gcc
++CFLAGS+=-DUNIX -DUSE_REMINDER
  
  BINDIR=/usr/bin
  MANDIR=/usr/man
diff --git a/time/cal/patches/patch-ab b/time/cal/patches/patch-ab
index 59fcb26946b..c7451d70a9d 100644
--- a/time/cal/patches/patch-ab
+++ b/time/cal/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2003/01/03 22:22:11 jmmv Exp $
+$NetBSD: patch-ab,v 1.3 2003/09/24 10:53:36 jmmv Exp $
 
---- cal.c.orig	Thu Jul 11 21:36:33 1996
-+++ cal.c
-@@ -122,6 +122,7 @@ BASIC DATA STRUCTURE:                   
+--- cal.c.orig	Thu Jul 11 20:36:33 1996
++++ cal.c	Wed Sep 24 11:30:56 2003
+@@ -122,6 +122,7 @@
  #include <ctype.h>
  #include <string.h>
  #include <sys/types.h>
@@ -10,18 +10,18 @@ $NetBSD: patch-ab,v 1.2 2003/01/03 22:22:11 jmmv Exp $
   
  #ifndef max
  #define max(a,b) (((a)>(b))?(a):(b))
-@@ -130,6 +131,10 @@ BASIC DATA STRUCTURE:                   
+@@ -130,6 +131,10 @@
  /* 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.                                */
-+#if (defined(BSD) && BSD >= 199306)
++#if (defined(BSD) && BSD >= 199306) || defined (sun)
 +#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 +1406,8 @@ FILE *efopen(const char *file, const cha
+@@ -1401,8 +1406,8 @@
              strcpy(str, ".");
              strcpy(str, file);
              if ((fp = fopen(str, mode)) == NULL) {
-- 
cgit v1.2.3