svn commit: r404770 - in head/editors: linux-sublime linux-sublime3

[Dmitry Marakasov]

Author: amdmi3
Date: Tue Dec 29 17:50:14 2015
New Revision: 404770
URL: https://svnweb.freebsd.org/changeset/ports/404770

Log:
  - Fix conflicts between linux-sublime and linux-sublime3
  
  Approved by:	portmgr blanket

Modified:
  head/editors/linux-sublime/Makefile
  head/editors/linux-sublime3/Makefile

Modified: head/editors/linux-sublime/Makefile
==============================================================================
--- head/editors/linux-sublime/Makefile	Tue Dec 29 17:48:19 2015	(r404769)
+++ head/editors/linux-sublime/Makefile	Tue Dec 29 17:50:14 2015	(r404770)
@@ -20,6 +20,8 @@ NO_BUILD=
 STRIP=		# don't strip linux binaries.
 SUB_FILES=	sublime
 
+CONFLICTS_INSTALL=	linux-sublime3-[0-9]*
+
 USE_LINUX=	c6
 USE_LINUX_APPS=	xorglibs gtk2
 

Modified: head/editors/linux-sublime3/Makefile
==============================================================================
--- head/editors/linux-sublime3/Makefile	Tue Dec 29 17:48:19 2015	(r404769)
+++ head/editors/linux-sublime3/Makefile	Tue Dec 29 17:50:14 2015	(r404770)
@@ -20,7 +20,7 @@ USE_LINUX_APPS=	xorglibs gtk2
 INSTALLS_ICONS=	yes
 WRKSRC=		${WRKDIR}/sublime_text_3
 
-CONFLICTS=	linux-sublime-[0-24-9]*
+CONFLICTS_INSTALL=	linux-sublime-[0-9]*
 
 NO_BUILD=
 SUB_FILES=	sublime