The passwd program is in /usr/bin, not /bin.

Re-add patch-tabkey, reengineered for Pine 4.00's mailcmd.c.

3 files changed, 87 insertions, 4 deletions

diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index 87798ed5afb..12a306673af 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 1998/07/19 04:33:06 tv Exp $
+# $NetBSD: Makefile,v 1.16 1998/07/19 05:21:34 tv Exp $
 # FreeBSD Id: Makefile,v 1.21 1997/03/26 02:12:07 ache Exp
 #
 
@@ -14,12 +14,10 @@ DEPENDS=	pico-3.0:../../editors/pico
 
 CONFLICTS=	pine-3.96
 
-post-patch:
+do-configure:
 	${CP} -f ${WRKSRC}/pine/osdep/os-neb.h ${WRKSRC}/pine/osdep/os-neb.h.orig
 	${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:
diff --git a/mail/pine/patches/patch-ad b/mail/pine/patches/patch-ad
new file mode 100644
index 00000000000..a3757184af9
--- /dev/null
+++ b/mail/pine/patches/patch-ad
@@ -0,0 +1,11 @@
+--- 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-tabkey b/mail/pine/patches/patch-tabkey
new file mode 100644
index 00000000000..24820ee07f3
--- /dev/null
+++ b/mail/pine/patches/patch-tabkey
@@ -0,0 +1,74 @@
+--- pine/mailcmd.c.orig	Sun Jul 19 01:00:42 1998
++++ pine/mailcmd.c	Sun Jul 19 01:06:24 1998
+@@ -316,9 +316,7 @@
+ 	}
+ 	else{
+ 	    prompt[0] = '\0';
+-	    if(!state->nr_mode
+-	       && (IS_NEWS(stream)
+-		   || (state->context_current->use & CNTXT_INCMNG))){
++	    if(!state->nr_mode){
+ 		char nextfolder[MAXPATH];
+ 
+ 		strcpy(nextfolder, state->cur_folder);
+@@ -445,14 +443,7 @@
+ 	    char ret = 'n';
+ 	    int  in_inbox = !strucmp(state->cur_folder,state->inbox_name);
+ 
+-	    if(!state->nr_mode && state->context_current
+-	       && ((NEWS_TEST(state->context_current)
+-		    && context_isambig(state->cur_folder))
+-		   || ((state->context_current->use & CNTXT_INCMNG)
+-		       && (in_inbox
+-			   || folder_index(state->cur_folder,
+-					   state->context_current,
+-					   FI_FOLDER) >= 0)))){
++	    if(!state->nr_mode && state->context_current){
+ 		char	    nextfolder[MAXPATH];
+ 		MAILSTREAM *nextstream = NULL;
+ 		long	    recent_cnt;
+@@ -463,8 +454,8 @@
+ 				     state->context_current, &recent_cnt))){
+ 			if(!in_inbox){
+ 			    sprintf(prompt, "No more %ss.  Return to \"%s\"",
+-				    (state->context_current->use&CNTXT_INCMNG)
+-				      ? "incoming folder" : "news group", 
++				    NEWS_TEST(state->context_current)
++				      ? "news group" : "folder", 
+ 				    state->inbox_name);
+ 			    ret = want_to(prompt, 'y', 'x', NO_HELP, WT_NORM);
+ 			    if(ret == 'y'){
+@@ -475,15 +466,15 @@
+ 			}
+ 			else
+ 			  q_status_message1(SM_ORDER, 0, 2, "No more %ss",
+-				     (state->context_current->use&CNTXT_INCMNG)
+-				        ? "incoming folder" : "news group");
++				      NEWS_TEST(state->context_current)
++				        ? "news group" : "folder");
+ 
+ 			break;
+ 		    }
+ 
+ 		    sprintf(prompt, "View next %s \"%s\" (%s recent)? ",
+-			    (state->context_current->use & CNTXT_INCMNG)
+-			      ? "Incoming folder" : "news group",
++			    NEWS_TEST(state->context_current)
++			      ? "news group" : "folder", 
+ 			    nextfolder,
+ 			    recent_cnt ? long2string(recent_cnt) : "some");
+ 
+@@ -1248,12 +1239,9 @@
+ 	}
+ 
+ 	if(!state->nr_mode
+-	   && ((IS_NEWS(state->mail_stream)
+-		|| ((state->context_current->use & CNTXT_INCMNG)
+-		    && context_isambig(state->cur_folder)))
+ 	       && (msgno == next_sorted_flagged(F_UNDEL|F_UNSEEN,
+ 						state->mail_stream,
+-						msgno, &opts)))){
++						msgno, &opts))){
+ 	    char nextfolder[MAXPATH];
+ 
+ 	    strcpy(nextfolder, state->cur_folder);