mail/alpine: fixes

- fix hlp file [1]
- quota patch now part of 2.11, disable config option [2]
- fix/update maildir support [3]
- fix distinfo

Submitted by:	antoine [1], Greg Rivers [2], Warren Block [3]
Approved by:	maintainer by mail

3 files changed, 16 insertions, 110 deletions

diff --git a/mail/alpine/Makefile b/mail/alpine/Makefile
index 32d904c18d63..65f001d6557d 100644
--- a/mail/alpine/Makefile
+++ b/mail/alpine/Makefile
@@ -2,9 +2,10 @@
 
 PORTNAME?=	alpine
 PORTVERSION=	2.11
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	mail news ipv6
 MASTER_SITES=	http://patches.freeiz.com/alpine/release/src/
+DIST_SUBDIR=	alpine-${PORTVERSION}
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	mbeis@xs4all.nl
@@ -21,12 +22,11 @@ NOSPELL_DESC=	Use no default speller (overrides both)
 
 .if !defined(PICO_ALPINE_SLAVE)
 
-OPTIONS_DEFINE+=	PICO IPV6 LDAP PASSFILE CONS25 QUOTA MAILDIR SSL
+OPTIONS_DEFINE+=	PICO IPV6 LDAP PASSFILE CONS25 MAILDIR SSL
 OPTIONS_DEFAULT+=	PICO SSL
 PICO_DESC=	Build and install pico, the default editor
 PASSFILE_DESC=	Support for a stored password file (DANGEROUS)
 CONS25_DESC=	Add a patch to support color for default console
-QUOTA_DESC=	Add a patch for disk quota checking on IMAP
 MAILDIR_DESC=	Add a patch for maildir support
 .endif
 
@@ -113,24 +113,14 @@ ALPINE_PASSFILE?=	.alpine.pwd
 CONFIGURE_ARGS+=	--with-passfile=.alpine.pwd
 .endif
 
-.if ${PORT_OPTIONS:MQUOTA} || ${PORT_OPTIONS:MMAILDIR}
-PATCH_SITES=		ftp://ftp.cac.washington.edu/alpine/
-PATCH_SITE_SUBDIR=	dougb/alpine-${PORTVERSION}/
-PATCH_DIST_ARGS+=	-E --quiet -d ${PATCH_WRKSRC} -p1
-.endif
-
-.if ${PORT_OPTIONS:MQUOTA}
-PATCH_SITES=		ftp://ftp.cac.washington.edu/alpine/alpine-2.00/
-PATCHFILES+=	quota.patch.gz
-.endif
-
 .if ${PORT_OPTIONS:MMAILDIR}
-PATCH_SITES=		ftp://ftp.cac.washington.edu/alpine/alpine-2.00/
-PATCHFILES+=	maildir.patch.gz
+PATCH_SITES=		http://patches.freeiz.com/alpine/patches/alpine-2.11/
+PATCHFILES+=		maildir.patch.gz
+PATCH_DIST_ARGS+=	-E --quiet -d ${PATCH_WRKSRC} -p1
 .endif
 
 .if ${PORT_OPTIONS:MCONS25}
-EXTRA_PATCHES=	${FILESDIR}/cons25-alpine_keymenu.c
+EXTRA_PATCHES=		${FILESDIR}/cons25-alpine_keymenu.c
 .endif
 
 pre-patch:
