From owner-cvs-all@FreeBSD.ORG  Mon May  2 08:21:30 2005
Return-Path: <owner-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 7746016A4CE; Mon,  2 May 2005 08:21:30 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 502E843D45; Mon,  2 May 2005 08:21:30 +0000 (GMT)
	(envelope-from novel@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j428LToL019253;
	Mon, 2 May 2005 08:21:30 GMT
	(envelope-from novel@repoman.freebsd.org)
Received: (from novel@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j428LTfk019252;
	Mon, 2 May 2005 08:21:29 GMT
	(envelope-from novel)
Message-Id: <200505020821.j428LTfk019252@repoman.freebsd.org>
From: Roman Bogorodskiy <novel@FreeBSD.org>
Date: Mon, 2 May 2005 08:21:28 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: ports/sysutils/psmisc Makefile
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
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: Mon, 02 May 2005 08:21:30 -0000

novel       2005-05-02 08:21:28 UTC

  FreeBSD ports repository

  Modified files:
    sysutils/psmisc      Makefile 
  Log:
  Conflicts with sysutils/pidof.
  
  Revision  Changes    Path
  1.16      +2 -1      ports/sysutils/psmisc/Makefile