svn commit: r313966 - in head/sysutils: linux-f10-procps linux-procps

[Rene Ladan]

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 at 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 at 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