From owner-svn-ports-all@FreeBSD.ORG  Tue Mar 12 11:00:39 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 617C6D94;
 Tue, 12 Mar 2013 11:00:39 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3C70CBF8;
 Tue, 12 Mar 2013 11:00:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2CB0dPZ044897;
 Tue, 12 Mar 2013 11:00:39 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2CB0c7U044895;
 Tue, 12 Mar 2013 11:00:38 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201303121100.r2CB0c7U044895@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Tue, 12 Mar 2013 11:00:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r313966 - in head/sysutils: linux-f10-procps linux-procps
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Mar 2013 11:00:39 -0000

Author: rene
Date: Tue Mar 12 11:00:38 2013
New Revision: 313966
URL: http://svnweb.freebsd.org/changeset/ports/313966

Log:
  - Register mutual conflicts.
  - Trim Makefile header for linux-procps.

Modified:
  head/sysutils/linux-f10-procps/Makefile
  head/sysutils/linux-procps/Makefile

Modified: head/sysutils/linux-f10-procps/Makefile
==============================================================================
--- head/sysutils/linux-f10-procps/Makefile	Tue Mar 12 10:48:35 2013	(r313965)
+++ head/sysutils/linux-f10-procps/Makefile	Tue Mar 12 11:00:38 2013	(r313966)
@@ -10,6 +10,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-${R
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Linux psproc binaries (Linux Fedora 10)
 
+CONFLICTS=	linux-procps-[0-9]*
+
 USE_LINUX_RPM=	yes
 ONLY_FOR_ARCHS=	i386 amd64
 LINUX_DIST_VER=	10

Modified: head/sysutils/linux-procps/Makefile
==============================================================================
--- head/sysutils/linux-procps/Makefile	Tue Mar 12 10:48:35 2013	(r313965)
+++ head/sysutils/linux-procps/Makefile	Tue Mar 12 11:00:38 2013	(r313966)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	linux-procps
-# Date created:				2007-04-04
-# Whom:					leres
-#
+# Created by: leres
 # $FreeBSD$
-#
 
 PORTNAME=	procps
 PORTVERSION=	3.2.5
@@ -14,6 +10,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-6.4
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Linux psproc binaries
 
+CONFLICTS=	linux-f10-procps-[0-9]*
+
 # EXPIRATION_DATE is the EoL of the last 7.x release
 EXPIRATION_DATE=2013-02-28
 USE_LINUX_RPM=	yes