From owner-svn-ports-all@FreeBSD.ORG Mon Jun 23 11:57:45 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 49106C98; Mon, 23 Jun 2014 11:57:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 34FF02EC7; Mon, 23 Jun 2014 11:57:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5NBvjiV089555; Mon, 23 Jun 2014 11:57:45 GMT (envelope-from pi@svn.freebsd.org) Received: (from pi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5NBviES089552; Mon, 23 Jun 2014 11:57:44 GMT (envelope-from pi@svn.freebsd.org) Message-Id: <201406231157.s5NBviES089552@svn.freebsd.org> From: Kurt Jaeger Date: Mon, 23 Jun 2014 11:57:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358924 - in head/mail/alpine: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jun 2014 11:57:45 -0000 Author: pi Date: Mon Jun 23 11:57:44 2014 New Revision: 358924 URL: http://svnweb.freebsd.org/changeset/ports/358924 QAT: https://qat.redports.org/buildarchive/r358924/ Log: 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 Modified: head/mail/alpine/Makefile head/mail/alpine/distinfo head/mail/alpine/files/patch-pith__pine.hlp Modified: head/mail/alpine/Makefile ============================================================================== --- head/mail/alpine/Makefile Mon Jun 23 11:42:03 2014 (r358923) +++ head/mail/alpine/Makefile Mon Jun 23 11:57:44 2014 (r358924) @@ -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 (ov .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: Modified: head/mail/alpine/distinfo ============================================================================== --- head/mail/alpine/distinfo Mon Jun 23 11:42:03 2014 (r358923) +++ head/mail/alpine/distinfo Mon Jun 23 11:57:44 2014 (r358924) @@ -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 Modified: head/mail/alpine/files/patch-pith__pine.hlp ============================================================================== --- head/mail/alpine/files/patch-pith__pine.hlp Mon Jun 23 11:42:03 2014 (r358923) +++ head/mail/alpine/files/patch-pith__pine.hlp Mon Jun 23 11:57:44 2014 (r358924) @@ -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 @@

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 @@

A system configuration file is not required. -@@ -16075,7 +16036,7 @@ - the pathname of the bogofilter program. - For example, -

--

Command = /usr/local/bin/bogofilter
-+
Command = /usr/ports/mail/alpine/work/stage/usr/local/bin/bogofilter
-

- 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 "bogofilter" as the Categorizer Command, - the "-u" argument will cause bogofilter to update the database. -

--

Command = /usr/local/bin/bogofilter -u
-+
Command = /usr/ports/mail/alpine/work/stage/usr/local/bin/bogofilter -u
-

- You'd want a couple more aliases or shell scripts called something like - change_to_spam -@@ -16164,7 +16125,7 @@ - This is usually ok. - However, in this case it is a problem because the command -

--

Command = /usr/local/bin/bogofilter -u
-+
Command = /usr/ports/mail/alpine/work/stage/usr/local/bin/bogofilter -u
-

- 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 = (optionally set this) - -@@ -20763,7 +20724,7 @@ - - - a colon (:) under UNIX; for example:

--        ~/.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
-
- -

    -@@ -26486,16 +26447,16 @@ -

    - So, here are some example entries: - 

    --url-viewers = _TEST("test -n '${DISPLAY}'")_  /usr/local/bin/netscape
--              "/usr/local/bin/lynx _URL_"
-+url-viewers = _TEST("test -n '${DISPLAY}'")_  /usr/ports/mail/alpine/work/stage/usr/local/bin/netscape
-+              "/usr/ports/mail/alpine/work/stage/usr/local/bin/lynx _URL_"
-               C:\BIN\NETSCAPE.BAT
-
    -

    - This example shows that for the first viewer in the list to be used - the environment variable "DISPLAY" must be defined. If it --is, then the path and file "/usr/local/bin/netscape" must exist. -+is, then the path and file "/usr/ports/mail/alpine/work/stage/usr/local/bin/netscape" must exist. - If neither condition is met, --then the path and file "/usr/local/bin/lynx" must exist. -+then the path and file "/usr/ports/mail/alpine/work/stage/usr/local/bin/lynx" must exist. - If it does, then the "_URL_" token is replaced by the selected URL. - If the path to "lynx" is invalid, - then the final path and file C:\BIN\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): -

    --url-viewers = _TEST("test -L /myhomedir/.netscape/lock")_ "/usr/local/bin/netscape -remote 'openURL(_URL_, new-window)' &"
    -+url-viewers = _TEST("test -L /myhomedir/.netscape/lock")_ "/usr/ports/mail/alpine/work/stage/usr/local/bin/netscape -remote 'openURL(_URL_, new-window)' &"
    - --_TEST("test -n '${DISPLAY}'")_ "/usr/local/bin/netscape &"
    -- "/usr/local/bin/lynx '_URL_'" -+_TEST("test -n '${DISPLAY}'")_ "/usr/ports/mail/alpine/work/stage/usr/local/bin/netscape &"
    -+ "/usr/ports/mail/alpine/work/stage/usr/local/bin/lynx '_URL_'" -

    - -