From nobody@FreeBSD.org  Fri Jan 13 15:29:58 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B1E45106567C
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 13 Jan 2012 15:29:58 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 978E58FC17
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 13 Jan 2012 15:29:58 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q0DFTw4M049314
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 13 Jan 2012 15:29:58 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id q0DFTwgj049313;
	Fri, 13 Jan 2012 15:29:58 GMT
	(envelope-from nobody)
Message-Id: <201201131529.q0DFTwgj049313@red.freebsd.org>
Date: Fri, 13 Jan 2012 15:29:58 GMT
From: Barbara <barbara.xxx1975@libero.it>
To: freebsd-gnats-submit@FreeBSD.org
Subject: games/linux-enemyterritory-omni-bot:remove conflict with games/linux-enemyterritory-omni-bot-0660
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>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:    rene
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 13 15:30:15 UTC 2012
>Closed-Date:    Tue Jan 24 21:36:31 UTC 2012
>Last-Modified:  Tue Jan 24 21:40:06 UTC 2012
>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@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:
Responsible-Changed-From-To: freebsd-ports-bugs->rene 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Jan 13 15:30:49 UTC 2012 
Responsible-Changed-Why:  
rene@ wants his PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=164087 
State-Changed-From-To: open->closed 
State-Changed-By: rene 
State-Changed-When: Tue Jan 24 21:36:15 UTC 2012 
State-Changed-Why:  
Committed, thanks 

http://www.freebsd.org/cgi/query-pr.cgi?pr=164087 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/164087: commit references a PR
Date: Tue, 24 Jan 2012 21:31:50 +0000 (UTC)

 rene        2012-01-24 21:31:36 UTC
 
   FreeBSD ports repository
 
   Modified files:
     games/linux-enemyterritory-omni-bot Makefile 
   Log:
   - Remove conflict with games/linux-enemyterritory-omni-bot-0660
   - Bump PORTREVISION
   PR:             ports/164087
   Submitted by:   Barbara
   
   Revision  Changes    Path
   1.18      +1 -2      ports/games/linux-enemyterritory-omni-bot/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
