Index: head/editors/linux-sublime/Makefile
===================================================================
--- head/editors/linux-sublime/Makefile	(revision 404769)
+++ head/editors/linux-sublime/Makefile	(revision 404770)
@@ -1,47 +1,49 @@
 # Created by: Johannes Meixner <xmj@chaot.net>
 # $FreeBSD$
 
 PORTNAME=	sublime
 PORTVERSION=	2.0.2
 PORTREVISION=	3
 CATEGORIES=	editors linux
 MASTER_SITES=	http://c758482.r82.cf2.rackcdn.com/
 DISTNAME=	Sublime%20Text%202.0.2
 PKGNAMEPREFIX=	linux-
 
 MAINTAINER=	xmj@chaot.net
 COMMENT=	Sublime Text is a sophisticated text editor for code, markup and prose
 
 USES=		tar:bzip2
 INSTALLS_ICONS=	yes
 WRKSRC=		${WRKDIR}/"Sublime Text 2"
 
 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
 
 post-patch:
 	${BRANDELF} -t Linux ${WRKSRC}/sublime_text
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps/
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps/
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps/
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/
 
 	@${INSTALL_DATA} ${WRKSRC}/Icon/16x16/sublime_text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps/
 	@${INSTALL_DATA} ${WRKSRC}/Icon/32x32/sublime_text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps/
 	@${INSTALL_DATA} ${WRKSRC}/Icon/48x48/sublime_text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/
 	@${INSTALL_DATA} ${WRKSRC}/Icon/128x128/sublime_text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps/
 	@${INSTALL_DATA} ${WRKSRC}/Icon/256x256/sublime_text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/
 	@${RM} -rf ${WRKSRC}/Icon/
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 	@${CHMOD} +x ${STAGEDIR}${DATADIR}/sublime_text
 	@${INSTALL} ${WRKDIR}/sublime ${STAGEDIR}${PREFIX}/bin/sublime
 
 .include <bsd.port.mk>
Index: head/editors/linux-sublime3/Makefile
===================================================================
--- head/editors/linux-sublime3/Makefile	(revision 404769)
+++ head/editors/linux-sublime3/Makefile	(revision 404770)
@@ -1,51 +1,51 @@
 # Created by: Miguel Clara <miguelmclara@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	sublime
 PORTVERSION=	3.0.83
 PORTREVISION=	1
 CATEGORIES=	editors linux
 MASTER_SITES=	http://c758482.r82.cf2.rackcdn.com/
 PKGNAMEPREFIX=	linux-
 PKGNAMESUFFIX=	3
 DISTNAME=	sublime_text_3_build_3083_x32
 
 MAINTAINER=	miguelmclara@gmail.com
 COMMENT=	Sophisticated text editor for code, markup and prose
 
 USES=		desktop-file-utils tar:bzip2
 USE_LINUX=	c6
 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
 
 post-patch:
 	${BRANDELF} -t Linux ${WRKSRC}/sublime_text
 	${BRANDELF} -t Linux ${WRKSRC}/plugin_host
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR} \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps/ \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps/ \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/ \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps/ \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/
 
 	${INSTALL_DATA} ${WRKSRC}/Icon/16x16/sublime-text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps/
 	${INSTALL_DATA} ${WRKSRC}/Icon/32x32/sublime-text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps/
 	${INSTALL_DATA} ${WRKSRC}/Icon/48x48/sublime-text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/
 	${INSTALL_DATA} ${WRKSRC}/Icon/128x128/sublime-text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps/
 	${INSTALL_DATA} ${WRKSRC}/Icon/256x256/sublime-text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/
 	${INSTALL_DATA} ${WRKSRC}/sublime_text.desktop ${STAGEDIR}${PREFIX}/share/applications/
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 	${CHMOD} +x ${STAGEDIR}${DATADIR}/sublime_text
 	${CHMOD} +x ${STAGEDIR}${DATADIR}/plugin_host
 	${INSTALL} ${WRKDIR}/sublime ${STAGEDIR}${PREFIX}/bin/sublime
 
 .include <bsd.port.mk>