summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorminskim <minskim@pkgsrc.org>2005-05-29 05:33:42 +0000
committerminskim <minskim@pkgsrc.org>2005-05-29 05:33:42 +0000
commit26f5fc1df7f8590b14762d4027ca1810b1950678 (patch)
tree86c066bcb209c848f724f5358e03ec44191065c0
parent0cce57641613fc8bf1686b2dac07c160811ad611 (diff)
downloadpkgsrc-26f5fc1df7f8590b14762d4027ca1810b1950678.tar.gz
Include time.h on Linux to use "struct tm".
-rw-r--r--mail/mush/distinfo4
-rw-r--r--mail/mush/patches/patch-ad41
2 files changed, 27 insertions, 18 deletions
diff --git a/mail/mush/distinfo b/mail/mush/distinfo
index 9670fc82127..22ea95cae9c 100644
--- a/mail/mush/distinfo
+++ b/mail/mush/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 09:59:25 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/05/29 05:33:42 minskim Exp $
SHA1 (mush/mush-7.2.5.tar.Z) = 1b9b54b368b9a748401b1baeb3b3eba5a9ed2c03
RMD160 (mush/mush-7.2.5.tar.Z) = 32e010f544f79cc1a0f899d722d465975d552a4e
@@ -27,7 +27,7 @@ Size (mush/patch-7.2.6-beta-4) = 19764 bytes
SHA1 (patch-aa) = dd38a31a1e048471013df7a167fdf5582445ce2b
SHA1 (patch-ab) = e1482baca81fe09889f8316d96f9afb1a7a6bbb0
SHA1 (patch-ac) = 963ce2cc9e30a2cd5e7e63edbe09692a880d8d5b
-SHA1 (patch-ad) = 2c2a20548c7faefb8c6aba91c0f4d75d6de9557d
+SHA1 (patch-ad) = 1316212cceb8184e9e1af4006bebd462e893cd94
SHA1 (patch-ae) = 2923fa751a0e3dba13bc711694285973225e21b6
SHA1 (patch-af) = 1df2f9fb0b536cc30f94ba357a5de9fe11bbf941
SHA1 (patch-ag) = 29f4e9ca85bfbdaa53aa99ba077a4b657fea8c87
diff --git a/mail/mush/patches/patch-ad b/mail/mush/patches/patch-ad
index 84c6bc42b11..6f2ff9be7cc 100644
--- a/mail/mush/patches/patch-ad
+++ b/mail/mush/patches/patch-ad
@@ -1,6 +1,7 @@
-$NetBSD: patch-ad,v 1.2 1998/09/15 06:18:07 garbled Exp $
---- mush.h.orig Mon Sep 14 22:55:37 1998
-+++ mush.h Mon Sep 14 22:57:28 1998
+$NetBSD: patch-ad,v 1.3 2005/05/29 05:33:42 minskim Exp $
+
+--- mush.h.orig 2005-05-29 00:29:17.730213120 -0500
++++ mush.h
@@ -4,89 +4,98 @@
/* POSIX -- a collection of standardized parts from SYSV and BSD */
@@ -157,7 +158,7 @@ $NetBSD: patch-ad,v 1.2 1998/09/15 06:18:07 garbled Exp $
#ifndef __STDC__
extern char
-@@ -100,79 +109,85 @@
+@@ -100,79 +109,85 @@ extern void
xfree(); /* free malloc'ed pointers */
#ifdef BSD
@@ -287,7 +288,7 @@ $NetBSD: patch-ad,v 1.2 1998/09/15 06:18:07 garbled Exp $
#endif /* CTRL */
#define CTRL(c) ((c) & 037)
-@@ -180,20 +195,24 @@
+@@ -180,20 +195,24 @@ extern char *getcwd();
#define NO_STRING ""
#ifdef NULL
@@ -315,7 +316,7 @@ $NetBSD: patch-ad,v 1.2 1998/09/15 06:18:07 garbled Exp $
#endif /* SUNTOOL */
/* For error recovery purposes, send keyboard generated signals to a special
-@@ -211,121 +230,121 @@
+@@ -211,121 +230,121 @@ extern int bell();
/* Don't flush input when setting echo or cbreak modes (allow typeahead) */
#ifdef TIOCSETN
@@ -521,7 +522,7 @@ $NetBSD: patch-ad,v 1.2 1998/09/15 06:18:07 garbled Exp $
#endif /* ~USG */
/* With all that out of the way, we can now declare our tty type */
-@@ -351,78 +370,78 @@
+@@ -351,78 +370,78 @@ extern char
#define Debug if (debug == 0) {;} else (void) wprint
#ifdef SYSV
@@ -643,7 +644,7 @@ $NetBSD: patch-ad,v 1.2 1998/09/15 06:18:07 garbled Exp $
#endif
#endif /* SUNTOOL */
-@@ -547,8 +566,13 @@
+@@ -547,8 +566,13 @@ u_long glob_flags; /* global boolean f
/* It is possible to reset MAX_PRIORITY to as high as 9 */
#define MAX_PRIORITY 5
@@ -659,7 +660,7 @@ $NetBSD: patch-ad,v 1.2 1998/09/15 06:18:07 garbled Exp $
struct msg {
u_long m_flags;
long m_offset; /* offset in tempfile of msg */
-@@ -559,7 +583,16 @@
+@@ -559,7 +583,16 @@ struct msg {
char *m_to; /* Cached To: field */
char *m_subject; /* Cached Subject: field */
char *m_from; /* Cached Reply-To: or From: field */
@@ -677,7 +678,7 @@ $NetBSD: patch-ad,v 1.2 1998/09/15 06:18:07 garbled Exp $
struct options {
char *option;
-@@ -603,7 +636,11 @@
+@@ -603,7 +636,11 @@ jmp_buf jmpbuf; /* longjmp to jmpbuf on
char
debug, /* debug causes various print statements in code */
tempfile[MAXPATHLEN], /* path to filename of temporary file */
@@ -689,7 +690,7 @@ $NetBSD: patch-ad,v 1.2 1998/09/15 06:18:07 garbled Exp $
**alternates, /* alternates list --see alts() */
*cmd_help, /* filename of location for "command -?" commands. */
*login, /* login name of user */
-@@ -658,6 +695,9 @@
+@@ -658,6 +695,9 @@ char
int
last_msg_cnt, /* when checking for new mail, save the last msg_cnt */
msg_cnt, /* total number of messages */
@@ -699,7 +700,7 @@ $NetBSD: patch-ad,v 1.2 1998/09/15 06:18:07 garbled Exp $
crt, /* min number of lines msg contains to invoke pager */
current_msg, /* the current message we're dealing with */
exec_pid, /* pid of a command that has been "exec"ed */
-@@ -666,7 +706,7 @@
+@@ -666,7 +706,7 @@ int
#if defined(SUNTOOL) || defined(lint)
istool, /* argv[0] == "xxxxtool", ranges from 0 to 2 */
#else /* !SUNTOOL */
@@ -708,7 +709,7 @@ $NetBSD: patch-ad,v 1.2 1998/09/15 06:18:07 garbled Exp $
#endif /* SUNTOOL */
n_array[128], /* array of message numbers in the header window */
screen, /* number of headers window can handle */
-@@ -725,7 +765,7 @@
+@@ -725,7 +765,7 @@ int
char * quoteit();
#ifndef SIGRET
@@ -717,7 +718,7 @@ $NetBSD: patch-ad,v 1.2 1998/09/15 06:18:07 garbled Exp $
#endif /* SIGRET */
SIGRET
rm_edfile(), /* remove letter-compose file on interrupts */
-@@ -737,8 +777,8 @@
+@@ -737,8 +777,8 @@ SIGRET
long
spool_size, /* size of spool mail regardless of current folder */
@@ -728,7 +729,7 @@ $NetBSD: patch-ad,v 1.2 1998/09/15 06:18:07 garbled Exp $
void
error(), getmail(), mail_status(), sign_letter(),
-@@ -754,9 +794,9 @@
+@@ -754,9 +794,9 @@ void
#ifdef TIOCGLTC
struct ltchars ltchars; /* tty character settings */
#endif /* TIOCGLTC */
@@ -740,7 +741,7 @@ $NetBSD: patch-ad,v 1.2 1998/09/15 06:18:07 garbled Exp $
#ifdef CURSES
-@@ -775,16 +815,16 @@
+@@ -775,16 +815,16 @@ void
mac_flush(); /* Abandon macro processing (on error) */
#if defined(SUNTOOL) || defined(POP3_SUPPORT)
@@ -764,3 +765,11 @@ $NetBSD: patch-ad,v 1.2 1998/09/15 06:18:07 garbled Exp $
int
time_out; /* time out interval to wait for new mail */
+@@ -838,3 +878,7 @@ typedef enum {
+ MUSH_SCROLL_PASS_EVENT
+ } Scroll_action;
+ #endif /* SUNTOOL */
++
++#ifdef __linux__
++#include <time.h>
++#endif