ports/95846: Maintainer Update of devel/lua50-compat51 and net/luasocket to add CONFLICTS

[Andrew Turner]

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