From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jan 13 15:30:15 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7BCED106567D for ; Fri, 13 Jan 2012 15:30:15 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 51DB28FC13 for ; Fri, 13 Jan 2012 15:30:15 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q0DFUFdw010761 for ; Fri, 13 Jan 2012 15:30:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q0DFUF4N010758; Fri, 13 Jan 2012 15:30:15 GMT (envelope-from gnats) Resent-Date: Fri, 13 Jan 2012 15:30:15 GMT Resent-Message-Id: <201201131530.q0DFUF4N010758@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Barbara Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AAFB4106566C for ; Fri, 13 Jan 2012 15:25:14 +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 7A30E8FC15 for ; Fri, 13 Jan 2012 15:25:14 +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 q0DFPEwr048605 for ; Fri, 13 Jan 2012 15:25:14 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id q0DFPEAF048603; Fri, 13 Jan 2012 15:25:14 GMT (envelope-from nobody) Message-Id: <201201131525.q0DFPEAF048603@red.freebsd.org> Date: Fri, 13 Jan 2012 15:25:14 GMT From: Barbara To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/164085: games/linux-enemyterritory-omni-bot-0660: install to different directories removing conflict with current version X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jan 2012 15:30:15 -0000 >Number: 164085 >Category: ports >Synopsis: games/linux-enemyterritory-omni-bot-0660: install to different directories removing conflict with current version >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:14 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@satanasso.local.net:/usr/obj/usr/src/sys/SATANASSO i386 >Description: The patch add the "-0660" suffix to directories and to scripts in ${LOCALBASE}/bin. After that it's possible to have both linux-enemyterritory-omni-bot* ports installed, so the CONFLICTS line is removed. >How-To-Repeat: >Fix: Patch attached with submission follows: --- Makefile.orig 2012-01-10 22:44:14.000000000 +0100 +++ Makefile 2012-01-13 03:02:17.000000000 +0100 @@ -7,6 +7,7 @@ PORTNAME= omni-bot PORTVERSION= 0.660 +PORTREVISION= 1 CATEGORIES= games linux MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= alepulver @@ -18,15 +19,16 @@ RUN_DEPENDS= et:${PORTSDIR}/games/linux-enemyterritory -CONFLICTS= linux-enemyterritory-omni-bot-0.[7-9]* -NO_LATEST_LINK= yes +VERSTR= ${PORTVERSION:C/([0-9])\.([0-9]+)/\1\2/} +PKGNAMESUFFIX= -${VERSTR} +PLIST_SUB= VERSTR="${VERSTR}" USE_ZIP= yes USE_LINUX= yes NO_WRKSUBDIR= yes -DATADIR= ${PREFIX}/lib/enemyterritory/${PORTNAME} -DOCSDIR= ${PREFIX}/share/doc/enemyterritory-${PORTNAME} +DATADIR= ${PREFIX}/lib/enemyterritory/${PORTNAME}-${VERSTR} +DOCSDIR= ${PREFIX}/share/doc/enemyterritory-${PORTNAME}-${VERSTR} do-build: .for f in et etded @@ -37,7 +39,8 @@ do-install: .for f in et etded - ${INSTALL_SCRIPT} ${WRKSRC}/${f}-${PORTNAME} ${PREFIX}/bin + ${MV} ${WRKSRC}/${f}-${PORTNAME} ${WRKSRC}/${f}-${PORTNAME}-${VERSTR} + ${INSTALL_SCRIPT} ${WRKSRC}/${f}-${PORTNAME}-${VERSTR} ${PREFIX}/bin .endfor ${MKDIR} ${DATADIR} ${INSTALL_PROGRAM} ${WRKSRC}/omni-bot/omnibot_et.so ${DATADIR} --- pkg-plist.orig 2009-03-24 22:03:29.000000000 +0100 +++ pkg-plist 2012-01-12 05:05:26.000000000 +0100 @@ -1,5 +1,5 @@ -bin/et-omni-bot -bin/etded-omni-bot +bin/et-omni-bot-%%VERSTR%% +bin/etded-omni-bot-%%VERSTR%% %%DATADIR%%/et/nav/et_custom.zip %%DATADIR%%/et/nav/et_official.zip %%DATADIR%%/et/scripts/ammo_goal.gm >Release-Note: >Audit-Trail: >Unformatted: