Updated pine to 4.40: List of changes is unknown (I didn't find any ChangeLog)

6 files changed, 42 insertions, 76 deletions

diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index 2db5950ebf1..e68cec19a7c 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.49 2001/10/10 13:47:46 martti Exp $
+# $NetBSD: Makefile,v 1.50 2001/10/11 15:35:01 martti Exp $
 # FreeBSD Id: Makefile,v 1.21 1997/03/26 02:12:07 ache Exp
 #
 
-DISTNAME=       pine4.33
-PKGNAME=        pine-4.33
+DISTNAME=       pine4.40
+PKGNAME=        pine-4.40
 CATEGORIES=     mail news
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/ \
 		ftp://ftp.fu-berlin.de/unix/mail/pine/
@@ -18,7 +18,7 @@ BUILD_DEFS+=	PINE_USE_LDAP
 
 # This pkg doesn't build pico or libpico; the pico pkg does that part.
 DEPENDS+=	pico>=4.0:../../editors/pico
-DEPENDS+=	imap-uw>=2000.0.3:../../mail/imap-uw
+DEPENDS+=	imap-uw>=2001.0:../../mail/imap-uw
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/pine/distinfo b/mail/pine/distinfo
index 1c79ad31435..5a0502cc759 100644
--- a/mail/pine/distinfo
+++ b/mail/pine/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 13:10:02 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/10/11 15:35:01 martti Exp $
 
-SHA1 (pine4.33.tar.gz) = e93f1653d50ac3cbebf223dcd2f3d76c2fc27597
-Size (pine4.33.tar.gz) = 3333758 bytes
-SHA1 (patch-aa) = 470effaecb1f6e7aa908ba1fd993c3bbe2edf7fc
-SHA1 (patch-ac) = ba03f5103d8a40be696c572e8a296a07928d69fd
-SHA1 (patch-al) = 41cde2a34f43fa49410bc8114602cd781790bde4
+SHA1 (pine4.40.tar.gz) = 90ed30803e6b25add43bf53ec260cdf313cfb77b
+Size (pine4.40.tar.gz) = 3435886 bytes
+SHA1 (patch-aa) = db9b6abab00be4b4e2970790afe12cea34a12742
+SHA1 (patch-ac) = 1a88e5d1ec71add7ecab85f2ffa5e5a00e583df9
+SHA1 (patch-al) = 9dc539ba5895b56af3b3fbd6d7055fa3f1c82ea4
 SHA1 (patch-ao) = 0d8ba903d643147ae5771a7a053ab9be1e849766
diff --git a/mail/pine/patches/patch-aa b/mail/pine/patches/patch-aa
index b39ba78f7f8..b3836600bcd 100644
--- a/mail/pine/patches/patch-aa
+++ b/mail/pine/patches/patch-aa
@@ -1,6 +1,7 @@
-$NetBSD: patch-aa,v 1.10 2000/12/18 18:09:11 jwise Exp $
---- pine/makefile.gs5.orig	Thu Aug 27 12:49:57 1998
-+++ pine/makefile.gs5	Mon Dec 18 12:35:31 2000
+$NetBSD: patch-aa,v 1.11 2001/10/11 15:35:01 martti Exp $
+
+--- pine/makefile.gs5.orig	Tue Jul  3 19:03:55 2001
++++ pine/makefile.gs5	Mon Oct  8 10:04:40 2001
 @@ -47,9 +47,9 @@
  RM=          rm -f
  LN=          ln -s
@@ -28,20 +29,12 @@ $NetBSD: patch-aa,v 1.10 2000/12/18 18:09:11 jwise Exp $
  
  STDCFLAGS=   -DSV4 -DSYSTYPE=\"GSO\" -DMOUSE
  CFLAGS=      $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \
-@@ -93,13 +93,13 @@
- 	$(CCLIENTDIR)/mail.h $(CCLIENTDIR)/osdep.h \
- 	$(CCLIENTDIR)/rfc822.h $(CCLIENTDIR)/misc.h
+@@ -95,7 +95,7 @@
+ 
+ all:	pine rpload rpdump
  
 -pine:  $(OFILES) $(LOCLIBS)
 +pine:  $(OFILES)
  	echo "char datestamp[]="\"`date`\"";" > date.c
  	echo "char hoststamp[]="\"`uname -n`\"";" >> date.c
  	$(LDCC) $(LDFLAGS) $(CFLAGS) -o pine $(OFILES) date.c $(LIBS)
- 
--abookcpy:	abookcpy.o $(LOCLIBES)
--	$(CC) $(LDFLAGS) $(CFLAGS) -o abookcpy abookcpy.o $(LIBS)
-+abookcpy:	abookcpy.o
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o abookcpy abookcpy.o $(CCLIENTDIR)/c-client.a 
- 
- pine-use:	pine-use.c
- 	$(CC) -o pine-use pine-use.c
diff --git a/mail/pine/patches/patch-ac b/mail/pine/patches/patch-ac
index 674182bee14..901ffc2c503 100644
--- a/mail/pine/patches/patch-ac
+++ b/mail/pine/patches/patch-ac
@@ -1,6 +1,7 @@
-$NetBSD: patch-ac,v 1.12 2001/02/28 10:26:02 wiz Exp $
---- pine/makefile.neb.orig	Fri Nov 10 02:57:03 2000
-+++ pine/makefile.neb	Fri Feb 16 10:04:20 2001
+$NetBSD: patch-ac,v 1.13 2001/10/11 15:35:01 martti Exp $
+
+--- pine/makefile.neb.orig	Tue Jul  3 19:03:58 2001
++++ pine/makefile.neb	Mon Oct  8 10:05:52 2001
 @@ -45,11 +45,16 @@
  RM=          rm -f
  LN=          ln -s
@@ -49,18 +50,9 @@ $NetBSD: patch-ac,v 1.12 2001/02/28 10:26:02 wiz Exp $
 +	$(CCLIENTINC)/mail.h $(CCLIENTINC)/osdep.h \
 +	$(CCLIENTINC)/rfc822.h $(CCLIENTINC)/misc.h
  
- pine:  $(OFILES) $(LOCLIBS)
- 	echo "char datestamp[]="\"`date`\"";" > date.c
-@@ -88,7 +92,7 @@
- 	$(CC) $(LDFLAGS) $(CFLAGS) -o pine $(OFILES) date.c $(LIBS)
+ all:	pine rpload rpdump
  
- abookcpy:	abookcpy.o $(LOCLIBES)
--	$(CC) $(LDFLAGS) $(CFLAGS) -o abookcpy abookcpy.o $(LIBS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o abookcpy abookcpy.o $(CCLIENTLIB)/libimapuw.la -lcrypt
- 
- pine-use:	pine-use.c
- 	$(CC) -o pine-use pine-use.c
-@@ -107,8 +111,8 @@
+@@ -112,8 +116,8 @@
  
  $(OFILES):						$(HFILES)
  addrbook.o adrbkcmd.o adrbklib.o bldaddr.o takeaddr.o:	adrbklib.h
diff --git a/mail/pine/patches/patch-al b/mail/pine/patches/patch-al
index 58982a65de5..ef5d074db7b 100644
--- a/mail/pine/patches/patch-al
+++ b/mail/pine/patches/patch-al
@@ -1,7 +1,8 @@
-$NetBSD: patch-al,v 1.9 2001/02/28 10:26:02 wiz Exp $
---- build.orig	Thu Jan  4 20:13:11 2001
-+++ build	Fri Feb 16 10:33:44 2001
-@@ -201,7 +201,7 @@
+$NetBSD: patch-al,v 1.10 2001/10/11 15:35:01 martti Exp $
+
+--- build.orig	Thu Aug  2 03:35:02 2001
++++ build	Mon Oct  8 10:11:41 2001
+@@ -209,7 +209,7 @@
       bs3) makeargs="CC=shlicc $makeargs" ;;
       nto) makeargs="CC=qcc $makeargs" ;;
       lyn) [ -f /CYGNUS.bash ] && . /CYGNUS.bash; makeargs="CC=gcc $makeargs" ;;
@@ -10,16 +11,19 @@ $NetBSD: patch-al,v 1.9 2001/02/28 10:26:02 wiz Exp $
    esac
  fi
  
-@@ -309,23 +309,28 @@
+@@ -344,27 +344,6 @@
+ 	  esac
  	  echo "Including SSL functionality"
  	fi
- 
+-
 -        if [ -s c-client ] ; then rm -f c-client ; fi
 -        ln -s imap/c-client c-client
 -        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
+-        if [ -s ipopd    ] ; then rm -f ipopd    ; fi
+-        ln -s imap/ipopd ipopd
 -        echo "Making c-client library, mtest and imapd"
 -        eval echo make "$makeargs" "$SSL" "$K1" "$K2" $ccltarg
 -        cd $PHOME/imap
@@ -31,50 +35,26 @@ $NetBSD: patch-al,v 1.9 2001/02/28 10:26:02 wiz Exp $
 -        eval echo make "$makeargs" -f makefile.$picotarg
 -        eval make "$makeargs" -f makefile.$picotarg
 -        echo ''
-+#
-+# We use the imap-uw pkg's stuff for that, see
-+# http://www.securityfocus.com/advisories/2646 and 
-+# http://www.securityfocus.com/bid/1709:
-+#
-+#       if [ -s c-client ] ; then rm -f c-client ; fi
-+#       ln -s imap/c-client c-client
-+#       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" "$SSL" "$K1" "$K2" $ccltarg
-+#       cd $PHOME/imap
-+#       eval make "$makeargs" "$SSL" "$K1" "$K2" $ccltarg
-+#       echo ''
-+
-+#       echo "Making Pico and Pilot"
-+#       cd $PHOME/pico
-+#       eval echo make "$makeargs" -f makefile.$picotarg
-+#       eval make "$makeargs" -f makefile.$picotarg
-+#       echo ''
- 
+-
          echo "Making Pine".
          cd $PHOME/pine
-@@ -342,8 +347,6 @@
-         if [ -s ../pico/pilot ] ;     then ln ../pico/pilot pilot ; fi
+         eval echo make "$makeargs" "$L1" "$L2" -f makefile.$pinetarg
+@@ -384,8 +363,6 @@
+         if [ -s ../pine/rpdump ] ;    then ln ../pine/rpdump rpdump   ; fi
          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/mtest bin/imapd bin/pico bin/pilot bin/rpdump bin/rpload bin/ipop2d bin/ipop3d
  	case $maketarg in
  	    mnt)    echo "Fixing stacksizes ..."
  		    fixstk 64K bin/pine bin/pico bin/imapd bin/mtest bin/pilot
-@@ -353,9 +356,9 @@
+@@ -421,9 +398,6 @@
  
  
      clean) # This only sort of works 
 -        echo "Cleaning c-client and imapd"
 -	cd $PHOME/imap
 -	make clean
-+#       echo "Cleaning c-client and imapd"
-+#	cd $PHOME/imap
-+#	make clean
          echo "Cleaning Pine"
          cd $PHOME/pine
          make -f makefile.ult clean
diff --git a/mail/pine/pkg/PLIST b/mail/pine/pkg/PLIST
index b530282388d..c0c9dd7045e 100644
--- a/mail/pine/pkg/PLIST
+++ b/mail/pine/pkg/PLIST
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.9 2000/11/09 03:37:27 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.10 2001/10/11 15:35:02 martti Exp $
 bin/pgpdecode
 bin/pgpencrypt
 bin/pgpsign
 bin/pine
+@exec if [ ! -f %D/etc/pine.conf ]; then cp -p %D/share/examples/pine/pine.conf %D/etc/; fi
+@unexec if cmp -s %D/etc/pine.conf %D/share/examples/pine/pine.conf; then rm -f %D/etc/pine.conf; fi
 man/man1/pine.1
 share/pine/tech-notes.txt
 share/pine/contrib/krb5-setup
@@ -17,7 +19,6 @@ share/pine/contrib/utils/txtcc.sh
 share/examples/pine/dot.pinerc.pgp
 share/examples/pine/pine.conf
 share/examples/pine/pine.conf.fixed
-@exec if [ ! -f %D/etc/pine.conf ]; then cp -p %D/share/examples/pine/pine.conf %D/etc/; fi
 @dirrm share/pine/contrib/utils
 @dirrm share/pine/contrib
 @dirrm share/pine