From owner-cvs-all@FreeBSD.ORG  Sun Nov  5 05:58:02 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 BDF6316A407;
	Sun,  5 Nov 2006 05:58:02 +0000 (UTC)
	(envelope-from alepulver@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4F46243D4C;
	Sun,  5 Nov 2006 05:58:02 +0000 (GMT)
	(envelope-from alepulver@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 kA55w2Pg070317;
	Sun, 5 Nov 2006 05:58:02 GMT
	(envelope-from alepulver@repoman.freebsd.org)
Received: (from alepulver@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA55w2X0070316;
	Sun, 5 Nov 2006 05:58:02 GMT (envelope-from alepulver)
Message-Id: <200611050558.kA55w2X0070316@repoman.freebsd.org>
From: Alejandro Pulver <alepulver@FreeBSD.org>
Date: Sun, 5 Nov 2006 05:58:02 +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/dns/nsd 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: Sun, 05 Nov 2006 05:58:02 -0000

alepulver    2006-11-05 05:58:02 UTC

  FreeBSD ports repository

  Modified files:
    dns/nsd              Makefile 
  Log:
  - Add CONFLICTS with dns/nsd2.
  
  Revision  Changes    Path
  1.31      +2 -0      ports/dns/nsd/Makefile