Update pine to 4.00. Get libpico by using the libpico installed by the

pico-3.0 pkg.

19 files changed, 118 insertions, 513 deletions

diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index 37fb25f611c..bc350309e82 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,43 +1,38 @@
-# $NetBSD: Makefile,v 1.13 1998/06/18 15:25:25 agc Exp $
+# $NetBSD: Makefile,v 1.14 1998/07/19 03:39:17 tv Exp $
 # FreeBSD Id: Makefile,v 1.21 1997/03/26 02:12:07 ache Exp
 #
-# Note: If you want to have pine's default behaviour of not allowing
-# modifications of the From: line, remove the file patch/patch-send
-# before you compile. (Keep in mind there are lots and lots of other
-# very easy ways of forging that From: line, though.)
-#
 
-DISTNAME=       pine3.96
-PKGNAME=        pine-3.96
+DISTNAME=       pine4.00
+PKGNAME=        pine-4.00
 CATEGORIES=     mail news
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/
 
 MAINTAINER=	packages@netbsd.org
 
-CONFLICTS=	pico-2.9
+# This pkg doesn't build pico or libpico; the pico pkg does that part.
+DEPENDS=	pico-3.0:../../editors/pico
+
+CONFLICTS=	pine-3.96
 
 post-patch:
 	${CP} -f ${WRKSRC}/pine/osdep/os-neb.h ${WRKSRC}/pine/osdep/os-neb.h.orig
-	${SED} \
-	  -e 's|.*\(#define.*SYSTEM_PINERC_FIXED\) .*|\1 "'"${PREFIX}/lib/pine.conf.fixed"'"|g' \
-	  -e 's|.*\(#define.*SYSTEM_PINERC\) .*|\1 "'"${PREFIX}/lib/pine.conf"'"|g' \
-	  <${WRKSRC}/pine/osdep/os-neb.h.orig >${WRKSRC}/pine/osdep/os-neb.h
+	${SED} -e 's@/usr/local@${PREFIX}@' \
+		<${WRKSRC}/pine/osdep/os-neb.h.orig >${WRKSRC}/pine/osdep/os-neb.h
+
+do-configure:
+	cd ${WRKSRC}/pico && ${MAKE} -f makefile.neb os.h
 
 do-build:
