From owner-cvs-all@FreeBSD.ORG  Fri Jun  8 21:33:55 2012
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id AEB20106564A;
	Fri,  8 Jun 2012 21:33:55 +0000 (UTC)
	(envelope-from sylvio@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7FD368FC15;
	Fri,  8 Jun 2012 21:33:55 +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 q58LXt2Q014047;
	Fri, 8 Jun 2012 21:33:55 GMT
	(envelope-from sylvio@repoman.freebsd.org)
Received: (from sylvio@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id q58LXtiT014046;
	Fri, 8 Jun 2012 21:33:55 GMT (envelope-from sylvio)
Message-Id: <201206082133.q58LXtiT014046@repoman.freebsd.org>
From: Sylvio Cesar Teixeira <sylvio@FreeBSD.org>
Date: Fri, 8 Jun 2012 21:33:55 +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/net-mgmt/argus3 Makefile
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the entire tree
	<cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Jun 2012 21:33:55 -0000

sylvio      2012-06-08 21:33:55 UTC

  FreeBSD ports repository

  Modified files:
    net-mgmt/argus3      Makefile 
  Log:
  - Fix a CONFLICTS knob
  
  PR:             ports/168749
  Submitted by:   Alexander Demin <support@spectrum.ru> (maintainer)
  
  Revision  Changes    Path
  1.6       +1 -1      ports/net-mgmt/argus3/Makefile