From owner-cvs-all@FreeBSD.ORG  Tue Oct 31 13:40:44 2006
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id DD75816A40F;
	Tue, 31 Oct 2006 13:40:44 +0000 (UTC)
	(envelope-from mnag@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7092543D5C;
	Tue, 31 Oct 2006 13:40:44 +0000 (GMT)
	(envelope-from mnag@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9VDeisD004869;
	Tue, 31 Oct 2006 13:40:44 GMT
	(envelope-from mnag@repoman.freebsd.org)
Received: (from mnag@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9VDeiDU004868;
	Tue, 31 Oct 2006 13:40:44 GMT (envelope-from mnag)
Message-Id: <200610311340.k9VDeiDU004868@repoman.freebsd.org>
From: Marcus Alves Grando <mnag@FreeBSD.org>
Date: Tue, 31 Oct 2006 13:40:44 +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/dante Makefile ports/net/socks5 Makefile
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: 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: Tue, 31 Oct 2006 13:40:45 -0000

mnag        2006-10-31 13:40:43 UTC

  FreeBSD ports repository

  Modified files:
    net/dante            Makefile 
    net/socks5           Makefile 
  Log:
  - Add CONFLICTS because include/socks.h are included in net/dante and net/socks5 too.
  
  PR:             103649
  Approved by:    maintainer timeout (35 days)
  
  Revision  Changes    Path
  1.26      +2 -0      ports/net/dante/Makefile
  1.47      +2 -0      ports/net/socks5/Makefile