From owner-cvs-all@FreeBSD.ORG  Fri Jan  4 15:56:15 2008
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2F71616A418;
	Fri,  4 Jan 2008 15:56:15 +0000 (UTC)
	(envelope-from arved@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0918F13C458;
	Fri,  4 Jan 2008 15:56:15 +0000 (UTC)
	(envelope-from arved@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m04FuEAc013677;
	Fri, 4 Jan 2008 15:56:14 GMT
	(envelope-from arved@repoman.freebsd.org)
Received: (from arved@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m04FuEvP013676;
	Fri, 4 Jan 2008 15:56:14 GMT (envelope-from arved)
Message-Id: <200801041556.m04FuEvP013676@repoman.freebsd.org>
From: Tilman Linneweh <arved@FreeBSD.org>
Date: Fri, 4 Jan 2008 15:56:14 +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/kgpg 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: Fri, 04 Jan 2008 15:56:15 -0000

arved       2008-01-04 15:56:14 UTC

  FreeBSD ports repository

  Modified files:
    security/kgpg        Makefile 
  Log:
  Adjust conflicts
  
  PR:             118860
  Submitted by:   Anatoly Borodin <anatoly.borodin@gmail.com>
  
  Revision  Changes    Path
  1.22      +1 -1      ports/security/kgpg/Makefile