From owner-cvs-all@FreeBSD.ORG  Fri Apr 18 09:38:32 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 86FE71065675;
	Fri, 18 Apr 2008 09:38:32 +0000 (UTC)
	(envelope-from beech@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 505108FC1C;
	Fri, 18 Apr 2008 09:38:32 +0000 (UTC)
	(envelope-from beech@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 m3I9cWMp078605;
	Fri, 18 Apr 2008 09:38:32 GMT
	(envelope-from beech@repoman.freebsd.org)
Received: (from beech@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3I9cWlt078604;
	Fri, 18 Apr 2008 09:38:32 GMT (envelope-from beech)
Message-Id: <200804180938.m3I9cWlt078604@repoman.freebsd.org>
From: Beech Rintoul <beech@FreeBSD.org>
Date: Fri, 18 Apr 2008 09:38:32 +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/ftp/proftpd Makefile ports/ftp/proftpd-devel
 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, 18 Apr 2008 09:38:32 -0000

beech       2008-04-18 09:38:32 UTC

  FreeBSD ports repository

  Modified files:
    ftp/proftpd          Makefile 
    ftp/proftpd-devel    Makefile 
  Log:
  - Add conflicts
  
  Revision  Changes    Path
  1.137     +2 -0      ports/ftp/proftpd-devel/Makefile
  1.134     +2 -0      ports/ftp/proftpd/Makefile