5 files changed, 46 insertions, 40 deletions

diff --git a/hebrew/pine/Makefile b/hebrew/pine/Makefile
index cfac0041c5bd..f994b6f3357b 100644
--- a/hebrew/pine/Makefile
+++ b/hebrew/pine/Makefile
@@ -5,11 +5,10 @@
 # $FreeBSD$
 
 PORTNAME=	pine
-PORTVERSION=	4.21.2.9
-PORTREVISION=	1
+PORTVERSION=	4.30.2.9
 CATEGORIES=	hebrew mail news
 MASTER_SITES=	ftp://www8.cc.huji.ac.il/pub/pine/
-DISTNAME=	pine4.21_heb2.09
+DISTNAME=	pine4.30_heb2.09
 
 MAINTAINER?=	nadav@cs.technion.ac.il
 
diff --git a/hebrew/pine/distinfo b/hebrew/pine/distinfo
index b69814bcf002..eb31b48f8e85 100644
--- a/hebrew/pine/distinfo
+++ b/hebrew/pine/distinfo
@@ -1 +1 @@
-MD5 (pine4.21_heb2.09.tar.gz) = 380a2efdac0fb224e1189fcec1dc09e1
+MD5 (pine4.30_heb2.09.tar.gz) = b875b5e0bb514e319f534459e88a3925
diff --git a/hebrew/pine/files/patch-af b/hebrew/pine/files/patch-af
index 18bd351bff7e..bec5b70c90cd 100644
--- a/hebrew/pine/files/patch-af
+++ b/hebrew/pine/files/patch-af
@@ -1,7 +1,7 @@
-*** imap/src/osdep/unix/Makefile.orig	Wed Jan 27 01:19:19 1999
---- imap/src/osdep/unix/Makefile	Tue Feb  9 21:32:44 1999
+*** imap/src/osdep/unix/Makefile.orig	Wed Oct 25 03:41:50 2000
+--- imap/src/osdep/unix/Makefile	Thu Nov  2 11:23:08 2000
 ***************
-*** 82,88 ****
+*** 74,80 ****
   # Commands possibly overriden by the individual port
   
   ARRC=ar rc
@@ -9,7 +9,7 @@
   LN=ln -s
   RANLIB=ranlib
   
---- 82,88 ----
+--- 74,80 ----
   # Commands possibly overriden by the individual port
   
   ARRC=ar rc
@@ -18,19 +18,19 @@
   RANLIB=ranlib
   
 ***************
-*** 100,106 ****
+*** 92,98 ****
    dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
    rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
    unix.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
 ! CFLAGS=$(BASECFLAGS) $(EXTRACFLAGS)
+  
+  CAT=cat
   MAKE=make
-  MV=mv
-  RM=rm -rf
---- 100,106 ----
+--- 92,98 ----
    dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
    rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
    unix.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
 ! CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)
+  
+  CAT=cat
   MAKE=make
-  MV=mv
-  RM=rm -rf
diff --git a/hebrew/pine/files/patch-at b/hebrew/pine/files/patch-at
index 4a8564a88065..18547b959818 100644
--- a/hebrew/pine/files/patch-at
+++ b/hebrew/pine/files/patch-at
@@ -1,20 +1,20 @@
-*** pine/pine.hlp.orig	Fri Feb  5 01:07:54 1999
---- pine/pine.hlp	Tue Feb  9 22:10:02 1999
+*** pine/pine.hlp.orig	Wed Oct 25 18:17:47 2000
+--- pine/pine.hlp	Thu Nov  2 11:34:19 2000
 ***************
-*** 455,463 ****
-  
+*** 550,558 ****
    executable     <Unix search path>/pine
    persnl cfg     ~/.pinerc
+   except cfg     ~/.pinercex
 !  global cfg     /usr/local/lib/pine.conf
 !  fixed cfg      /usr/local/lib/pine.conf.fixed
 !  local help     /usr/local/lib/pine.info
   
    interrupted    ~/.pine-interrupted-mail
    debug          ~/.pine-debugN
---- 455,463 ----
-  
+--- 550,558 ----
    executable     <Unix search path>/pine
    persnl cfg     ~/.pinerc
+   except cfg     ~/.pinercex
 !  global cfg     @@PREFIX@@/etc/pine.conf
 !  fixed cfg      @@PREFIX@@/etc/pine.conf.fixed
 !  local help     @@PREFIX@@/etc/pine.info
@@ -22,7 +22,7 @@
    interrupted    ~/.pine-interrupted-mail
    debug          ~/.pine-debugN
 ***************
-*** 469,476 ****
+*** 564,571 ****
    postponed#     ~/mail/postponed-msgs
    sentmail#      ~/mail/sent-mail
    mailcap#       ~/.mailcap + /etc/mailcap