-	cd ${WRKSRC} && ./build neb
+	cd ${WRKSRC} && ./build neb PREFIX=${PREFIX}
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/pico/libpico.a ${PREFIX}/lib/libpico.a
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/pico ${PREFIX}/bin/pico
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/pilot ${PREFIX}/bin/pilot
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/pine ${PREFIX}/bin/pine
-	${INSTALL_SCRIPT} ${FILESDIR}/pgpencrypt ${PREFIX}/bin/pgpencrypt
-	${INSTALL_SCRIPT} ${FILESDIR}/pgpdecode ${PREFIX}/bin/pgpdecode
-	${INSTALL_SCRIPT} ${FILESDIR}/pgpsign ${PREFIX}/bin/pgpsign
-	${INSTALL_DATA}    ${FILESDIR}/dot.pinerc.pgp.sample ${PREFIX}/etc/dot.pinerc.pgp.sample
-	${INSTALL_MAN}     ${WRKSRC}/doc/pico.1 ${PREFIX}/man/man1/pico.1
-	${INSTALL_MAN}     ${WRKSRC}/doc/pilot.1 ${PREFIX}/man/man1/pilot.1
-	${INSTALL_MAN}     ${WRKSRC}/doc/pine.1 ${PREFIX}/man/man1/pine.1
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/pine ${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${FILESDIR}/pgpencrypt ${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${FILESDIR}/pgpdecode ${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${FILESDIR}/pgpsign ${PREFIX}/bin/
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pine
+	${INSTALL_DATA} ${FILESDIR}/dot.pinerc.pgp.sample ${PREFIX}/share/examples/pine/
+	${INSTALL_MAN} ${WRKSRC}/doc/pine.1 ${PREFIX}/man/man1/pine.1
 	( ${ECHO} '# (This file is not part of the pine distribution! - HF)' ; \
 	  ${PREFIX}/bin/pine -conf ) | ${SED} \
 	    -e 's|^\(use-only-domain-name\)=.*$$|\1=No|g' \
@@ -45,11 +40,8 @@ do-install:
 	    -e 's|^\(feature-list\)=.*$$|\1=enable-mail-check-cue,enable-suspend,expanded-view-of-addressbooks,include-header-in-reply,include-text-in-reply,show-selected-in-boldface,signature-at-bottom|g' \
 	    -e 's|^\(sort-key\)=.*$$|\1=Arrival/Reverse|g' \
 	    >${PREFIX}/lib/pine.conf
-	${INSTALL_DATA}	${FILESDIR}/pine.conf.fixed ${PREFIX}/lib/pine.conf.fixed
-
-post-install:
+	${INSTALL_DATA}	${FILESDIR}/pine.conf.fixed ${PREFIX}/lib/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pine
-	cd ${WRKSRC} && \
-		${INSTALL_DATA} doc/tech-notes.txt ${PREFIX}/share/doc/pine
+	${INSTALL_DATA} ${WRKSRC}/doc/tech-notes.txt ${PREFIX}/share/doc/pine/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/pine/files/md5 b/mail/pine/files/md5
index 383150f4563..4539b8cda85 100644
--- a/mail/pine/files/md5
+++ b/mail/pine/files/md5
@@ -1 +1 @@
-MD5 (pine3.96.tar.gz) = bf32b0bf1296ff2151e1bc7f546d43ab
+MD5 (pine4.00.tar.gz) = 4aa00d67b4060299e9edff744cab6f23
diff --git a/mail/pine/files/pine.conf.fixed b/mail/pine/files/pine.conf.fixed
index 7aa1568dd80..31d8670edaf 100644
--- a/mail/pine/files/pine.conf.fixed
+++ b/mail/pine/files/pine.conf.fixed
@@ -5,3 +5,8 @@
 ###########################################################################
 # (This file is not part of the pine distribution!)
 ###########################################################################
+
+# The following option does the equivalent of Pine's 3.9x behavior of
+# not allowing the From: field to change for any user regardless of whether
+# the allow-changing-from option is set in .pinerc.
+#feature-list=no-allow-changing-from
diff --git a/mail/pine/patches/patch-aa b/mail/pine/patches/patch-aa
index 7f39284254c..20925c76bf7 100644
--- a/mail/pine/patches/patch-aa
+++ b/mail/pine/patches/patch-aa
@@ -1,61 +1,14 @@
---- pico/makefile.neb.orig	Fri Apr  5 10:07:56 1996
-+++ pico/makefile.neb	Thu Dec  4 14:17:13 1997
-@@ -28,12 +28,12 @@
- #
- 
- #includes symbol info for debugging 
--DASHO=		-g
-+DASHO=		# -g
- #for normal build
- #DASHO=		-O
- 
- STDCFLAGS=	-Dneb -DJOB_CONTROL -DANSI -DPOSIX -DMOUSE
--CFLAGS=		$(EXTRACFLAGS) $(DASHO) $(STDCFLAGS)
-+CFLAGS+=		$(EXTRACFLAGS) $(DASHO) $(STDCFLAGS)
- 
- # switches for library building
- LIBCMD=		ar
-@@ -46,12 +46,17 @@
- 		composer.o display.o file.o fileio.o line.o osdep.o \
- 		pico.o random.o region.o search.o spell.o tcap.o window.o word.o
- 
-+# Lets be elite and not retype in the above
-+SOFILES=	${OFILES:.o=.so}
-+
- CFILES=		attach.c ansi.c basic.c bind.c browse.c buffer.c \
- 		composer.c display.c file.c fileio.c line.c osdep.c \
- 		pico.c random.c region.c search.c spell.c tcap.c window.c word.c
- 
- HFILES=		estruct.h edef.h efunc.h ebind.h pico.h osdep.h
- 
-+# Need this for the shared library rule to work correctly
-+.SUFFIXES: .o .so
- 
- #
- # dependencies for the Unix versions of pico and libpico.a
-@@ -70,15 +75,22 @@
- 		$(LIBCMD) $(LIBARGS) libpico.a $(OFILES)
- 		$(RANLIB) libpico.a
- 
-+libpico.so.1.3:	osdep.c osdep.h $(SOFILES)
-+		ld -Bshareable -x -o libpico.so.1.3 $(SOFILES)
-+ 
- pico:		main.c libpico.a
--		$(CC) $(CFLAGS) main.c libpico.a $(LIBS) -o pico
-+		$(CC) $(CFLAGS) main.c -L. -lpico $(LIBS) -o pico
- 
- pilot:		pilot.c libpico.a
--		$(CC) $(CFLAGS) pilot.c libpico.a $(LIBS) -o pilot
-+		$(CC) $(CFLAGS) pilot.c -L. -lpico $(LIBS) -o pilot
-+ 
-+.c.so:		; $(CC) -fPIC -DPIC -c $(CFLAGS) ${@:.so=.c} -o $@
- 
- .c.o:		; $(CC) -c $(CFLAGS) $*.c
- 
- $(OFILES):	$(HFILES)
- 
-+$(SOFILES):	$(HFILES)
-+ 
- clean:
--		rm -f *.a *.o *~ osdep.c osdep.h pico pilot
-+		rm -f *.a *.so.1.3 *.o *.so *~ osdep.c osdep.h pico pilot
+--- 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-ab b/mail/pine/patches/patch-ab
deleted file mode 100644
index ea73b2fddef..00000000000
--- a/mail/pine/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-*** pico/os_unix.c.orig	Wed Jun 12 15:47:21 1996
---- pico/os_unix.c	Fri Jun 14 00:15:30 1996
-***************
-*** 1343,1347 ****
-      extern int  sys_nerr;
-  
-!     return((err >= 0 && err < sys_nerr) ? sys_errlist[err] : NULL);
-  }
-  
---- 1343,1347 ----
-      extern int  sys_nerr;
-  
-!     return(((err >= 0) && (err < sys_nerr)) ? (char*)sys_errlist[err] : NULL);
-  }
-  
diff --git a/mail/pine/patches/patch-ac b/mail/pine/patches/patch-ac
index 8429f6dab47..433c94ad821 100644
--- a/mail/pine/patches/patch-ac
+++ b/mail/pine/patches/patch-ac
@@ -1,47 +1,28 @@
---- pine/makefile.neb.orig	Fri Nov 21 18:05:46 1997
-+++ pine/makefile.neb	Fri Nov 21 18:09:21 1997
-@@ -46,19 +46,21 @@
+--- pine/makefile.neb.orig	Fri May  8 19:28:46 1998
++++ pine/makefile.neb	Sat Jul 18 23:02:32 1998
+@@ -45,9 +45,12 @@
  RM=          rm -f
  LN=          ln -s
  MAKE=        make
--OPTIMIZE=    -O
-+#OPTIMIZE=    -O
+-OPTIMIZE=    # -O
++.if (${MACHINE_ARCH} != "arm32")
++# XXX broken arm32 compiler can't optimize several of these source files
++OPTIMIZE=    -O
++.endif
  PROFILE=     # -pg
 -DEBUG=       -g -DDEBUG
-+DEBUG=       # -DDEBUG -g
++DEBUG=       # -g -DDEBUG
  
- IMAPDIR=     ../c-client
+ CCLIENTDIR=  ../c-client
  PICODIR=     ../pico
+@@ -61,8 +64,8 @@
+ 	      other.o pine.o takeaddr.o
  
- STDLIBES=    -ltermlib -lcrypt
--LOCLIBES=    $(PICODIR)/libpico.a $(IMAPDIR)/c-client.a
--LIBES=       $(EXTRALIBES) $(LOCLIBES) $(STDLIBES)
-+#LOCLIBES=   $(PICODIR)/libpico.a $(IMAPDIR)/c-client.a
-+LOCLIBES=    -lpico $(IMAPDIR)/c-client.a
-+LOCLIBDIR=   -L$(PICODIR)
-+LIBES=       $(EXTRALIBES) $(LOCLIBDIR) $(LOCLIBES) $(STDLIBES)
+ STDLIBS=     -ltermlib
+-LOCLIBS=     $(PICODIR)/libpico.a $(CCLIENTDIR)/c-client.a
+-LIBS=        $(EXTRALIBS) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
++LOCLIBS=     -lpico $(CCLIENTDIR)/c-client.a
++LIBS=        -L$(PREFIX)/lib -R$(PREFIX)/lib/ $(EXTRALIBS) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
+              `cat $(CCLIENTDIR)/LDFLAGS`
  
  STDCFLAGS=   -DNETBSD -DSYSTYPE=\"NEB\" -DMOUSE
--CFLAGS=      $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(STDCFLAGS)
-+CFLAGS+=      $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(STDCFLAGS)
- 
- obj=    addrbook.o adrbklib.o args.o context.o filter.o \
- 	folder.o help.o helptext.o imap.o init.o mailcap.o mailcmd.o \
-@@ -73,7 +75,7 @@
- 	ttyout.c os.c
- 
- pine:  $(obj) $(LOCLIBES)
--	echo "char datestamp[]="\"`date`\"";" > date.c
-+	echo "char datestamp[]="\"`LC_TIME=C date`\"";" > date.c
- 	echo "char hoststamp[]="\"`hostname`\"";" >> date.c
- 	$(CC) $(LDFLAGS) $(CFLAGS) -o pine $(obj) date.c $(LIBES)
- 
-@@ -133,7 +135,7 @@
- 
- osdep/os-neb.c:	osdep/bld_path osdep/canacces osdep/canonicl \
- 		osdep/chnge_pw osdep/coredump osdep/creatdir \
--		osdep/diskquot.non osdep/domnames osdep/err_desc \
-+		osdep/diskquot.non osdep/domnames osdep/err_desc.dos \
- 		osdep/expnfldr osdep/fgetpos osdep/filesize osdep/fltrname \
- 		osdep/fnexpand osdep/header osdep/hostname \
- 		osdep/jobcntrl osdep/lstcmpnt osdep/mimedisp osdep/pipe \
diff --git a/mail/pine/patches/patch-af b/mail/pine/patches/patch-af
deleted file mode 100644
index 7b3b26b8488..00000000000
--- a/mail/pine/patches/patch-af
+++ /dev/null
@@ -1,21 +0,0 @@
-*** imap/ANSI/c-client/Makefile.orig	Sat Jun 22 01:25:45 1996
---- imap/ANSI/c-client/Makefile	Sun Jan 12 19:41:38 1997
-***************
-*** 36,43 ****
-  BINARIES=mail.o bezerk.o mtx.o tenex2.o mbox.o mh.o mmdf.o imap2.o pop3.o \
-  	news.o nntpcunx.o phile.o dummy.o smtp.o nntp.o rfc822.o misc.o \
-  	osdep.o sm_unix.o newsrc.o
-! CC=cc
-! CFLAGS=$(EXTRACFLAGS)
-  DEFAULTDRIVERS=imap nntp pop3 mh tenex mtx mmdf bezerk news phile dummy
-  LN=ln -s
-  MAKE=make
---- 36,43 ----
-  BINARIES=mail.o bezerk.o mtx.o tenex2.o mbox.o mh.o mmdf.o imap2.o pop3.o \
-  	news.o nntpcunx.o phile.o dummy.o smtp.o nntp.o rfc822.o misc.o \
-  	osdep.o sm_unix.o newsrc.o
-! #CC=cc
-! #CFLAGS=$(EXTRACFLAGS)
-  DEFAULTDRIVERS=imap nntp pop3 mh tenex mtx mmdf bezerk news phile dummy
-  LN=ln -s
-  MAKE=make
diff --git a/mail/pine/patches/patch-ag b/mail/pine/patches/patch-ag
deleted file mode 100644
index a9742708f79..00000000000
--- a/mail/pine/patches/patch-ag
+++ /dev/null
@@ -1,28 +0,0 @@
-*** imap/ANSI/c-client/mh.c.orig	Wed May 15 13:49:54 1996
---- imap/ANSI/c-client/mh.c	Fri Jun 14 00:12:23 1996
-***************
-*** 808,812 ****
-    if (sbuf.st_ctime != LOCAL->scantime) {
-      struct direct **names = NIL;
-!     long nfiles = scandir (LOCAL->dir,&names,mh_select,mh_numsort);
-      old = nmsgs ? mail_elt (stream,nmsgs)->data1 : 0;
-  				/* note scanned now */
---- 808,812 ----
-    if (sbuf.st_ctime != LOCAL->scantime) {
-      struct direct **names = NIL;
-!     long nfiles = scandir (LOCAL->dir,&names,mh_select,(void*)mh_numsort);
-      old = nmsgs ? mail_elt (stream,nmsgs)->data1 : 0;
-  				/* note scanned now */
-***************
-*** 1050,1054 ****
-    }
-    mh_file (tmp,mailbox);	/* build file name we will use */
-!   if (nfiles = scandir (tmp,&names,mh_select,mh_numsort)) {
-  				/* largest number */
-      last = atoi (names[nfiles-1]->d_name);    
---- 1050,1054 ----
-    }
-    mh_file (tmp,mailbox);	/* build file name we will use */
-!   if (nfiles = scandir (tmp,&names,mh_select,(void*)mh_numsort)) {
-  				/* largest number */
-      last = atoi (names[nfiles-1]->d_name);    
diff --git a/mail/pine/patches/patch-ah b/mail/pine/patches/patch-ah
deleted file mode 100644
index d91c27e8313..00000000000
--- a/mail/pine/patches/patch-ah
+++ /dev/null
@@ -1,15 +0,0 @@
-*** imap/ANSI/c-client/news.c.orig	Wed May 15 13:50:02 1996
---- imap/ANSI/c-client/news.c	Fri Jun 14 00:12:49 1996
-***************
-*** 310,314 ****
-    while (s = strchr (s,'.')) *s = '/';
-  				/* scan directory */
-!   if ((nmsgs = scandir (tmp,&names,news_select,news_numsort)) >= 0) {
-      stream->local = fs_get (sizeof (NEWSLOCAL));
-      LOCAL->dirty = NIL;		/* no update to .newsrc needed yet */
---- 310,314 ----
-    while (s = strchr (s,'.')) *s = '/';
-  				/* scan directory */
-!   if ((nmsgs = scandir (tmp,&names,news_select,(void*)news_numsort)) >= 0) {
-      stream->local = fs_get (sizeof (NEWSLOCAL));
-      LOCAL->dirty = NIL;		/* no update to .newsrc needed yet */
diff --git a/mail/pine/patches/patch-ai b/mail/pine/patches/patch-ai
deleted file mode 100644
index bd1b5bf4346..00000000000
--- a/mail/pine/patches/patch-ai
+++ /dev/null
@@ -1,69 +0,0 @@
-*** pine/send.c.orig	Tue Feb 25 00:57:38 1997
---- pine/send.c	Sun Jul 20 02:50:31 1997
-***************
-*** 5352,5364 ****
-  		body->subtype = cpystr("octet-stream");
-  	    }
-  
-  	    /*
-  	     * Apply maximal encoding regardless of previous
-  	     * setting.  This segment's either not text, or is 
-  	     * unlikely to be readable with > 30% of the
-  	     * text encoded anyway, so we might as well save space...
-  	     */
-! 	    new_encoding = ENCBINARY;   /*  > 30% 8 bit chars */
-  	}
-      }
-  
---- 5352,5367 ----
-  		body->subtype = cpystr("octet-stream");
-  	    }
-  
-+ 	    if(body->type == TYPETEXT)
-+ 	      new_encoding = ENC8BIT;
-+ 	    else
-  	    /*
-  	     * Apply maximal encoding regardless of previous
-  	     * setting.  This segment's either not text, or is 
-  	     * unlikely to be readable with > 30% of the
-  	     * text encoded anyway, so we might as well save space...
-  	     */
-! 	      new_encoding = ENCBINARY;   /*  > 30% 8 bit chars */
-  	}
-      }
-  
-***************
-*** 6113,6119 ****
-  
-  	switch (body->encoding) {	/* all else needs filtering */
-  	  case ENC8BIT:			/* encode 8BIT into QUOTED-PRINTABLE */
-! 	    gf_link_filter(gf_8bit_qp);
-  	    break;
-  
-  	  case ENCBINARY:		/* encode binary into BASE64 */
---- 6116,6123 ----
-  
-  	switch (body->encoding) {	/* all else needs filtering */
-  	  case ENC8BIT:			/* encode 8BIT into QUOTED-PRINTABLE */
-! 	    if(F_OFF(F_ENABLE_8BIT, ps_global))
-! 		gf_link_filter(gf_8bit_qp);
-  	    break;
-  
-  	  case ENCBINARY:		/* encode binary into BASE64 */
-***************
-*** 6172,6178 ****
-        sprintf (*dst += strlen (*dst), "Content-Transfer-Encoding: %s\015\012",
-  	       body_encodings[(body->encoding == ENCBINARY)
-  				? ENCBASE64
-! 				: (body->encoding == ENC8BIT)
-  				    ? ENCQUOTEDPRINTABLE
-  				    : (body->encoding <= ENCMAX)
-  					? body->encoding : ENCOTHER]);
---- 6176,6182 ----
-        sprintf (*dst += strlen (*dst), "Content-Transfer-Encoding: %s\015\012",
-  	       body_encodings[(body->encoding == ENCBINARY)
-  				? ENCBASE64
-! 				: (body->encoding == ENC8BIT && F_OFF(F_ENABLE_8BIT, ps_global))
-  				    ? ENCQUOTEDPRINTABLE
-  				    : (body->encoding <= ENCMAX)
-  					? body->encoding : ENCOTHER]);
diff --git a/mail/pine/patches/patch-aj b/mail/pine/patches/patch-aj
deleted file mode 100644
index fd37913c5ec..00000000000
--- a/mail/pine/patches/patch-aj
+++ /dev/null
@@ -1,17 +0,0 @@
-*** imap/ANSI/c-client/os_bsi.h.bak	Wed Feb  7 12:01:07 1996
---- imap/ANSI/c-client/os_bsi.h	Sun Jul 20 01:47:23 1997
-***************
-*** 36,42 ****
---- 36,47 ----
-  #include <stdlib.h>
-  #include <string.h>
-  #include <sys/types.h>
-+ #if (defined(BSD) && BSD >= 199306)
-+ #include <dirent.h>
-+ #define direct dirent
-+ #else
-  #include <sys/dir.h>
-+ #endif
-  #include <sys/uio.h>		/* needed for writev() prototypes */
-  #include <fcntl.h>
-  #include <syslog.h>
diff --git a/mail/pine/patches/patch-ak b/mail/pine/patches/patch-ak
index 557d5235fac..4a6f47772b5 100644
--- a/mail/pine/patches/patch-ak
+++ b/mail/pine/patches/patch-ak
@@ -1,21 +1,11 @@
-*** imap/Makefile.orig	Thu May 30 07:33:10 1996
---- imap/Makefile	Sun Jan 12 17:05:17 1997
-***************
-*** 92,99 ****
-  	$(LN) $(SYSTYPE) systype
-  	cd $(SYSTYPE)/c-client; $(MAKE) $(OS)
-  	cd $(SYSTYPE)/ms;$(MAKE)
-! 	cd $(SYSTYPE)/ipopd;$(MAKE)
-! 	cd $(SYSTYPE)/imapd;$(MAKE)
-  
-  clean:
-  	$(RM) systype
---- 95,102 ----
-  	$(LN) $(SYSTYPE) systype
-  	cd $(SYSTYPE)/c-client; $(MAKE) $(OS)
-  	cd $(SYSTYPE)/ms;$(MAKE)
-! #       cd $(SYSTYPE)/ipopd;$(MAKE)
-! #       cd $(SYSTYPE)/imapd;$(MAKE)
-  
-  clean:
-  	$(RM) systype
+--- imap/Makefile.orig	Sat Jul 18 22:13:09 1998
++++ imap/Makefile	Sat Jul 18 22:13:27 1998
+@@ -274,8 +274,6 @@
+ bundled:
+ 	@echo Building bundled tools...
+ 	$(CD) mtest;$(MAKE)
+-	$(CD) ipopd;$(MAKE)
+-	$(CD) imapd;$(MAKE)
+ 
+ clean:
+ 	@echo Removing old processed sources and binaries...
diff --git a/mail/pine/patches/patch-al b/mail/pine/patches/patch-al
index 2997d01e3e2..6714b40d6f7 100644
--- a/mail/pine/patches/patch-al
+++ b/mail/pine/patches/patch-al
@@ -1,55 +1,37 @@
-*** build.orig	Tue May 14 23:22:47 1996
---- build	Sun Jan 12 20:18:50 1997
-***************
-*** 167,180 ****
-          cd $PHOME/bin
-          rm -f pine mtest imapd pico pilot
-          if [ -s ../pine/pine ] ;      then ln ../pine/pine  pine      ; fi
--         if [ -s ../c-client/mtest ] ; then ln ../c-client/mtest mtest ; fi
--         if [ -s ../imapd/imapd ] ;    then ln ../imapd/imapd imapd    ; fi
-          if [ -s ../pico/pico ] ;      then ln ../pico/pico pico ; fi
-          if [ -s ../pico/pilot ] ;     then ln ../pico/pilot pilot ; fi
-          cd $PHOME
-          echo ''
-          echo "Links to executables are in bin directory:"
--         size bin/pine bin/mtest bin/imapd bin/pico bin/pilot
-          echo "Done"
-          ;;
-  
---- 167,179 ----
-          cd $PHOME/bin
-          rm -f pine mtest imapd pico pilot
-          if [ -s ../pine/pine ] ;      then ln ../pine/pine  pine      ; fi
-          if [ -s ../pico/pico ] ;      then ln ../pico/pico pico ; fi
-          if [ -s ../pico/pilot ] ;     then ln ../pico/pilot pilot ; fi
-+         if [ -s ../pico/libpico.so.1.3 ] ;     
-+ 		then ln ../pico/libpico.so.1.3 libpico.so.1.3 ; fi
-          cd $PHOME
-          echo ''
-          echo "Links to executables are in bin directory:"
-          echo "Done"
-          ;;
-  
-***************
-*** 185,194 ****
-  	make clean
-          echo "Cleaning Pine"
-          cd $PHOME/pine
-!         make -f makefile.ult clean
-          echo "Cleaning pico"
-          cd $PHOME/pico
-!         make $makeargs -f makefile.ult clean
-          echo "Done"
-          cd $PHOME
-          ;;
---- 184,193 ----
-  	make clean
-          echo "Cleaning Pine"
-          cd $PHOME/pine
-!         make -f makefile.neb clean
-          echo "Cleaning pico"
-          cd $PHOME/pico
-!         make $makeargs -f makefile.neb clean
-          echo "Done"
-          cd $PHOME
-          ;;
+--- build.orig	Sat Jul 18 22:14:00 1998
++++ build	Sat Jul 18 22:14:35 1998
+@@ -258,20 +258,12 @@
+         ln -s imap/c-client c-client
+         if [ -s mtest    ] ; then rm -f mtest    ; fi
+         ln -s imap/mtest mtest
+-        if [ -s imapd    ] ; then rm -f imapd    ; fi
+-        ln -s imap/imapd imapd
+         echo "Making c-client library, mtest and imapd"
+         eval echo make "$makeargs" "$K1" "$K2" $ccltarg
+         cd $PHOME/imap
+         eval make "$makeargs" "$K1" "$K2" $ccltarg
+         echo ''
+ 
+-        echo "Making Pico and Pilot"
+-        cd $PHOME/pico
+-        eval echo make "$makeargs" -f makefile.$picotarg
+-        eval make "$makeargs" -f makefile.$picotarg
+-        echo ''
+-
+         echo "Making Pine".
+         cd $PHOME/pine
+         eval echo make "$makeargs" "$L1" "$L2" -f makefile.$pinetarg
+@@ -282,13 +274,8 @@
+         rm -f pine mtest imapd pico pilot
+         if [ -s ../pine/pine ] ;      then ln ../pine/pine  pine      ; fi
+         if [ -s ../mtest/mtest ] ;    then ln ../mtest/mtest mtest ; fi
+-        if [ -s ../imapd/imapd ] ;    then ln ../imapd/imapd imapd    ; fi
+-        if [ -s ../pico/pico ] ;      then ln ../pico/pico pico ; fi
+-        if [ -s ../pico/pilot ] ;     then ln ../pico/pilot pilot ; fi
+         cd $PHOME
+         echo ''
+-        echo "Links to executables are in bin directory:"
+-        size bin/pine bin/mtest bin/imapd bin/pico bin/pilot
+         echo "Done"
+         ;;
+ 
diff --git a/mail/pine/patches/patch-am b/mail/pine/patches/patch-am
deleted file mode 100644
index 77328d9843a..00000000000
--- a/mail/pine/patches/patch-am
+++ /dev/null
@@ -1,19 +0,0 @@
-*** pine/pine.h.bak	Thu Jul 11 22:15:44 1996
---- pine/pine.h	Tue Dec  3 20:52:56 1996
-***************
-*** 2085,2091 ****
-  } ATABLE_S;
-  
-  
-! #define TAG_EMBED	'\377'	/* Announces embedded data in text string */
-  #define	TAG_INVON	'\001'	/* Supported character attributes	  */
-  #define	TAG_INVOFF	'\002'
-  #define	TAG_BOLDON	'\003'
---- 2085,2091 ----
-  } ATABLE_S;
-  
-  
-! #define TAG_EMBED       '\001'  /* Announces embedded data in text string */
-  #define	TAG_INVON	'\001'	/* Supported character attributes	  */
-  #define	TAG_INVOFF	'\002'
-  #define	TAG_BOLDON	'\003'
diff --git a/mail/pine/patches/patch-pine-bugtraq b/mail/pine/patches/patch-pine-bugtraq
deleted file mode 100644
index 59c8098e618..00000000000
--- a/mail/pine/patches/patch-pine-bugtraq
+++ /dev/null
@@ -1,33 +0,0 @@
-Date: Sat, 25 Apr 1998 14:24:43 +0200
-From: Michal Zalewski <lcamtuf@BOSS.STASZIC.WAW.PL>
-To: BUGTRAQ@NETSPACE.ORG
-Subject: pine/pico vt control characters bug
-
-Pico, an editor included with pine 3.96 package, handles vt control
-characters (eg. 0x9B) improperly, so it's possible to do almost anything
-when normal text file is viewed with pico. Example? Try viewing file
-containing only two characters: 0x9B and 0x63... That's not all, pico is
-called by pine when you're replying to mail message. Anyone may insert any
-control chars (using quoted-printable encoding) to his signature.
-
-Fix (edited for NetBSD's pkg system):
-
---- pico/display.c.orig	Sun Apr 26 00:16:06 1998
-+++ pico/display.c	Sun Apr 26 00:17:12 1998
-@@ -266,7 +266,7 @@
- 	}
-         while ((vtcol&0x07) != 0);
-     }
--    else if (c.c < 0x20 || c.c == 0x7F) {
-+    else if (c.c < 0x20 || c.c == 0x7F || c.c == 0x9B) {
- 	ac.c = '^';
-         vtputc(ac);
- 	ac.c = (c.c ^ 0x40);
-
-(should help, at least in above situation)
-
-_______________________________________________________________________
-Michal Zalewski [lcamtuf@boss.staszic.waw.pl] <= finger for pub PGP key
-Iterowac jest rzecza ludzka, wykonywac rekursywnie - boska [P. Deutsch]
-[echo "\$0&\$0">_;chmod +x _;./_] <=------=> [tel +48 (0) 22 813 25 86]
-
diff --git a/mail/pine/patches/patch-send b/mail/pine/patches/patch-send
deleted file mode 100644
index 11909f35dfc..00000000000
--- a/mail/pine/patches/patch-send
+++ /dev/null
@@ -1,4 +0,0 @@
---- pine/send.c	Wed Mar 18 17:57:09 1998
-+++ pine/send.c	Wed Mar 18 17:59:00 1998
-@@ -0,0 +1 @@
-+#define ALLOW_CHANGING_FROM
diff --git a/mail/pine/patches/patch-tabkey b/mail/pine/patches/patch-tabkey
deleted file mode 100644
index be33e1a5b3c..00000000000
--- a/mail/pine/patches/patch-tabkey
+++ /dev/null
@@ -1,73 +0,0 @@
-*** pine/mailcmd.c.orig	Wed Sep 10 14:14:13 1997
---- pine/mailcmd.c	Wed Sep 10 14:16:22 1997
-***************
-*** 534,546 ****
-  	      char ret = 'n';
-  	      int  in_inbox = !strucmp(state->cur_folder,state->inbox_name);
-  
-! 	      if(!state->nr_mode && state->context_current
-! 		 && (((state->context_current->use & CNTXT_NEWS)
-! 		      && context_isambig(state->cur_folder))
-! 		     || ((state->context_current->use & CNTXT_INCMNG)
-! 			 && (in_inbox
-! 			     || folder_index(state->cur_folder,
-! 				     state->context_current->folders) >=0)))){
-  		  char		 nextfolder[MAXPATH];
-  		  MAILSTREAM	*nextstream = NULL;
-  
---- 534,540 ----
-  	      char ret = 'n';
-  	      int  in_inbox = !strucmp(state->cur_folder,state->inbox_name);
-  
-! 	      if(!state->nr_mode && state->context_current) {
-  		  char		 nextfolder[MAXPATH];
-  		  MAILSTREAM	*nextstream = NULL;
-  
-***************
-*** 551,557 ****
-  			  if(!in_inbox){
-  			      sprintf(prompt, "No more %ss.  Return to \"%s\"",
-! 				     (state->context_current->use&CNTXT_INCMNG)
-! 				       ? "incoming folder" : "news group", 
-  				      state->inbox_name);
-  			      ret = want_to(prompt, 'y', 'x', NO_HELP, 0, 0);
-  			      if(ret == 'y')
---- 545,551 ----
-  			  if(!in_inbox){
-  			      sprintf(prompt, "No more %ss.  Return to \"%s\"",
-! 				     (state->context_current->use&CNTXT_NEWS)
-! 				       ? "news group" : "folder", 
-  				      state->inbox_name);
-  			      ret = want_to(prompt, 'y', 'x', NO_HELP, 0, 0);
-  			      if(ret == 'y')
-***************
-*** 561,574 ****
-  			  else
-  			    q_status_message1(SM_ORDER, 0, 2, "No more %ss",
-! 				     (state->context_current->use&CNTXT_INCMNG)
-! 				        ? "incoming folder" : "news group");
-  
-  			  break;
-  		      }
-  
-  		      sprintf(prompt, "View next %s \"%s\"? ",
-! 			      (state->context_current->use&CNTXT_INCMNG)
-! 				 ? "Incoming folder" : "news group",
-  			      nextfolder);
-  
-  		      /*
---- 555,568 ----
-  			  else
-  			    q_status_message1(SM_ORDER, 0, 2, "No more %ss",
-! 				     (state->context_current->use&CNTXT_NEWS)
-! 				        ? "news group" : "folder");
-  
-  			  break;
-  		      }
-  
-  		      sprintf(prompt, "View next %s \"%s\"? ",
-! 			      (state->context_current->use&CNTXT_NEWS)
-! 				 ? "news group" : "folder",
-  			      nextfolder);
-  
-  		      /*
diff --git a/mail/pine/pkg/DESCR b/mail/pine/pkg/DESCR
index a684fc3af23..6730ff279e9 100644
--- a/mail/pine/pkg/DESCR
+++ b/mail/pine/pkg/DESCR
@@ -12,6 +12,6 @@ An optional configuration file "pine.conf" can be put into /usr/pkg/etc
 to set system wide defaults.  The format of this file is identical to the 
 .pinerc file that is auto-generated by pine in your home directory.
 
-Also included in dot.pinerc.pgp.sample are example entries needed to
-add to your .pinerc to activate the pgp add on scripts pgpdecode,
-pgpencode, and pgpsign.
+Also included in /usr/pkg/share/examples/pine/dot.pinerc.pgp.sample are
+example entries needed to add to your .pinerc to activate the pgp add on
+scripts pgpdecode, pgpencode, and pgpsign.
diff --git a/mail/pine/pkg/PLIST b/mail/pine/pkg/PLIST
index c4bd2860b72..ff1c9d1a5af 100644
--- a/mail/pine/pkg/PLIST
+++ b/mail/pine/pkg/PLIST
@@ -1,16 +1,12 @@
-@comment $NetBSD: PLIST,v 1.4 1997/12/04 22:53:38 hubertf Exp $
-bin/pico
-bin/pilot
+@comment $NetBSD: PLIST,v 1.5 1998/07/19 03:39:19 tv Exp $
 bin/pine
-lib/libpico.a
-lib/pine.conf
-lib/pine.conf.fixed
-bin/pgpencrypt
 bin/pgpdecode
+bin/pgpencrypt
 bin/pgpsign
-etc/dot.pinerc.pgp.sample
-man/man1/pico.1.gz
-man/man1/pilot.1.gz
-man/man1/pine.1.gz
+lib/pine.conf
+lib/pine.conf.fixed
+man/man1/pine.1
 share/doc/pine/tech-notes.txt
+share/examples/pine/dot.pinerc.pgp.sample
 @dirrm share/doc/pine
+@dirrm share/examples/pine