From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Apr 16 01:50:18 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E32C916A402 for ; Sun, 16 Apr 2006 01:50:17 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 234D043D49 for ; Sun, 16 Apr 2006 01:50:17 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k3G1oGgC099816 for ; Sun, 16 Apr 2006 01:50:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k3G1oGgv099815; Sun, 16 Apr 2006 01:50:16 GMT (envelope-from gnats) Resent-Date: Sun, 16 Apr 2006 01:50:16 GMT Resent-Message-Id: <200604160150.k3G1oGgv099815@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, Andrew Turner Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D5E7516A402 for ; Sun, 16 Apr 2006 01:49:00 +0000 (UTC) (envelope-from andrew@fubar.geek.nz) Received: from mta205-rme.xtra.co.nz (mta205-rme.xtra.co.nz [210.86.15.187]) by mx1.FreeBSD.org (Postfix) with ESMTP id E6B7343D48 for ; Sun, 16 Apr 2006 01:48:59 +0000 (GMT) (envelope-from andrew@fubar.geek.nz) Received: from mta1-rme.xtra.co.nz ([210.86.15.192]) by mta205-rme.xtra.co.nz with ESMTP id <20060416014857.UXUH15681.mta205-rme.xtra.co.nz@mta1-rme.xtra.co.nz> for ; Sun, 16 Apr 2006 13:48:57 +1200 Received: from serv.int.fubar.geek.nz ([222.153.89.79]) by mta1-rme.xtra.co.nz with ESMTP id <20060416014857.ZVHF28130.mta1-rme.xtra.co.nz@serv.int.fubar.geek.nz> for ; Sun, 16 Apr 2006 13:48:57 +1200 Received: by serv.int.fubar.geek.nz (Postfix, from userid 1001) id D78986152; Sun, 16 Apr 2006 13:48:55 +1200 (NZST) Message-Id: <20060416014855.D78986152@serv.int.fubar.geek.nz> Date: Sun, 16 Apr 2006 13:48:55 +1200 (NZST) From: Andrew Turner To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: andrew+ports@fubar.geek.nz Subject: ports/95846: Maintainer Update of devel/lua50-compat51 and net/luasocket to add CONFLICTS X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Andrew Turner List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Apr 2006 01:50:18 -0000 >Number: 95846 >Category: ports >Synopsis: Maintainer Update of devel/lua50-compat51 and net/luasocket to add CONFLICTS >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Apr 16 01:50:16 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Andrew Turner >Release: FreeBSD 5.4-STABLE i386 >Organization: none >Environment: System: FreeBSD serv.int.fubar.geek.nz 5.4-STABLE FreeBSD 5.4-STABLE #9: Sun Jan 29 12:45:34 NZDT 2006 root@serv.int.fubar.geek.nz:/usr/obj/srctrees/RELENG_5/sys/GENERIC i386 >Description: devel/lua50-compat51 and net/luasocket both install ${PREFIX}/share/lua/5.0/compat-5.1.lua The attached patch fixes both to conflict with each other. This is just until I fix the net/luasocket port to work with devel/lua50-compat51. >How-To-Repeat: >Fix: --- ports-lua-conflicts.diff begins here --- Index: devel/lua50-compat51/Makefile =================================================================== RCS file: /cvsroot/ports/devel/lua50-compat51/Makefile,v retrieving revision 1.1 diff -u -3 -p -r1.1 Makefile --- devel/lua50-compat51/Makefile 15 Apr 2006 16:54:48 -0000 1.1 +++ devel/lua50-compat51/Makefile 16 Apr 2006 00:36:05 -0000 @@ -16,6 +16,8 @@ COMMENT= Lua 5.1 package compatibility l BUILD_DEPENDS= ${LOCALBASE}/include/lua.h:${PORTSDIR}/lang/lua +CONFLICTS= luasocket-* + # Update these values when there is a new release CVER= 5.1 CREV= r5 Index: net/luasocket/Makefile =================================================================== RCS file: /cvsroot/ports/net/luasocket/Makefile,v retrieving revision 1.5 diff -u -3 -p -r1.5 Makefile --- net/luasocket/Makefile 26 Mar 2006 13:43:34 -0000 1.5 +++ net/luasocket/Makefile 16 Apr 2006 01:40:01 -0000 @@ -17,6 +17,8 @@ BUILD_DEPENDS= ${LOCALBASE}/include/lua. USE_GMAKE= yes +CONFLICTS= lua50-compat51-* + post-extract: @ ${MV} ${WRKSRC}/makefile ${WRKSRC}/Makefile @ ${RM} ${WRKSRC}/src/compat-5.1r4/compat-5.1.o --- ports-lua-conflicts.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: