[Midnightbsd-cvs] mports: mail/pine4: 1.

[laffer1 at midnightbsd.org]

Log Message:
-----------
1. maildir patch was referenced in the Makefile, but not available in the options.  I've corrected this and updated the distfile with the latest patch for maildir support.  We no longer get fetch errors with that patch.

2. I've added the password file support as an option, but it is disabled by default.

Technically we are in a ports freeze and the second part of this does not fall in the rules. This patch was tested on stargazre with three different iterations of options testing. It does not cover all possible cases, but it should be fairly stable.

Modified Files:
--------------
    mports/mail/pine4:
        Makefile (r1.2 -> r1.3)
        distinfo (r1.1 -> r1.2)
    mports/mail/pine4/files:
        patch-ac (r1.1 -> r1.2)

Added Files:
-----------
    mports/mail/pine4/files:
        patch-pine_pine.hlp (r1.1)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/mail/pine4/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lmail/pine4/Makefile -Lmail/pine4/Makefile -u -r1.2 -r1.3
--- mail/pine4/Makefile
+++ mail/pine4/Makefile
@@ -23,8 +23,10 @@
 COMMENT=	PINE(tm) -- a Program for Internet News & Email
 
 OPTIONS=	PICO "Build and install pico, the default editor" on \
+		PASSFILE "Support for a stored Password File (DANGEROUS)" off \
+		MAILDIR "Add a patch that provides maildir support"  off \
 		LDAP "Add support for LDAP" off \
-		IPV6 "Add support for IPv6" off
+		IPV6 "Add support for IPv6" off \
 
 USE_OPENSSL=	yes
 
@@ -59,6 +61,11 @@
 EXTRA_OPTS+=	IP=6
 .endif
 
+.if defined(WITH_PASSFILE)
+PASSFILE?=      .pine.pwd
+EXTRA_OPTS+= EXTRACFLAGS="-DWITH_PASSFILE"
+.endif
+
 MAN1=		pine.1 pilot.1 rpdump.1 rpload.1
 
 pre-fetch:
@@ -96,6 +103,7 @@
 		${SED}	-e "s:/usr/local/etc/:${PREFIX}/etc/:g" \
 			-e "s:/usr/local/lib/:${PREFIX}/etc/:g" \
 			-e "s:@@PREFIX@@:${PREFIX}:g" \
+			-e "s:@@PASSFILE@@:${PASSFILE}:g" \
 			-e "s:/usr/local/pine.conf:${PREFIX}/etc/pine.conf:g" \
 			$$i.presed > $$i ; \
 	done
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/mail/pine4/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lmail/pine4/distinfo -Lmail/pine4/distinfo -u -r1.1 -r1.2
--- mail/pine4/distinfo
+++ mail/pine4/distinfo
@@ -1,6 +1,6 @@
 MD5 (pine4.64.tar.gz) = 9cc68749675f1c35a2147a35d2c5b344
 SHA256 (pine4.64.tar.gz) = c200646bc2e7128370be3b6d28d26944984a0d4003982762f97ee4aa142d183d
 SIZE (pine4.64.tar.gz) = 4218629
-MD5 (maildir.patch.gz) = 523b43b16b7c86d172b4180e8529a9b3
-SHA256 (maildir.patch.gz) = 6471c4f35e905aa90e9e510bfca14ba38a3c6b0a95c2c5b8fca1e407d87848f8
-SIZE (maildir.patch.gz) = 31040
+MD5 (maildir.patch.gz) = 2a409555cc5362c48d553a275944eab1
+SHA256 (maildir.patch.gz) = 0e4019e7078735b7835a88177bfef2e1589098e7df432d6e963fab07f61ddab2
+SIZE (maildir.patch.gz) = 31222
Index: patch-ac
===================================================================
RCS file: /home/cvs/mports/mail/pine4/files/patch-ac,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lmail/pine4/files/patch-ac -Lmail/pine4/files/patch-ac -u -r1.1 -r1.2
--- mail/pine4/files/patch-ac
+++ mail/pine4/files/patch-ac
@@ -1,5 +1,5 @@
 *** pine/osdep/os-bsf.h.orig	Fri May 23 09:05:21 2003
---- pine/osdep/os-bsf.h	Fri Sep  5 01:44:20 2003
+--- pine/osdep/os-bsf.h	Thu Aug  9 00:30:23 2007
 ***************
 *** 87,93 ****
      NOTE: You'll also have to make sure the appropriate osdep/postreap.*
@@ -29,6 +29,22 @@
      The default printer when pine starts up for the first time with no printer
    ----*/
 ***************
+*** 250,255 ****
+--- 252,264 ----
+  #define MAX_SCREEN_COLS  (170) 
+  #define MAX_SCREEN_ROWS  (200) 
+  
++ /*----------------------------------------------------------------------
++     File name used to store the user's server/id/password triple between
++  session.  It is rooted in the same directory as the PINERC.
++  ----*/
++ #ifdef WITH_PASSFILE
++ #define PASSFILE        "@@PASSFILE@@"
++ #endif
+  
+  /*----------------------------------------------------------------------
+      Where to put the output of pine in debug mode. Files are created
+***************
 *** 280,286 ****
          8
          9 logs gross details of command execution
@@ -37,7 +53,7 @@
   
   
   
---- 282,288 ----
+--- 289,295 ----
          8
          9 logs gross details of command execution
    ----*/
--- /dev/null
+++ mail/pine4/files/patch-pine_pine.hlp
@@ -0,0 +1,10 @@
+--- pine/pine.hlp.orig	2007-08-09 00:17:46.000000000 -0700
++++ pine/pine.hlp	2007-08-09 00:23:00.000000000 -0700
+@@ -996,6 +996,7 @@
+  executable     <Unix search path>/pine
+  persnl cfg     ~/.pinerc
+  except cfg     ~/.pinercex
++ password       ~/@@PASSFILE@@
+  global cfg     <!--#echo var="PINE_CONF_PATH"-->
+  fixed cfg      <!--#echo var="PINE_CONF_FIXED_PATH"-->
+  local help     <!--#echo var="PINE_INFO_PATH"-->