From owner-cvs-ports@FreeBSD.ORG  Sun Oct 12 04:53:32 2003
Return-Path: <owner-cvs-ports@FreeBSD.ORG>
Delivered-To: cvs-ports@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 5901116A4B3; Sun, 12 Oct 2003 04:53:32 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id CA02643FBD; Sun, 12 Oct 2003 04:53:31 -0700 (PDT)
	(envelope-from dinoex@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9CBrVXJ012627;
	Sun, 12 Oct 2003 04:53:31 -0700 (PDT)
	(envelope-from dinoex@repoman.freebsd.org)
Received: (from dinoex@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9CBrVlv012626;
	Sun, 12 Oct 2003 04:53:31 -0700 (PDT)
	(envelope-from dinoex)
Message-Id: <200310121153.h9CBrVlv012626@repoman.freebsd.org>
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Sun, 12 Oct 2003 04:53:31 -0700 (PDT)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: ports/security/openssh-portable
	Makefileports/security/openssh Makefile
X-BeenThere: cvs-ports@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the ports tree <cvs-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-ports>
List-Post: <mailto:cvs-ports@freebsd.org>
List-Help: <mailto:cvs-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 12 Oct 2003 11:53:32 -0000

dinoex      2003/10/12 04:53:31 PDT

  FreeBSD ports repository

  Modified files:
    security/openssh-portable Makefile 
    security/openssh     Makefile 
  Log:
  - add CONFLICTS
  Submitted by:   eikemeier@fillmore-labs.com
  
  Revision  Changes    Path
  1.82      +6 -2      ports/security/openssh-portable/Makefile
  1.127     +1 -0      ports/security/openssh/Makefile