Changes 4.7:

* bug fixes

5 files changed, 48 insertions, 37 deletions

diff --git a/editors/pico/Makefile b/editors/pico/Makefile
index 61109743d3e..6366ed2613d 100644
--- a/editors/pico/Makefile
+++ b/editors/pico/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2004/04/12 11:12:31 xtraeme Exp $
+# $NetBSD: Makefile,v 1.51 2004/05/13 18:27:48 adam Exp $
 
-DISTNAME=	pine4.58
-PKGNAME=	pico-4.6
+DISTNAME=	pine4.60
+PKGNAME=	pico-4.7
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/ \
 		ftp://ftp.fu-berlin.de/unix/mail/pine/
diff --git a/editors/pico/distinfo b/editors/pico/distinfo
index e793df84147..5bdf5dbb311 100644
--- a/editors/pico/distinfo
+++ b/editors/pico/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.12 2003/09/12 19:42:06 tron Exp $
+$NetBSD: distinfo,v 1.13 2004/05/13 18:27:48 adam Exp $
 
-SHA1 (pine4.58.tar.bz2) = 5522426ef925813218ce1a3fbb939591778b59f1
-Size (pine4.58.tar.bz2) = 2837321 bytes
+SHA1 (pine4.60.tar.bz2) = 7276fad1325a7d6c96a80454e12dcc05e2ad8b78
+Size (pine4.60.tar.bz2) = 2996963 bytes
 SHA1 (patch-aa) = 13a6268321e3620c9438d19abec92072c7aecab4
-SHA1 (patch-ab) = ff843a907a8bb2015e7e79d5b221b6b024823130
-SHA1 (patch-ac) = 5f648f4e34d78af439ed2ea4953543aab4bd232f
-SHA1 (patch-ad) = 1180abc4909f4120ec91ba14854da9445be3ac6a
+SHA1 (patch-ab) = 8f254beb0fc5d7e8f04ee442db64fccecd1d3eb2
+SHA1 (patch-ac) = 0b14723354ef24109015c482acf62f338de4998a
+SHA1 (patch-ad) = a5145664372b0ad308a0ee2501211e927d343971
 SHA1 (patch-ae) = f228f3c7f61be31a36730b252dfa37d611e8be4b
 SHA1 (patch-af) = ebc41187ea97f57f1553a6919c81c773013a1428
 SHA1 (patch-ag) = 7166128e46a10b879c44caea1207b84d13d1b0f4
diff --git a/editors/pico/patches/patch-ab b/editors/pico/patches/patch-ab
index 109e6a86122..e4986a82c5a 100644
--- a/editors/pico/patches/patch-ab
+++ b/editors/pico/patches/patch-ab
@@ -1,13 +1,15 @@
-$NetBSD: patch-ab,v 1.9 2003/07/28 14:35:34 adam Exp $
+$NetBSD: patch-ab,v 1.10 2004/05/13 18:27:48 adam Exp $
 
---- pico/osdep/unix.orig	2003-05-28 00:56:45.000000000 +0200
-+++ pico/osdep/unix	2003-07-28 13:49:18.000000000 +0200
-@@ -2654,7 +2654,7 @@
+--- pico/osdep/unix.orig	2004-05-05 22:01:13.000000000 +0000
++++ pico/osdep/unix
+@@ -2659,10 +2659,7 @@ char *
  errstr(err)
  int err;
  {
--    return((err >= 0 && err < sys_nerr) ? (char *)sys_errlist[err] : NULL);
-+    return strerror(err);
+-    return((err >= 0) ? (char *) strerror(err) : NULL);
+-#ifdef OLDWAY
+     return((err >= 0 && err < sys_nerr) ? (char *)sys_errlist[err] : NULL);
+-#endif
  }
  
  
diff --git a/editors/pico/patches/patch-ac b/editors/pico/patches/patch-ac
index 65438749bd7..4ed104a0e6f 100644
--- a/editors/pico/patches/patch-ac
+++ b/editors/pico/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.8 2002/12/14 10:28:42 tron Exp $
+$NetBSD: patch-ac,v 1.9 2004/05/13 18:27:48 adam Exp $
 
---- build.orig	Mon Dec  9 18:54:38 2002
-+++ build	Sat Dec 14 10:57:35 2002
-@@ -362,63 +362,6 @@
+--- build.orig	2004-05-07 19:32:32.000000000 +0000
++++ build
+@@ -380,63 +380,6 @@ case $maketarg in
  	  echo "Including SSL functionality"
  	fi
  
@@ -66,14 +66,26 @@ $NetBSD: patch-ac,v 1.8 2002/12/14 10:28:42 tron Exp $
          echo "Making Pico and Pilot"
          cd "$PHOME/pico"
          eval echo make "$makeargs" -f makefile.$picotarg
-@@ -427,30 +370,8 @@
+@@ -445,50 +388,8 @@ case $maketarg in
  	if [ $rc != "0" ] ; then exit $rc ; fi
          echo ''
  
 -        echo "Making Pine and rpload/rpdump".
+-	if [ "$ALTDOCPATHS" = "1" ]
+-	then
+-	    cd "$PHOME"
+-	    rm .pine.sedargs
+-	    echo -n " -e s/\/usr\/local\/lib\/pine.conf/\/etc\/pine.conf/" > .pine.sedargs
+-	    echo -n " -e s/\/usr\/local\/lib\/pine.info/\/etc\/pine.info/" >> .pine.sedargs
+-	    echo -n " -e s/\/usr\/lib\/sendmail/\/usr\/sbin\/sendmail/" >> .pine.sedargs
+-	    echo -n " -e s/\/usr\/spool\/news/\/var\/spool\/news/" >> .pine.sedargs
+-	    echo -n " -e s/\/usr\/spool\/mail/\/var\/spool\/mail/" >> .pine.sedargs
+-	    echo -n " -e s/\/bin\/passwd/\/usr\/bin\/passwd/" >> .pine.sedargs
+-	    PINEEXTRAC="'LOCALPINECFLAGS=-DSYSTEM_PINERC=\\\"/etc/pine.conf\\\" -DSYSTEM_PINERC_FIXED=\\\"/etc/pine.conf.fixed\\\" -DSYSTEM_PINE_INFO_PATH=\\\"/etc/pine.info\\\"'"
+-	fi
 -        cd "$PHOME/pine"
--        eval echo make "$makeargs" "$L1" "$L2" -f makefile.$pinetarg
--        eval make "$makeargs" "$L1" "$L2" -f makefile.$pinetarg
+-        eval echo make "$makeargs" "$L1" "$L2" "$PINEEXTRAC" -f makefile.$pinetarg
+-        eval make "$makeargs" "$L1" "$L2" "$PINEEXTRAC" -f makefile.$pinetarg
 -	rc=$?
 -	if [ $rc != "0" ] ; then exit $rc ; fi
 -        cd "$PHOME"
@@ -90,6 +102,14 @@ $NetBSD: patch-ac,v 1.8 2002/12/14 10:28:42 tron Exp $
 -        if [ -s ../pico/pilot ] ;     then ln ../pico/pilot pilot     ; fi
 -        if [ -s ../pine/rpload ] ;    then ln ../pine/rpload rpload   ; fi
 -        if [ -s ../pine/rpdump ] ;    then ln ../pine/rpdump rpdump   ; fi
+-	if [ "$ALTDOCPATHS" = "1" ]
+-	then
+-	    echo "making local docs"
+-	    echo "sed `cat ../.pine.sedargs` < ../doc/pine.1 > pine.1"
+-	    sed `cat ../.pine.sedargs` < ../doc/pine.1 > pine.1
+-	    echo "sed `cat ../.pine.sedargs` < ../doc/tech-notes.txt > tech-notes.txt"
+-	    sed `cat ../.pine.sedargs` < ../doc/tech-notes.txt > tech-notes.txt
+-	fi
          cd "$PHOME"
          echo ''
 -        echo "Links to executables are in bin directory:"
diff --git a/editors/pico/patches/patch-ad b/editors/pico/patches/patch-ad
index f6a93cfa84c..ead8c4f8e2c 100644
--- a/editors/pico/patches/patch-ad
+++ b/editors/pico/patches/patch-ad
@@ -1,19 +1,8 @@
-$NetBSD: patch-ad,v 1.2 1999/05/02 03:16:59 tv Exp $
+$NetBSD: patch-ad,v 1.3 2004/05/13 18:27:48 adam Exp $
 
---- pico/osdep/os-neb.h.orig	Wed Feb  3 15:15:27 1999
-+++ pico/osdep/os-neb.h	Fri Apr 23 16:19:54 1999
-@@ -54,8 +54,8 @@
- 
- 
- /*--------------- signal.h ---------------------------------------------*/
--/* #include <signal.h> */   /* sometimes both required, sometimes */
--#include <sys/signal.h>  /* only one or the other */
-+#include <signal.h>  /* sometimes both required, sometimes */
-+/* #include <sys/signal.h> */  /* only one or the other */
- 
- #define SigType void     /* value returned by sig handlers is void */
- /* #define SigType int */   /* value returned by sig handlers is int */
-@@ -81,7 +81,7 @@
+--- pico/osdep/os-neb.h.orig	2004-01-22 22:04:21.000000000 +0000
++++ pico/osdep/os-neb.h
+@@ -81,7 +81,7 @@ typedef u_int16_t usign16_t;
  
  /*-------------- fcntl flag to set non-blocking IO ---------------------*/
  /*#define	NON_BLOCKING_IO	O_NONBLOCK */		/* POSIX style */