diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2015-12-29 17:50:14 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2015-12-29 17:50:14 +0000 |
| commit | 76953da02cd9469633587ed772cb2f0b9d4c70f7 (patch) | |
| tree | 9d06921348e38ab99d850ca80cacd9efd5bae7df /editors | |
| parent | 5dc918f30b10935e83fc4db228c4dcd7ad75412d (diff) | |
- Fix conflicts between linux-sublime and linux-sublime3
Approved by: portmgr blanket
Notes
Notes:
svn path=/head/; revision=404770
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/linux-sublime/Makefile | 2 | ||||
| -rw-r--r-- | editors/linux-sublime3/Makefile | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/editors/linux-sublime/Makefile b/editors/linux-sublime/Makefile index 1db31eda3d88..da1952ef52d0 100644 --- a/editors/linux-sublime/Makefile +++ b/editors/linux-sublime/Makefile @@ -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 diff --git a/editors/linux-sublime3/Makefile b/editors/linux-sublime3/Makefile index 42f650ed304a..7f8b58393ce8 100644 --- a/editors/linux-sublime3/Makefile +++ b/editors/linux-sublime3/Makefile @@ -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 |