diff options
author | tv <tv> | 1999-05-02 03:16:58 +0000 |
---|---|---|
committer | tv <tv> | 1999-05-02 03:16:58 +0000 |
commit | 7c8556d3967350980bdbddd2a6c871b15def2faa (patch) | |
tree | 928dbf6ba0ce783977c3122873a2bf81097bcab9 /mail | |
parent | 733ffb924fe976d5448dbeab1d0f4dde4f870925 (diff) | |
download | pkgsrc-7c8556d3967350980bdbddd2a6c871b15def2faa.tar.gz |
Update Pico to 3.5 and Pine to 4.10.
Diffstat (limited to 'mail')
-rw-r--r-- | mail/pine/Makefile | 8 | ||||
-rw-r--r-- | mail/pine/files/md5 | 4 | ||||
-rw-r--r-- | mail/pine/patches/patch-aa | 16 | ||||
-rw-r--r-- | mail/pine/patches/patch-ad | 13 | ||||
-rw-r--r-- | mail/pine/patches/patch-ae | 41 | ||||
-rw-r--r-- | mail/pine/patches/patch-ag | 32 |
6 files changed, 6 insertions, 108 deletions
diff --git a/mail/pine/Makefile b/mail/pine/Makefile index 7b7400aeba4..a03a23cdec6 100644 --- a/mail/pine/Makefile +++ b/mail/pine/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.28 1999/02/20 22:48:34 hubertf Exp $ +# $NetBSD: Makefile,v 1.29 1999/05/02 03:16:59 tv Exp $ # FreeBSD Id: Makefile,v 1.21 1997/03/26 02:12:07 ache Exp # -DISTNAME= pine4.05 -PKGNAME= pine-4.05 +DISTNAME= pine4.10 +PKGNAME= pine-4.10 CATEGORIES= mail news MASTER_SITES= ftp://ftp.cac.washington.edu/pine/ @@ -11,7 +11,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.washington.edu/pine/ # This pkg doesn't build pico or libpico; the pico pkg does that part. -DEPENDS= pico-3.4:../../editors/pico +DEPENDS= pico-3.5:../../editors/pico do-configure: ${CP} -f ${WRKSRC}/pine/osdep/os-neb.h ${WRKSRC}/pine/osdep/os-neb.h.orig diff --git a/mail/pine/files/md5 b/mail/pine/files/md5 index aebd41a6cbe..fe9eacd7fb5 100644 --- a/mail/pine/files/md5 +++ b/mail/pine/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.7 1998/11/13 16:32:38 tv Exp $ +$NetBSD: md5,v 1.8 1999/05/02 03:16:59 tv Exp $ -MD5 (pine4.05.tar.gz) = 84dc37198853959188a551eb4ee8aa00 +MD5 (pine4.10.tar.gz) = f871e201b4070da1f060f35d3b8f2ccd diff --git a/mail/pine/patches/patch-aa b/mail/pine/patches/patch-aa deleted file mode 100644 index 2bda44dc9c4..00000000000 --- a/mail/pine/patches/patch-aa +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-aa,v 1.6 1998/08/07 11:09:47 agc Exp $ - ---- pine/osdep/err_desc.orig Sat Jul 18 22:22:47 1998 -+++ pine/osdep/err_desc Sat Jul 18 22:23:08 1998 -@@ -11,10 +11,7 @@ - { - static char buffer[50+1]; - -- if(errnumber >= 0 && errnumber < sys_nerr) -- sprintf(buffer, "%.*s", 50, sys_errlist[errnumber]); -- else -- sprintf(buffer, "Unknown error #%d", errnumber); -+ sprintf(buffer, "%.*s", 50, strerror(errnumber)); - - return ( (char *) buffer); - } diff --git a/mail/pine/patches/patch-ad b/mail/pine/patches/patch-ad deleted file mode 100644 index d90198fd7fd..00000000000 --- a/mail/pine/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.4 1998/08/07 11:09:48 agc Exp $ - ---- pine/osdep/os-neb.h.orig Sun Jul 19 01:11:15 1998 -+++ pine/osdep/os-neb.h Sun Jul 19 01:11:25 1998 -@@ -223,7 +223,7 @@ - - - /*--------- Program employed by users to change their password ---------*/ --#define PASSWD_PROG "/bin/passwd" -+#define PASSWD_PROG "/usr/bin/passwd" - - - /*-------------- A couple constants used to size arrays ----------------*/ diff --git a/mail/pine/patches/patch-ae b/mail/pine/patches/patch-ae deleted file mode 100644 index d28b3a11c05..00000000000 --- a/mail/pine/patches/patch-ae +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-ae,v 1.3 1998/11/13 16:32:38 tv Exp $ - ---- pine/filter.c.orig Sun Sep 27 16:49:33 1998 -+++ pine/filter.c Sun Sep 27 16:52:27 1998 -@@ -669,15 +669,15 @@ - register unsigned char *GF_IP_INIT(FO); \ - register unsigned char *GF_EIB_INIT(FO); - --#define GF_CH_RESET(F) ((int)(op = eob = GF_QUE_START(F), \ -+#define GF_CH_RESET(F) ((long)(op = eob = GF_QUE_START(F), \ - (F)->queueout = (F)->queuein = 0)) - - #define GF_END(FI, FO) (GF_OP_END(FI), GF_IP_END(FO)) - --#define GF_FLUSH(F) ((int)(GF_IP_END(F), (*(F)->f)((F), GF_DATA), \ -+#define GF_FLUSH(F) ((long)(GF_IP_END(F), (*(F)->f)((F), GF_DATA), \ - GF_IP_INIT(F), GF_EIB_INIT(F))) - --#define GF_PUTC(F, C) ((int)(*ip++ = (C), (ip >= eib) ? GF_FLUSH(F) : 1)) -+#define GF_PUTC(F, C) ((long)(*ip++ = (C), (ip >= eib) ? GF_FLUSH(F) : 1)) - - #define GF_GETC(F, C) ((op < eob) ? ((int)((C) = *op++), 1) : GF_CH_RESET(F)) - -@@ -1937,7 +1937,7 @@ - GF_PUTC(f->next, '\r'); - GF_PUTC(f->next, '\n'); - } -- else if(! (int) f->opt /* gf_rich_plain */){ -+ else if(!f->opt /* gf_rich_plain */){ - if(!strcmp(f->line, "bold")) { - GF_PUTC(f->next, TAG_EMBED); - GF_PUTC(f->next, TAG_BOLDON); -@@ -2088,7 +2088,7 @@ - else - f->f2 |= TEF_NOFILL; - } -- else if(! (int) f->opt /* gf_enriched_plain */){ -+ else if(!f->opt /* gf_enriched_plain */){ - /* Following is a cute hack or two to get - bold and underline on the screen. - See Putline0n() where these codes are diff --git a/mail/pine/patches/patch-ag b/mail/pine/patches/patch-ag deleted file mode 100644 index 39aa27fdfe3..00000000000 --- a/mail/pine/patches/patch-ag +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-ag,v 1.3 1998/11/16 16:22:05 tv Exp $ - ---- pine/mailpart.c.orig Mon Nov 16 10:43:42 1998 -+++ pine/mailpart.c Mon Nov 16 10:55:26 1998 -@@ -1314,7 +1314,6 @@ - - int r, is_text, over = 0, we_cancel = 0; - long len, orig_size; -- PARAMETER *param; - gf_io_t pc; - STORE_S *store; - static ESCKEY_S att_save_opts[] = { -@@ -1328,16 +1327,11 @@ - /*------- Figure out suggested file name ----*/ - filename[0] = full_filename[0] = '\0'; - att_name = "filename"; -- if(a->body->disposition.type){ -- param = a->body->disposition.parameter; -- } -- else{ -- param = a->body->parameter; -- att_name += 4; -- } - - /* warning: overload "err" use */ -- if(err = rfc2231_get_param(param, att_name, NULL, NULL)){ -+ if((a->body->disposition.type && -+ (err = rfc2231_get_param(a->body->disposition.parameter, att_name, NULL, NULL))) || -+ (err = rfc2231_get_param(a->body->parameter, att_name + 4, NULL, NULL))){ - strncpy(filename, err, MAXPATH); - filename[MAXPATH] = '\0'; - fs_give((void **) &err); |