>Number:         12222
>Category:       pkg
>Synopsis:       Update for pine and pico
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri Feb 16 01:12:00 PST 2001
>Closed-Date:
>Last-Modified:
>Originator:     Martti Kuparinen
>Release:        /usr/pkgsrc from today
>Organization:
piuha.net
>Environment:
	
System: NetBSD ws216 1.5 NetBSD 1.5 (WS20) #2: Tue Feb 13 09:40:43 EET 2001 root@ws216:/usr/src/sys/arch/i386/compile/WS20 i386


>Description:

I have updated the pine and pico packages. If you have difficulties
with the following patches, just get the whole collection from

	http://www.piuha.net/~martti/tmp/

>How-To-Repeat:
	
>Fix:

Index: editors/pico/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/editors/pico/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile	2000/11/09 03:34:13	1.21
+++ Makefile	2001/02/16 08:49:18
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.21 2000/11/09 03:34:13 hubertf Exp $
 #
 
-DISTNAME=	pine4.30
+DISTNAME=	pine4.33
 PKGNAME=	pico-3.8
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/
Index: editors/pico/files/md5
===================================================================
RCS file: /cvsroot/pkgsrc/editors/pico/files/md5,v
retrieving revision 1.12
diff -u -r1.12 md5
--- files/md5	2000/11/09 03:34:14	1.12
+++ files/md5	2001/02/16 08:49:18
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.12 2000/11/09 03:34:14 hubertf Exp $
+$NetBSD$
 
-MD5 (pine4.30.tar.gz) = 21e16ae355a3c78cbe128876e3e65350
+MD5 (pine4.33.tar.gz) = fb45dcfa1d3379031700da49236b2b9c




Index: mail/pine/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/pine/Makefile,v
retrieving revision 1.40
diff -u -r1.40 Makefile
--- Makefile	2000/12/18 18:09:11	1.40
+++ Makefile	2001/02/16 08:49:18
@@ -2,8 +2,8 @@
 # FreeBSD Id: Makefile,v 1.21 1997/03/26 02:12:07 ache Exp
 #
 
-DISTNAME=       pine4.30
-PKGNAME=        pine-4.30
+DISTNAME=       pine4.33
+PKGNAME=        pine-4.33
 CATEGORIES=     mail news
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/ \
 		ftp://ftp.fu-berlin.de/unix/mail/pine/
Index: mail/pine/files/md5
===================================================================
RCS file: /cvsroot/pkgsrc/mail/pine/files/md5,v
retrieving revision 1.11
diff -u -r1.11 md5
--- files/md5	2000/11/09 03:37:26	1.11
+++ files/md5	2001/02/16 08:49:18
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.11 2000/11/09 03:37:26 hubertf Exp $
+$NetBSD$
 
-MD5 (pine4.30.tar.gz) = 21e16ae355a3c78cbe128876e3e65350
+MD5 (pine4.33.tar.gz) = fb45dcfa1d3379031700da49236b2b9c
Index: mail/pine/files/patch-sum
===================================================================
RCS file: /cvsroot/pkgsrc/mail/pine/files/patch-sum,v
retrieving revision 1.7
diff -u -r1.7 patch-sum
--- files/patch-sum	2000/12/18 18:09:11	1.7
+++ files/patch-sum	2001/02/16 08:49:18
@@ -1,6 +1,6 @@
 $NetBSD: patch-sum,v 1.7 2000/12/18 18:09:11 jwise Exp $
 
 MD5 (patch-aa) = f9bc943f36dfc5f2c3583bcbe7a1aba6
-MD5 (patch-ac) = 5b10cccaeecdc6163e452a0bc691b247
-MD5 (patch-al) = e079f418def13fb0386bd6faecf113b4
+MD5 (patch-ac) = 9f88664a90e9a9a989b6e6aadf939402
+MD5 (patch-al) = ec4b240b1113eeb0e979e4ff1f3f1209
 MD5 (patch-ao) = bf069e8f6c0e571c26a3f52fe2781b6b
