Update to 4.05 and re-enable on alpha. (The LP64 warnings are not good,

but the way they are used does work.)

6 files changed, 55 insertions, 69 deletions

diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index 4600f4f2a4d..91070a35bf3 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 1998/11/13 01:21:40 frueauf Exp $
+# $NetBSD: Makefile,v 1.27 1998/11/13 16:32:37 tv Exp $
 # FreeBSD Id: Makefile,v 1.21 1997/03/26 02:12:07 ache Exp
 #
 
-DISTNAME=       pine4.02
-PKGNAME=        pine-4.02
+DISTNAME=       pine4.05
+PKGNAME=        pine-4.05
 CATEGORIES=     mail news
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/
 
@@ -11,17 +11,16 @@ 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.2:../../editors/pico
+DEPENDS=	pico-3.4:../../editors/pico
 
-CONFLICTS=	pine-3.96 pine-4.00
-
-NOT_FOR_ARCHS=	alpha	#LP64 problems
+CONFLICTS=	pine-3.96 pine-4.00 pine-4.02
 
 do-configure:
 	${CP} -f ${WRKSRC}/pine/osdep/os-neb.h ${WRKSRC}/pine/osdep/os-neb.h.orig
 	${SED} -e 's@/usr/local/lib/@${PREFIX}/etc/@' \
 		<${WRKSRC}/pine/osdep/os-neb.h.orig >${WRKSRC}/pine/osdep/os-neb.h
-	cd ${WRKSRC}/pico && ${MAKE} -f makefile.neb os.h
+	@${RM} -rf ${WRKSRC}/pico
+	@${LN} -sf ${LOCALBASE}/include/pico ${WRKSRC}/pico
 
 do-build:
 	cd ${WRKSRC} && ./build neb PREFIX=${PREFIX}
diff --git a/mail/pine/files/md5 b/mail/pine/files/md5
index 9d6806c329a..aebd41a6cbe 100644
--- a/mail/pine/files/md5
+++ b/mail/pine/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.6 1998/08/07 13:25:03 agc Exp $
+$NetBSD: md5,v 1.7 1998/11/13 16:32:38 tv Exp $
 
-MD5 (pine4.02.tar.gz) = 688979b5649473169bdbf22ea1c82fe7
+MD5 (pine4.05.tar.gz) = 84dc37198853959188a551eb4ee8aa00
diff --git a/mail/pine/patches/patch-ac b/mail/pine/patches/patch-ac
index 3684be888d4..6b90ddca843 100644
--- a/mail/pine/patches/patch-ac
+++ b/mail/pine/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.6 1998/08/07 11:09:48 agc Exp $
+$NetBSD: patch-ac,v 1.7 1998/11/13 16:32:38 tv Exp $
 
---- pine/makefile.neb.orig	Fri May  8 19:28:46 1998
-+++ pine/makefile.neb	Sun Jul 19 00:22:00 1998
+--- pine/makefile.neb.orig	Thu Aug 27 12:50:02 1998
++++ pine/makefile.neb	Sun Sep 27 16:45:10 1998
 @@ -45,9 +45,12 @@
  RM=          rm -f
  LN=          ln -s
@@ -22,9 +22,9 @@ $NetBSD: patch-ac,v 1.6 1998/08/07 11:09:48 agc Exp $
  
  STDLIBS=     -ltermlib
 -LOCLIBS=     $(PICODIR)/libpico.a $(CCLIENTDIR)/c-client.a
--LIBS=        $(EXTRALIBS) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
+-LIBS=        $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
 +LOCLIBS=     -lpico $(CCLIENTDIR)/c-client.a
-+LIBS=        -L$(PREFIX)/lib -R$(PREFIX)/lib/ $(EXTRALIBS) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
++LIBS=        -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib/ $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
               `cat $(CCLIENTDIR)/LDFLAGS`
  
  STDCFLAGS=   -DNETBSD -DSYSTYPE=\"NEB\" -DMOUSE
diff --git a/mail/pine/patches/patch-ae b/mail/pine/patches/patch-ae
new file mode 100644
index 00000000000..d28b3a11c05
--- /dev/null
+++ b/mail/pine/patches/patch-ae
@@ -0,0 +1,41 @@
+$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-am b/mail/pine/patches/patch-am
deleted file mode 100644
index 662b206e33a..00000000000
--- a/mail/pine/patches/patch-am
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-am,v 1.4 1998/08/07 11:09:49 agc Exp $
-
-Revision history
-
-==========================================
-Patches for Pine 4.02 from Pavel Kankovsky
-==========================================
-
---- ./pine/mailpart.c.noparanoia	Mon Jul 20 21:18:49 1998
-+++ ./pine/mailpart.c	Thu Jul 30 15:41:08 1998
-@@ -1230,7 +1230,10 @@
-
-     /* warning: overload "err" use */
-     if(err = rfc2231_get_param(param, att_name, NULL, NULL)){
--	strcpy(filename, err);
-+	if (strlen(err) >= sizeof(filename))
-+	    strcpy(filename, "CAUTION! ORIGINAL FILENAME TOO LONG");
-+        else
-+	    strcpy(filename, err);
- 	fs_give((void **) &err);
-     }
-
diff --git a/mail/pine/patches/patch-an b/mail/pine/patches/patch-an
deleted file mode 100644
index eef6cb7d51f..00000000000
--- a/mail/pine/patches/patch-an
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-an,v 1.2 1998/08/07 11:09:50 agc Exp $
-
-Revision history
-
-==========================================
-Patches for Pine 4.02 from Pavel Kankovsky
-==========================================
-
---- pine/mailview.c.noparanoia	Fri Jul 17 09:10:35 1998
-+++ pine/mailview.c	Thu Jul 30 22:11:46 1998
-@@ -940,7 +940,7 @@
-     sstrcpy(&p, body_type_names(type));
-     if(full && subtype){
- 	*p++ = '/';
--	sstrcpy(&p, subtype);
-+	sstrcpy(&p, strsquish(tmp_20k_buf + 500, subtype, 20));
-     }
-
-     switch(type) {
-@@ -1558,6 +1558,10 @@
-     }
-
-     gf_filter_init();
-+    if(F_OFF(F_PASS_CONTROL_CHARS, ps_global)){
-+        gf_link_filter(gf_escape_filter, NULL);
-+        gf_link_filter(gf_control_filter, NULL);
-+    }
-     gf_link_filter(gf_wrap, gf_wrap_filter_opt(width, width, 0, 0));
-     gf_link_filter(gf_line_test, gf_line_test_opt(quote_editorial, NULL));
-     return(gf_pipe(gc, pc));
-
-