From owner-cvs-ports@FreeBSD.ORG  Sun Dec  5 07:51:50 2010
Return-Path: <owner-cvs-ports@FreeBSD.ORG>
Delivered-To: cvs-ports@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1F922106566C;
	Sun,  5 Dec 2010 07:51:50 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0F47B8FC08;
	Sun,  5 Dec 2010 07:51:50 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id oB57pnlW021149;
	Sun, 5 Dec 2010 07:51:49 GMT
	(envelope-from dougb@repoman.freebsd.org)
Received: (from dougb@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id oB57pneA021148;
	Sun, 5 Dec 2010 07:51:49 GMT (envelope-from dougb)
Message-Id: <201012050751.oB57pneA021148@repoman.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 5 Dec 2010 07:51:49 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: ports/mail/alpine Makefile pkg-install pkg-plist
X-BeenThere: cvs-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the ports tree <cvs-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-ports>
List-Post: <mailto:cvs-ports@freebsd.org>
List-Help: <mailto:cvs-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Dec 2010 07:51:50 -0000

dougb       2010-12-05 07:51:49 UTC

  FreeBSD ports repository

  Modified files:
    mail/alpine          Makefile pkg-plist 
  Added files:
    mail/alpine          pkg-install 
  Log:
  Remove CONFLICTS for the old pine stuff, it's been long enough
  
  Fix the problem mentioned in the PR related to a feature of the port
  that is useful, or dangerous depending on how you look at it. :)
  If you run 'alpine -conf > file' it will merge in values from your
  existing global conf file (/usr/local/etc/alpine.conf) and spit out a
  new file with any new features added. The port used this feature when
  I took it over, and I maintained that behavior because it is useful.
  However, it is different from the traditional behavior of installing
  a clean foo.conf.sample file, and maintaining foo.conf only if it
  differs from the sample.
  
  My solution to this problem is different than the PR's, but does not
  involve patching the source. Using the pkg-install file and taking
  advantage of the default behavior of the alpine -conf feature I have
  created the best of both worlds, a clean .sample, and merging in local
  changes if they exist.
  
  Since I'm changing stuff anyway, do both sides of the process in a
  more security-conscious way.
  
  Bump PORTREVISION since the package is now different
  
  PR:             ports/148859
  Submitted by:   Ganael Laplanche <ganael.laplanche@martymac.com>
  
  Revision  Changes    Path
  1.11      +2 -5      ports/mail/alpine/Makefile
  1.1       +32 -0     ports/mail/alpine/pkg-install (new)
  1.2       +2 -5      ports/mail/alpine/pkg-plist