From owner-cvs-ports@FreeBSD.ORG  Tue Oct  4 21:58:10 2011
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 1D8B4106572E;
	Tue,  4 Oct 2011 21:58:10 +0000 (UTC)
	(envelope-from mandree@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E64378FC13;
	Tue,  4 Oct 2011 21:58:09 +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 p94Lw9pK082534;
	Tue, 4 Oct 2011 21:58:09 GMT
	(envelope-from mandree@repoman.freebsd.org)
Received: (from mandree@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p94Lw9YI082533;
	Tue, 4 Oct 2011 21:58:09 GMT (envelope-from mandree)
Message-Id: <201110042158.p94Lw9YI082533@repoman.freebsd.org>
From: Matthias Andree <mandree@FreeBSD.org>
Date: Tue, 4 Oct 2011 21:58:09 +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/security/openvpn Makefile ports/security/openvpn20
 Makefile
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: Tue, 04 Oct 2011 21:58:10 -0000

mandree     2011-10-04 21:58:09 UTC

  FreeBSD ports repository

  Modified files:
    security/openvpn     Makefile 
    security/openvpn20   Makefile 
  Log:
  Update and demote CONFLICTS to CONFLICTS_INSTALL.
  
  Revision  Changes    Path
  1.58      +1 -1      ports/security/openvpn/Makefile
  1.49      +1 -1      ports/security/openvpn20/Makefile