@@ -31,7 +31,7 @@
   
    news-spool	varies across Unix flavors, e.g. /usr/spool/news or /var/news
    active-news	varies across Unix flavors, e.g. /usr/lib/news/active
---- 469,476 ----
+--- 564,571 ----
    postponed#     ~/mail/postponed-msgs
    sentmail#      ~/mail/sent-mail
    mailcap#       ~/.mailcap + /etc/mailcap
@@ -41,7 +41,7 @@
    news-spool	varies across Unix flavors, e.g. /usr/spool/news or /var/news
    active-news	varies across Unix flavors, e.g. /usr/lib/news/active
 ***************
-*** 856,864 ****
+*** 1022,1030 ****
   this link now to send a message to it:<BR>
   <A HREF="X-Pine-Gripe:_LOCAL_ADDRESS_?local"><!--#echo var="_LOCAL_FULLNAME_"--></A><P>
   <!--chtml endif-->
@@ -51,7 +51,7 @@
   <HR WIDTH="75%">
   <!--chtml endif-->
   <P> 
---- 856,864 ----
+--- 1022,1030 ----
   this link now to send a message to it:<BR>
   <A HREF="X-Pine-Gripe:_LOCAL_ADDRESS_?local"><!--#echo var="_LOCAL_FULLNAME_"--></A><P>
   <!--chtml endif-->
@@ -62,7 +62,7 @@
   <!--chtml endif-->
   <P> 
 ***************
-*** 945,951 ****
+*** 1112,1118 ****
   <OL>
     <LI> <A HREF="#intro">Introduction</A>
     <LI> <A HREF="#pine_help">Pine Help</A>
@@ -70,7 +70,7 @@
     <LI> <A HREF="#local_support">Local Support Contacts</A>
   <!--chtml endif-->
     <LI> <A HREF="#giving_cmds">Giving Commands in Pine</A>
---- 945,951 ----
+--- 1112,1118 ----
   <OL>
     <LI> <A HREF="#intro">Introduction</A>
     <LI> <A HREF="#pine_help">Pine Help</A>
@@ -79,7 +79,7 @@
   <!--chtml endif-->
     <LI> <A HREF="#giving_cmds">Giving Commands in Pine</A>
 ***************
-*** 1052,1060 ****
+*** 1221,1229 ****
   at your site.)
   
   
@@ -89,7 +89,7 @@
   <!--chtml endif-->
   
   <H2><A NAME="giving_cmds">Giving Commands in Pine</A></H2>
---- 1052,1060 ----
+--- 1221,1229 ----
   at your site.)
   
   
diff --git a/hebrew/pine/files/patch-aw b/hebrew/pine/files/patch-aw
index ae3ad3c1e484..e7c359e27ad5 100644
--- a/hebrew/pine/files/patch-aw
+++ b/hebrew/pine/files/patch-aw
@@ -1,12 +1,19 @@
---- imap/src/osdep/unix/env_unix.c.orig	Sun Oct 10 13:43:21 1999
-+++ imap/src/osdep/unix/env_unix.c	Wed Oct 13 20:11:32 1999
-@@ -825,7 +825,8 @@
- 	    }
- 	    close (pi[0]); close (pi[1]);
- 	  }
--	  if (lockEaccesError) {/* punt silently if paranoid site */
-+	  if (strncmp(base->lock,"/var/mail/",10) && lockEaccesError) {
-+	  /* punt silently if paranoid site */
- 	    sprintf (tmp,"Mailbox vulnerable - directory %.80s",hitch);
- 	    if (s = strrchr (tmp,'/')) *s = '\0';
- 	    strcat (tmp," must have 1777 protection");
+*** imap/src/osdep/unix/env_unix.c.orig	Wed Oct 25 03:43:40 2000
+--- imap/src/osdep/unix/env_unix.c	Thu Nov  2 12:10:11 2000
+***************
+*** 947,953 ****
+        }
+        close (pi[0]); close (pi[1]);
+      }
+!     if (lockEaccesError) {	/* punt silently if paranoid site */
+        sprintf (tmp,"Mailbox vulnerable - directory %.80s",base->lock);
+        if (s = strrchr (tmp,'/')) *s = '\0';
+        strcat (tmp," must have 1777 protection");
+--- 947,953 ----
+        }
+        close (pi[0]); close (pi[1]);
+      }
+!     if (strncmp(base->lock,"/var/mail/",10) && lockEaccesError) {
+        sprintf (tmp,"Mailbox vulnerable - directory %.80s",base->lock);
+        if (s = strrchr (tmp,'/')) *s = '\0';
+        strcat (tmp," must have 1777 protection");