diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/intellij-ultimate/Makefile | 2 | ||||
| -rw-r--r-- | java/intellij/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/java/intellij-ultimate/Makefile b/java/intellij-ultimate/Makefile index 13430553d6fa..160fbdc2ab27 100644 --- a/java/intellij-ultimate/Makefile +++ b/java/intellij-ultimate/Makefile @@ -27,7 +27,7 @@ SHEBANG_FILES= bin/printenv.py bin/restart.py \ plugins/spy-js/server/proxy-nix.sh \ plugins/spy-js/server/proxy-osx.sh -CONFLICTS= intellij-20* +CONFLICTS= idea intellij NO_ARCH= yes NO_ARCH_IGNORE= libjansi.so diff --git a/java/intellij/Makefile b/java/intellij/Makefile index 1b202128d8be..be45a49745fe 100644 --- a/java/intellij/Makefile +++ b/java/intellij/Makefile @@ -31,7 +31,7 @@ NO_BUILD= yes WRKSRC= ${WRKDIR}/idea-IC-202.7660.26 SUB_FILES= idea idea.desktop pkg-message -CONFLICTS= intellij-ultimate +CONFLICTS= idea intellij-ultimate do-install: # Linux/Windows/OS X only so remove them |