ports/164087: games/linux-enemyterritory-omni-bot:remove conflict with games/linux-enemyterritory-omni-bot-0660

[Barbara]

>Number:         164087
>Category:       ports
>Synopsis:       games/linux-enemyterritory-omni-bot:remove conflict with games/linux-enemyterritory-omni-bot-0660
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 13 15:30:15 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Barbara
>Release:        RELENG_9
>Organization:
>Environment:
FreeBSD satanasso.local.net 9.0-STABLE FreeBSD 9.0-STABLE #0: Sun Jan  8 00:49:01 CET 2012     root at satanasso.local.net:/usr/obj/usr/src/sys/SATANASSO  i386

>Description:
This patch could be applied after the patch for games/linux-enemyterritory-omni-bot-0660, which appends a suffix to directories and scripts to avoid CONFLICTS.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- Makefile.orig	2011-12-03 19:54:00.000000000 +0100
+++ Makefile	2012-01-13 02:08:15.000000000 +0100
@@ -7,6 +7,7 @@
 
 PORTNAME=	omni-bot
 PORTVERSION=	0.810
+PORTREVISION=	1
 CATEGORIES=	games linux
 MASTER_SITES=	http://www.omni-bot.com/forum/downloads/
 PKGNAMEPREFIX=	linux-enemyterritory-
@@ -17,8 +18,6 @@
 
 RUN_DEPENDS=	et:${PORTSDIR}/games/linux-enemyterritory
 
-CONFLICTS=	linux-enemyterritory-omni-bot-0.[1-6]*
-
 USE_ZIP=	yes
 USE_LINUX=	yes
 NO_WRKSUBDIR=	yes


>Release-Note:
>Audit-Trail:
>Unformatted: