5 files changed, 29 insertions, 48 deletions

diff --git a/hebrew/pine/Makefile b/hebrew/pine/Makefile
index 92f2d328a12a..a3cefd114906 100644
--- a/hebrew/pine/Makefile
+++ b/hebrew/pine/Makefile
@@ -5,10 +5,10 @@
 # $FreeBSD$
 
 PORTNAME=	pine
-PORTVERSION=	4.33.2.9
+PORTVERSION=	4.42.2.9
 CATEGORIES=	hebrew mail news
 MASTER_SITES=	ftp://www8.cc.huji.ac.il/pub/pine/
-DISTNAME=	pine4.33_heb2.09
+DISTNAME=	pine4.42_heb2.09
 
 MAINTAINER?=	nadav@cs.technion.ac.il
 
diff --git a/hebrew/pine/distinfo b/hebrew/pine/distinfo
index bff717406840..2355e0b4d7cb 100644
--- a/hebrew/pine/distinfo
+++ b/hebrew/pine/distinfo
@@ -1 +1 @@
-MD5 (pine4.33_heb2.09.tar.gz) = d554597ab0c2dfd77e27706c08935c05
+MD5 (pine4.42_heb2.09.tar.gz) = ad78a5adf366e0f735789a864b829004
diff --git a/hebrew/pine/files/patch-ac b/hebrew/pine/files/patch-ac
index c4407f440d4c..2afa36851c80 100644
--- a/hebrew/pine/files/patch-ac
+++ b/hebrew/pine/files/patch-ac
@@ -58,7 +58,7 @@
   /*----------------------------------------------------------------------
      If no nntp-servers are defined, this program will be used to post news.
    ----*/
-! #define SENDNEWS	"/usr/local/news/inews -h"
+! /* #define SENDNEWS	"/usr/local/news/inews -h" */
   
   
   /*--------- Program employed by users to change their password ---------*/
@@ -66,7 +66,7 @@
   /*----------------------------------------------------------------------
      If no nntp-servers are defined, this program will be used to post news.
    ----*/
-! #define SENDNEWS	"/usr/local/news/lib/inews -h"	/* For NN inews    */
+! /*#define SENDNEWS	"/usr/local/news/lib/inews -h" */	/* For NN inews    */
 ! /*#define SENDNEWS	"/usr/local/bin/inews -h"	/* For INN inews   */
 ! /*#define SENDNEWS	"/usr/local/bin/inews -h"	/* For Cnews inews */
   
diff --git a/hebrew/pine/files/patch-al b/hebrew/pine/files/patch-al
index a55e334900a9..fc48db78d0c1 100644
--- a/hebrew/pine/files/patch-al
+++ b/hebrew/pine/files/patch-al
@@ -1,18 +1,6 @@
---- build.orig	Fri Feb 19 18:30:54 1999
-+++ build	Wed Oct 13 17:53:42 1999
-@@ -80,8 +80,9 @@
-  pine   The Pine mailer. Once compiled this should work just fine on
-         your system with no other files than this binary, and no
-         modifications to your system. Optionally you may create two
--        configuration files, /usr/local/lib/pine.conf and 
--        /usr/local/lib/pine.info. See the documentation for details.
-+        configuration files, /usr/local/etc/pine.conf and 
-+        /usr/local/etc/pine.info. See the documentation for details.
-+
-  
-  pico   The standalone editor similar to the Pine message composer.
-         This is a very simple straight forward text editor.
-@@ -278,10 +279,10 @@
+--- build.orig	Fri Dec  7 10:57:01 2001
++++ build	Fri Dec  7 11:01:36 2001
+@@ -334,12 +334,12 @@
  
          if [ -s c-client ] ; then rm -f c-client ; fi
          ln -s imap/c-client c-client
@@ -20,32 +8,42 @@
 -        ln -s imap/mtest mtest
 -        if [ -s imapd    ] ; then rm -f imapd    ; fi
 -        ln -s imap/imapd imapd
+-        if [ -s ipopd    ] ; then rm -f ipopd    ; fi
+-        ln -s imap/ipopd ipopd
 +#        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
++#        if [ -s ipopd    ] ; then rm -f ipopd    ; fi
++#        ln -s imap/ipopd ipopd
+         echo "Making c-client library, imapd, and ipopd"
+ 	echo $S1 $S2 $S3 $S4 $K1 > imap/SPECIALS
          cd $PHOME/imap
-@@ -303,14 +304,14 @@
+@@ -362,10 +362,10 @@
          cd $PHOME/bin
-         rm -f pine mtest imapd pico pilot
+         rm -f pine mtest imapd pico pilot rpload rpdump ipop2d ipop3d
          if [ -s ../pine/pine ] ;      then ln ../pine/pine  pine      ; fi
--        if [ -s ../mtest/mtest ] ;    then ln ../mtest/mtest mtest ; fi
+-        if [ -s ../mtest/mtest ] ;    then ln ../mtest/mtest mtest    ; fi
 -        if [ -s ../imapd/imapd ] ;    then ln ../imapd/imapd imapd    ; fi
-+#        if [ -s ../mtest/mtest ] ;    then ln ../mtest/mtest mtest ; fi
+-        if [ -s ../ipopd/ipop2d ] ;   then ln ../ipopd/ipop2d ipop2d  ; fi
+-        if [ -s ../ipopd/ipop3d ] ;   then ln ../ipopd/ipop3d ipop3d  ; 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
++#        if [ -s ../ipopd/ipop2d ] ;   then ln ../ipopd/ipop2d ipop2d  ; fi
++#        if [ -s ../ipopd/ipop3d ] ;   then ln ../ipopd/ipop3d ipop3d  ; fi
+         if [ -s ../pico/pico ] ;      then ln ../pico/pico pico       ; fi
+         if [ -s ../pico/pilot ] ;     then ln ../pico/pilot pilot     ; fi
+         if [ -s ../pine/rpload ] ;    then ln ../pine/rpload rpload   ; fi
+@@ -373,7 +373,7 @@
          cd $PHOME
          echo ''
          echo "Links to executables are in bin directory:"
--        size bin/pine bin/mtest bin/imapd bin/pico bin/pilot
-+        size bin/pine bin/pico bin/pilot
+-        size bin/pine bin/mtest bin/imapd bin/pico bin/pilot bin/rpdump bin/rpload bin/ipop2d bin/ipop3d
++        size bin/pine bin/pico bin/pilot bin/rpdump bin/rpload 
  	case $maketarg in
  	    mnt)    echo "Fixing stacksizes ..."
  		    fixstk 64K bin/pine bin/pico bin/imapd bin/mtest bin/pilot
-@@ -325,10 +326,10 @@
+@@ -415,10 +415,10 @@
  	make clean
          echo "Cleaning Pine"
          cd $PHOME/pine
diff --git a/hebrew/pine/files/patch-an b/hebrew/pine/files/patch-an
index 2d9cc2dc5bea..2a9c7c3b9419 100644
--- a/hebrew/pine/files/patch-an
+++ b/hebrew/pine/files/patch-an
@@ -1,23 +1,6 @@
 *** pico/osdep/os-bsf.h.orig	Wed Jul  8 19:37:28 1998
 --- pico/osdep/os-bsf.h	Fri Jul 10 12:57:37 1998
 ***************
-*** 23,29 ****
-  
-  #define  USE_DIRENT
-  #include <sys/types.h>
-! #include <sys/dir.h>
-  #include <stdlib.h>
-  #include <string.h>
-  
---- 23,29 ----
-  
-  #define  USE_DIRENT
-  #include <sys/types.h>
-! #include <dirent.h>
-  #include <stdlib.h>
-  #include <string.h>
-  
-***************
 *** 152,158 ****
   /*
    * Place where mail gets delivered (for pico's new mail checking)