diff --git a/mail/alpine/distinfo b/mail/alpine/distinfo
index 60fec66db07b..ba33caa95fd6 100644
--- a/mail/alpine/distinfo
+++ b/mail/alpine/distinfo
@@ -1,6 +1,4 @@
-SHA256 (alpine-2.11.tar.xz) = fecc9ca5df03e0f368edec65cd61444325157b5635b5c92380cedf9c4ce8fbf6
-SIZE (alpine-2.11.tar.xz) = 4403188
-SHA256 (alpine-2.00/quota.patch.gz) = 383717cbe36c62a6008f9d7e1ce56e755fc0ec49eef25fcf11f2cbebbbaffe12
-SIZE (alpine-2.00/quota.patch.gz) = 3123
-SHA256 (alpine-2.00/maildir.patch.gz) = 60d98c7dca0932316e23ccb226b4db85d1896de9a1a37259a2afcea153be4477
-SIZE (alpine-2.00/maildir.patch.gz) = 32737
+SHA256 (alpine-2.11/alpine-2.11.tar.xz) = fecc9ca5df03e0f368edec65cd61444325157b5635b5c92380cedf9c4ce8fbf6
+SIZE (alpine-2.11/alpine-2.11.tar.xz) = 4403188
+SHA256 (alpine-2.11/maildir.patch.gz) = 2b0b168223fd5ea219fae720bb74d698c0a7b800c31dead649f752ed93be9ddb
+SIZE (alpine-2.11/maildir.patch.gz) = 33160
diff --git a/mail/alpine/files/patch-pith__pine.hlp b/mail/alpine/files/patch-pith__pine.hlp
index 4f4f3b0a1079..df2fa300cc33 100644
--- a/mail/alpine/files/patch-pith__pine.hlp
+++ b/mail/alpine/files/patch-pith__pine.hlp
@@ -1,5 +1,5 @@
---- ./pith/pine.hlp.orig	2013-08-14 23:36:22.000000000 -0500
-+++ ./pith/pine.hlp	2014-05-25 19:15:32.000000000 -0500
+--- pith/pine.hlp.orig	2013-08-15 06:36:22.000000000 +0200
++++ pith/pine.hlp	2014-06-23 11:40:52.000000000 +0200
 @@ -881,13 +881,13 @@
        config file from command line or provided
        by "PINECONF" environment variable
@@ -16,14 +16,12 @@
  </UL>
  <P>
  The values in both the personal configuration file and the
-@@ -976,8 +976,8 @@
-  postponed#     ~/mail/postponed-msgs
+@@ -977,7 +977,7 @@
   sentmail#      ~/mail/sent-mail
   mailcap#       ~/.mailcap + /etc/mailcap
--                           + /usr/etc/mailcap + /usr/local/etc/mailcap
+                            + /usr/etc/mailcap + /usr/local/etc/mailcap
 - mimetypes#     ~/.mime.types + /etc/mime.types + /usr/local/lib/mime.types
-+                           + /usr/etc/mailcap + /usr/ports/mail/alpine/work/stage/usr/local/etc/mailcap
-+ mimetypes#     ~/.mime.types + /etc/mime.types + /usr/ports/mail/alpine/work/stage/usr/ports/mail/alpine/work/stage/usr/local/etc/mime.types
++ mimetypes#     ~/.mime.types + /etc/mime.types + /usr/local/etc/mime.types
  
   news-spool	varies across Unix flavors, e.g. /var/spool/news or /usr/spool/news
   active-news	varies across Unix flavors, e.g. /usr/lib/news/active
@@ -99,83 +97,3 @@
  </CODE></PRE>
  <P>
  A system configuration file is not required.
-@@ -16075,7 +16036,7 @@
- the pathname of the bogofilter program.
- For example,
- <P>
--<CENTER><SAMP>Command = /usr/local/bin/bogofilter</SAMP></CENTER>
-+<CENTER><SAMP>Command = /usr/ports/mail/alpine/work/stage/usr/local/bin/bogofilter</SAMP></CENTER>
- <P>
- Exit status of zero is what you are interested in, so you'd set the
- Exit Status Interval to
-@@ -16136,7 +16097,7 @@
- Instead of using just plain &quot;bogofilter&quot; as the Categorizer Command,
- the &quot;-u&quot; argument will cause bogofilter to update the database.
- <P>
--<CENTER><SAMP>Command = /usr/local/bin/bogofilter -u</SAMP></CENTER>
-+<CENTER><SAMP>Command = /usr/ports/mail/alpine/work/stage/usr/local/bin/bogofilter -u</SAMP></CENTER>
- <P>
- You'd want a couple more aliases or shell scripts called something like
- <EM>change_to_spam</EM>
-@@ -16164,7 +16125,7 @@
- This is usually ok.
- However, in this case it is a problem because the command
- <P>
--<CENTER><SAMP>Command = /usr/local/bin/bogofilter -u</SAMP></CENTER>
-+<CENTER><SAMP>Command = /usr/ports/mail/alpine/work/stage/usr/local/bin/bogofilter -u</SAMP></CENTER>
- <P>
- has the side effect of updating the database.
- So you run the risk of updating the database multiple times for a single
-@@ -16210,7 +16171,7 @@
-   ! Keyword pattern = Bogo
- 
-   External Categorizer Commands =
--       Command              = /usr/local/bin/bogofilter -u
-+       Command              = /usr/ports/mail/alpine/work/stage/usr/local/bin/bogofilter -u
-        Exit Status Interval = (0,0)
-        Character Limit      = <No Value Set: using "-1">  (optionally set this)
- 
-@@ -20763,7 +20724,7 @@
- </PRE>
- <!--chtml else-->
- a colon (:) under UNIX; for example:<PRE>
--        ~/.mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap
-+        ~/.mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/ports/mail/alpine/work/stage/usr/local/etc/mailcap
- </PRE>
- <!--chtml endif-->
- <P><UL>
-@@ -26486,16 +26447,16 @@
- <P>
- So, here are some example entries:
- <PRE>
--url-viewers = _TEST(&quot;test -n '$&#123;DISPLAY}'&quot;)_  /usr/local/bin/netscape
--              &quot;/usr/local/bin/lynx _URL_&quot;
-+url-viewers = _TEST(&quot;test -n '$&#123;DISPLAY}'&quot;)_  /usr/ports/mail/alpine/work/stage/usr/local/bin/netscape
-+              &quot;/usr/ports/mail/alpine/work/stage/usr/local/bin/lynx _URL_&quot;
-               C:&#92;BIN&#92;NETSCAPE.BAT
- </PRE>
- <P>
- This example shows that for the first viewer in the list to be used
- the environment variable &quot;DISPLAY&quot; must be defined.  If it
--is, then the path and file &quot;/usr/local/bin/netscape&quot; must exist.  
-+is, then the path and file &quot;/usr/ports/mail/alpine/work/stage/usr/local/bin/netscape&quot; must exist.  
- If neither condition is met,
--then the path and file &quot;/usr/local/bin/lynx&quot; must exist.  
-+then the path and file &quot;/usr/ports/mail/alpine/work/stage/usr/local/bin/lynx&quot; must exist.  
- If it does, then the &quot;_URL_&quot; token is replaced by the selected URL. 
- If the path to &quot;lynx&quot; is invalid,
- then the final path and file C:&#92;BIN&#92;NETSCAPE.BAT must exist.  
-@@ -26588,10 +26549,10 @@
- An example using the Korn shell and the Netscape browser (first entry wrapped 
- because of its length, but should all appear on one line):
- <P>
--url-viewers = _TEST("test -L /myhomedir/.netscape/lock")_ &quot;/usr/local/bin/netscape -remote 'openURL(_URL_,  new-window)' &amp;&quot;<BR>
-+url-viewers = _TEST("test -L /myhomedir/.netscape/lock")_ &quot;/usr/ports/mail/alpine/work/stage/usr/local/bin/netscape -remote 'openURL(_URL_,  new-window)' &amp;&quot;<BR>
- 
--_TEST(&quot;test -n '$&#123;DISPLAY}'&quot;)_ &quot;/usr/local/bin/netscape &amp;&quot;<BR>
--              &quot;/usr/local/bin/lynx '_URL_'&quot;
-+_TEST(&quot;test -n '$&#123;DISPLAY}'&quot;)_ &quot;/usr/ports/mail/alpine/work/stage/usr/local/bin/netscape &amp;&quot;<BR>
-+              &quot;/usr/ports/mail/alpine/work/stage/usr/local/bin/lynx '_URL_'&quot;
- <P>
- <!--chtml endif-->
- <P>