From owner-cvs-all@FreeBSD.ORG  Thu Dec 21 15:13:49 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 [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id D6E3216A40F;
	Thu, 21 Dec 2006 15:13:49 +0000 (UTC)
	(envelope-from lofi@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id B0CFD13C442;
	Thu, 21 Dec 2006 15:13:49 +0000 (UTC)
	(envelope-from lofi@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 kBLFDnh5043968;
	Thu, 21 Dec 2006 15:13:49 GMT
	(envelope-from lofi@repoman.freebsd.org)
Received: (from lofi@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBLFDnFi043967;
	Thu, 21 Dec 2006 15:13:49 GMT (envelope-from lofi)
Message-Id: <200612211513.kBLFDnFi043967@repoman.freebsd.org>
From: Michael Nottebrock <lofi@FreeBSD.org>
Date: Thu, 21 Dec 2006 15:13: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/security/gnupg-devel Makefile ports/security/gnupg
 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: Thu, 21 Dec 2006 15:13:49 -0000

lofi        2006-12-21 15:13:49 UTC

  FreeBSD ports repository

  Modified files:
    security/gnupg-devel Makefile 
    security/gnupg       Makefile 
  Log:
  gnupg-devel and gnupg-2.x conflict.
  
  Revision  Changes    Path
  1.35      +2 -0      ports/security/gnupg-devel/Makefile
  1.95      +2 -0      ports/security/gnupg/Makefile