Index: mail/pine/patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/mail/pine/patches/patch-ac,v
retrieving revision 1.10
diff -u -r1.10 patch-ac
--- patches/patch-ac	2000/12/18 18:09:11	1.10
+++ patches/patch-ac	2001/02/16 08:49:18
@@ -1,7 +1,5 @@
-$NetBSD: patch-ac,v 1.10 2000/12/18 18:09:11 jwise Exp $
-
---- pine/makefile.neb.orig	Thu Aug 27 18:50:02 1998
-+++ pine/makefile.neb
+--- pine/makefile.neb.orig	Fri Nov 10 02:57:03 2000
++++ pine/makefile.neb	Fri Feb 16 10:04:20 2001
 @@ -45,11 +45,16 @@
  RM=          rm -f
  LN=          ln -s
@@ -24,7 +22,7 @@
  # Only need to uncomment next two lines if you run make from this directory
 @@ -60,14 +65,13 @@
  LDAPOFILES=   addrbook.o adrbkcmd.o args.o bldaddr.o init.o \
- 	      other.o pine.o takeaddr.o
+ 	      mailview.o other.o pine.o strings.o takeaddr.o
  
 -STDLIBS=     -ltermlib
 -LOCLIBS=     $(PICODIR)/libpico.a $(CCLIENTDIR)/c-client.a
@@ -69,6 +67,6 @@
 -send.o:							$(CCLIENTDIR)/smtp.h
 +context.o:						$(CCLIENTINC)/misc.h
 +send.o:							$(CCLIENTINC)/smtp.h
- $(LDAPOFILES):						$(LDAPLIBS)
+ #$(LDAPOFILES):						$(LDAPLIBS)
  
  helptext.c:	pine.hlp
Index: mail/pine/patches/patch-al
===================================================================
RCS file: /cvsroot/pkgsrc/mail/pine/patches/patch-al,v
retrieving revision 1.7
diff -u -r1.7 patch-al
--- patches/patch-al	2000/11/09 03:37:27	1.7
+++ patches/patch-al	2001/02/16 08:49:18
@@ -1,17 +1,15 @@
-$NetBSD: patch-al,v 1.7 2000/11/09 03:37:27 hubertf Exp $
-
---- build.orig	Tue Aug  1 00:28:01 2000
-+++ build
-@@ -198,7 +198,7 @@
-      mnt) makeargs="CC=gcc $makeargs" ;;
+--- build.orig	Thu Jan  4 20:13:11 2001
++++ build	Fri Feb 16 10:33:44 2001
+@@ -201,7 +201,7 @@
       bs3) makeargs="CC=shlicc $makeargs" ;;
+      nto) makeargs="CC=qcc $makeargs" ;;
       lyn) [ -f /CYGNUS.bash ] && . /CYGNUS.bash; makeargs="CC=gcc $makeargs" ;;
 -       *) makeargs="CC=cc $makeargs" ;;
 +       *) makeargs="CC=${LT}\ cc\ -g $makeargs" ;;
    esac
  fi
  
-@@ -303,23 +303,28 @@
+@@ -309,23 +309,28 @@
  	  echo "Including SSL functionality"
  	fi
  
@@ -57,7 +55,7 @@
  
          echo "Making Pine".
          cd $PHOME/pine
-@@ -336,8 +341,6 @@
+@@ -342,8 +347,6 @@
          if [ -s ../pico/pilot ] ;     then ln ../pico/pilot pilot ; fi
          cd $PHOME
          echo ''
@@ -66,7 +64,7 @@
  	case $maketarg in
  	    mnt)    echo "Fixing stacksizes ..."
  		    fixstk 64K bin/pine bin/pico bin/imapd bin/mtest bin/pilot
-@@ -347,9 +350,9 @@
+@@ -353,9 +356,9 @@
  
  
      clean) # This only sort of works 
>Release-Note:
>Audit-Trail:
>Unformatted: