4 files changed, 61 insertions, 41 deletions

diff --git a/java/intellij/Makefile b/java/intellij/Makefile
index 5b55393e3d3a..dc4839956ecf 100644
--- a/java/intellij/Makefile
+++ b/java/intellij/Makefile
@@ -5,7 +5,7 @@
 # Vadim Zhukov <zhuk@openbsd.org>
 
 PORTNAME=	intellij
-PORTVERSION=	2016.1.3
+PORTVERSION=	2016.2
 CATEGORIES=	java devel
 MASTER_SITES=	https://download.jetbrains.com/idea/ \
 		http://download.jetbrains.com/idea/
@@ -25,7 +25,7 @@ JAVA_VERSION=	1.7+
 NO_ARCH=	yes
 NO_BUILD=	yes
 
-WRKDIST=	${WRKDIR}/idea-IC-145.1617.8
+WRKDIST=	${WRKDIR}/idea-IC-162.1121.32
 
 .include "common.mk"
 
diff --git a/java/intellij/distinfo b/java/intellij/distinfo
index 92720c70e27f..0eb475d1ee93 100644
--- a/java/intellij/distinfo
+++ b/java/intellij/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1465227325
-SHA256 (ideaIC-2016.1.3.tar.gz) = d1cd3f9fd650c00ba85181da6d66b4b80b8e48ce5f4f15b5f4dc67453e96a179
-SIZE (ideaIC-2016.1.3.tar.gz) = 317001830
+TIMESTAMP = 1468350913
+SHA256 (ideaIC-2016.2.tar.gz) = 6270c2feae18e10a790d7dda0ab5fed929e353ef41cb016560f7878101259d98
+SIZE (ideaIC-2016.2.tar.gz) = 333652005
diff --git a/java/intellij/files/pkg-message.in b/java/intellij/files/pkg-message.in
index 79346fb43909..a9e30976e1cc 100644
--- a/java/intellij/files/pkg-message.in
+++ b/java/intellij/files/pkg-message.in
@@ -6,3 +6,7 @@ trees.  To enable edit %%IDEA_HOME%%/bin/idea.properties and append
       idea.filewatcher.executable.path=%%IDEA_HOME%%/bin/fsnotifier
 
 Only enable fsnotifier if your projects have < 600 files.
+
+At systems which use links for /usr/home/user or /home/user apparently
+IDEA finds two different VCS roots while trying to integrate with Git.
+Please, use as a VCS root only one of them.
diff --git a/java/intellij/pkg-plist b/java/intellij/pkg-plist
index b7dcc690b42e..600a17ef53cc 100644
--- a/java/intellij/pkg-plist
+++ b/java/intellij/pkg-plist
@@ -75,7 +75,6 @@ share/applications/idea.desktop
 %%IDEA_HOME%%/lib/asm-all.jar
 %%IDEA_HOME%%/lib/asm-commons.jar
 %%IDEA_HOME%%/lib/asm.jar
-%%IDEA_HOME%%/lib/asm4-all.jar
 %%IDEA_HOME%%/lib/automaton.jar
 %%IDEA_HOME%%/lib/batik-all.jar
 %%IDEA_HOME%%/lib/boot.jar
@@ -122,14 +121,13 @@ share/applications/idea.desktop
 %%IDEA_HOME%%/lib/jps-builders.jar
 %%IDEA_HOME%%/lib/jps-launcher.jar
 %%IDEA_HOME%%/lib/jps-model.jar
-%%IDEA_HOME%%/lib/jsch-0.1.52.jar
+%%IDEA_HOME%%/lib/jsch-0.1.53.jar
 %%IDEA_HOME%%/lib/jsch.agentproxy.connector-factory.jar
 %%IDEA_HOME%%/lib/jsch.agentproxy.core.jar
 %%IDEA_HOME%%/lib/jsch.agentproxy.pageant.jar
 %%IDEA_HOME%%/lib/jsch.agentproxy.sshagent.jar
 %%IDEA_HOME%%/lib/jsch.agentproxy.usocket-jna.jar
 %%IDEA_HOME%%/lib/jsch.agentproxy.usocket-nc.jar
-%%IDEA_HOME%%/lib/jsr166e.jar
 %%IDEA_HOME%%/lib/jsr173_1.0_api.jar
 %%IDEA_HOME%%/lib/junit-4.12.jar
 %%IDEA_HOME%%/lib/junit.jar
@@ -143,14 +141,14 @@ share/applications/idea.desktop
 %%IDEA_HOME%%/lib/miglayout-swing.jar
 %%IDEA_HOME%%/lib/nanoxml-2.2.3.jar
 %%IDEA_HOME%%/lib/nekohtml-1.9.14.jar
-%%IDEA_HOME%%/lib/netty-all-4.1.0.CR7.jar
+%%IDEA_HOME%%/lib/netty-all-4.1.1.Final.jar
 %%IDEA_HOME%%/lib/openapi.jar
 %%IDEA_HOME%%/lib/optimizedFileManager.jar
 %%IDEA_HOME%%/lib/oromatcher.jar
 %%IDEA_HOME%%/lib/picocontainer.jar
 %%IDEA_HOME%%/lib/protobuf-2.5.0.jar
 %%IDEA_HOME%%/lib/proxy-vole_20131209.jar
-%%IDEA_HOME%%/lib/pty4j-0.6.jar
+%%IDEA_HOME%%/lib/pty4j-0.7.1.jar
 %%IDEA_HOME%%/lib/purejavacomm.jar
 %%IDEA_HOME%%/lib/resolver.jar
 %%IDEA_HOME%%/lib/resources.jar
@@ -164,6 +162,7 @@ share/applications/idea.desktop
 %%IDEA_HOME%%/lib/slf4j-api-1.7.10.jar
 %%IDEA_HOME%%/lib/slf4j-log4j12-1.7.10.jar
 %%IDEA_HOME%%/lib/snappy-in-java-0.3.1.jar
+%%IDEA_HOME%%/lib/sqlite-jdbc-3.6.20.1.jar
 %%IDEA_HOME%%/lib/src/trove4j_src.jar
 %%IDEA_HOME%%/lib/swingx-core-1.6.2.jar
 %%IDEA_HOME%%/lib/trang-core.jar
@@ -218,7 +217,6 @@ share/applications/idea.desktop
 %%IDEA_HOME%%/plugins/Groovy/lib/groovy-rt-constants.jar
 %%IDEA_HOME%%/plugins/Groovy/lib/groovy-starter.conf
 %%IDEA_HOME%%/plugins/Groovy/lib/groovy_rt.jar
-%%IDEA_HOME%%/plugins/Groovy/lib/standardDsls/bindableTransform.gdsl
 %%IDEA_HOME%%/plugins/Groovy/lib/standardDsls/categoryTransform.gdsl
 %%IDEA_HOME%%/plugins/Groovy/lib/standardDsls/closuresInMethod.gdsl
 %%IDEA_HOME%%/plugins/Groovy/lib/standardDsls/defaultMethods.gdsl
@@ -229,7 +227,6 @@ share/applications/idea.desktop
 %%IDEA_HOME%%/plugins/Groovy/lib/standardDsls/metaDsl.gdsl
 %%IDEA_HOME%%/plugins/Groovy/lib/standardDsls/newifyTransform.gdsl
 %%IDEA_HOME%%/plugins/Groovy/lib/standardDsls/singletonTransform.gdsl
-%%IDEA_HOME%%/plugins/Groovy/lib/standardDsls/vetoableTransform.gdsl
 %%IDEA_HOME%%/plugins/IntelliLang/lib/IntelliLang.jar
 %%IDEA_HOME%%/plugins/IntelliLang/lib/intellilang-jps-plugin.jar
 %%IDEA_HOME%%/plugins/Kotlin/kotlinc/bin/kotlin
@@ -241,8 +238,9 @@ share/applications/idea.desktop
 %%IDEA_HOME%%/plugins/Kotlin/kotlinc/bin/kotlinc-jvm.bat
 %%IDEA_HOME%%/plugins/Kotlin/kotlinc/bin/kotlinc.bat
 %%IDEA_HOME%%/plugins/Kotlin/kotlinc/build.txt
-%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/android-compiler-plugin.jar
+%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/android-extensions-compiler.jar
 %%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-ant.jar
+%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-build-common-test.jar
 %%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-build-common.jar
 %%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-compiler.jar
 %%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-daemon-client.jar
@@ -265,6 +263,7 @@ share/applications/idea.desktop
 %%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/third_party/pcollections_LICENSE.txt
 %%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/third_party/prototype_license.txt
 %%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/third_party/rhino_LICENSE.txt
+%%IDEA_HOME%%/plugins/Kotlin/lib/android-lint.jar
 %%IDEA_HOME%%/plugins/Kotlin/lib/javax.inject.jar
 %%IDEA_HOME%%/plugins/Kotlin/lib/jps/kotlin-jps-plugin.jar
 %%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-android-extensions-compiler-plugin.jar
@@ -279,15 +278,19 @@ share/applications/idea.desktop
 %%IDEA_HOME%%/plugins/android/lib/android.jar
 %%IDEA_HOME%%/plugins/android/lib/androidAnnotations.jar
 %%IDEA_HOME%%/plugins/android/lib/androidWidgets/theme-editor-widgets.jar
+%%IDEA_HOME%%/plugins/android/lib/antlr4-annotations-4.5.jar
+%%IDEA_HOME%%/plugins/android/lib/antlr4-runtime-4.5.jar
 %%IDEA_HOME%%/plugins/android/lib/asm-5.0.3.jar
 %%IDEA_HOME%%/plugins/android/lib/asm-analysis-5.0.3.jar
 %%IDEA_HOME%%/plugins/android/lib/asm-tree-5.0.3.jar
 %%IDEA_HOME%%/plugins/android/lib/bcpkix-jdk15on-1.48.jar
 %%IDEA_HOME%%/plugins/android/lib/bcprov-jdk15on-1.48.jar
-%%IDEA_HOME%%/plugins/android/lib/builder-model-1.4.0-beta2.jar
 %%IDEA_HOME%%/plugins/android/lib/builder-model-1.5.0-beta2.jar
+%%IDEA_HOME%%/plugins/android/lib/builder-model-2.0.0-alpha7.jar
 %%IDEA_HOME%%/plugins/android/lib/common.jar
 %%IDEA_HOME%%/plugins/android/lib/commons-compress-1.0.jar
+%%IDEA_HOME%%/plugins/android/lib/commons-io-2.4.jar
+%%IDEA_HOME%%/plugins/android/lib/data-binding.jar
 %%IDEA_HOME%%/plugins/android/lib/device-art-resources/device-art.xml
 %%IDEA_HOME%%/plugins/android/lib/device-art-resources/galaxy_nexus/land_back.png
 %%IDEA_HOME%%/plugins/android/lib/device-art-resources/galaxy_nexus/land_fore.png
@@ -438,13 +441,16 @@ share/applications/idea.desktop
 %%IDEA_HOME%%/plugins/android/lib/freemarker-2.3.20.jar
 %%IDEA_HOME%%/plugins/android/lib/jarutils.jar
 %%IDEA_HOME%%/plugins/android/lib/javawriter-2.2.1.jar
+%%IDEA_HOME%%/plugins/android/lib/jgraphx-3.4.0.1.jar
 %%IDEA_HOME%%/plugins/android/lib/jps/android-gradle-jps.jar
 %%IDEA_HOME%%/plugins/android/lib/jps/android-jps-plugin.jar
 %%IDEA_HOME%%/plugins/android/lib/jsr305-1.3.9.jar
+%%IDEA_HOME%%/plugins/android/lib/juniversalchardet-1.0.3.jar
 %%IDEA_HOME%%/plugins/android/lib/kxml2-2.3.0.jar
 %%IDEA_HOME%%/plugins/android/lib/layoutlib-api.jar
 %%IDEA_HOME%%/plugins/android/lib/lombok-ast-0.2.3.jar
 %%IDEA_HOME%%/plugins/android/lib/manifest-merger.jar
+%%IDEA_HOME%%/plugins/android/lib/repository.jar
 %%IDEA_HOME%%/plugins/android/lib/resources_en.jar
 %%IDEA_HOME%%/plugins/android/lib/sdk-common.jar
 %%IDEA_HOME%%/plugins/android/lib/sdk-tools.jar
@@ -542,16 +548,16 @@ share/applications/idea.desktop
 %%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/VideoDetailsFragment.java.ftl
 %%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/template-leanback-TV.png
 %%IDEA_HOME%%/plugins/android/lib/templates/activities/AndroidTVActivity/template.xml
-%%IDEA_HOME%%/plugins/android/lib/templates/activities/BlankActivity/globals.xml.ftl
-%%IDEA_HOME%%/plugins/android/lib/templates/activities/BlankActivity/recipe.xml.ftl
-%%IDEA_HOME%%/plugins/android/lib/templates/activities/BlankActivity/recipe_fragment.xml.ftl
-%%IDEA_HOME%%/plugins/android/lib/templates/activities/BlankActivity/root/res/layout/activity_fragment_container.xml.ftl
-%%IDEA_HOME%%/plugins/android/lib/templates/activities/BlankActivity/root/res/layout/fragment_simple.xml.ftl
-%%IDEA_HOME%%/plugins/android/lib/templates/activities/BlankActivity/root/src/app_package/SimpleActivity.java.ftl
-%%IDEA_HOME%%/plugins/android/lib/templates/activities/BlankActivity/root/src/app_package/SimpleActivityFragment.ftl
-%%IDEA_HOME%%/plugins/android/lib/templates/activities/BlankActivity/template.xml
-%%IDEA_HOME%%/plugins/android/lib/templates/activities/BlankActivity/template_blank_activity.png
-%%IDEA_HOME%%/plugins/android/lib/templates/activities/BlankActivity/template_blank_activity_fragment.png
+%%IDEA_HOME%%/plugins/android/lib/templates/activities/BasicActivity/globals.xml.ftl
+%%IDEA_HOME%%/plugins/android/lib/templates/activities/BasicActivity/recipe.xml.ftl
+%%IDEA_HOME%%/plugins/android/lib/templates/activities/BasicActivity/recipe_fragment.xml.ftl
+%%IDEA_HOME%%/plugins/android/lib/templates/activities/BasicActivity/root/res/layout/activity_fragment_container.xml.ftl
+%%IDEA_HOME%%/plugins/android/lib/templates/activities/BasicActivity/root/res/layout/fragment_simple.xml.ftl
+%%IDEA_HOME%%/plugins/android/lib/templates/activities/BasicActivity/root/src/app_package/SimpleActivity.java.ftl
+%%IDEA_HOME%%/plugins/android/lib/templates/activities/BasicActivity/root/src/app_package/SimpleActivityFragment.ftl
+%%IDEA_HOME%%/plugins/android/lib/templates/activities/BasicActivity/template.xml
+%%IDEA_HOME%%/plugins/android/lib/templates/activities/BasicActivity/template_basic_activity.png
+%%IDEA_HOME%%/plugins/android/lib/templates/activities/BasicActivity/template_basic_activity_fragment.png
 %%IDEA_HOME%%/plugins/android/lib/templates/activities/BlankWearActivity/globals.xml.ftl
 %%IDEA_HOME%%/plugins/android/lib/templates/activities/BlankWearActivity/recipe.xml.ftl
 %%IDEA_HOME%%/plugins/android/lib/templates/activities/BlankWearActivity/root/AndroidManifest.xml.ftl
@@ -1443,6 +1449,7 @@ share/applications/idea.desktop
 %%IDEA_HOME%%/plugins/android/lib/templates/other/WatchFaceService/root/src/app_package/MyDigitalWatchFaceService.java.ftl
 %%IDEA_HOME%%/plugins/android/lib/templates/other/WatchFaceService/template.xml
 %%IDEA_HOME%%/plugins/android/lib/templates/other/WatchFaceService/template_thumbnail.png
+%%IDEA_HOME%%/plugins/android/lib/truth-0.28.jar
 %%IDEA_HOME%%/plugins/ant/lib/ant-jps-plugin.jar
 %%IDEA_HOME%%/plugins/ant/lib/antIntegration.jar
 %%IDEA_HOME%%/plugins/ant/lib/resources_en.jar
@@ -1477,21 +1484,21 @@ share/applications/idea.desktop
 %%IDEA_HOME%%/plugins/git4idea/lib/resources_en.jar
 %%IDEA_HOME%%/plugins/git4idea/lib/trilead-ssh2.jar
 %%IDEA_HOME%%/plugins/github/lib/github.jar
-%%IDEA_HOME%%/plugins/gradle/lib/commons-io-1.4.jar
-%%IDEA_HOME%%/plugins/gradle/lib/gradle-base-services-2.9.jar
-%%IDEA_HOME%%/plugins/gradle/lib/gradle-base-services-groovy-2.9.jar
-%%IDEA_HOME%%/plugins/gradle/lib/gradle-cli-2.9.jar
-%%IDEA_HOME%%/plugins/gradle/lib/gradle-core-2.9.jar
+%%IDEA_HOME%%/plugins/gradle/lib/commons-io-2.2.jar
+%%IDEA_HOME%%/plugins/gradle/lib/gradle-base-services-2.13.jar
+%%IDEA_HOME%%/plugins/gradle/lib/gradle-base-services-groovy-2.13.jar
+%%IDEA_HOME%%/plugins/gradle/lib/gradle-cli-2.13.jar
+%%IDEA_HOME%%/plugins/gradle/lib/gradle-core-2.13.jar
 %%IDEA_HOME%%/plugins/gradle/lib/gradle-jps-plugin.jar
-%%IDEA_HOME%%/plugins/gradle/lib/gradle-messaging-2.9.jar
-%%IDEA_HOME%%/plugins/gradle/lib/gradle-model-core-2.9.jar
-%%IDEA_HOME%%/plugins/gradle/lib/gradle-model-groovy-2.9.jar
-%%IDEA_HOME%%/plugins/gradle/lib/gradle-native-2.9.jar
-%%IDEA_HOME%%/plugins/gradle/lib/gradle-resources-2.9.jar
-%%IDEA_HOME%%/plugins/gradle/lib/gradle-tooling-api-2.9.jar
+%%IDEA_HOME%%/plugins/gradle/lib/gradle-messaging-2.13.jar
+%%IDEA_HOME%%/plugins/gradle/lib/gradle-model-core-2.13.jar
+%%IDEA_HOME%%/plugins/gradle/lib/gradle-model-groovy-2.13.jar
+%%IDEA_HOME%%/plugins/gradle/lib/gradle-native-2.13.jar
+%%IDEA_HOME%%/plugins/gradle/lib/gradle-resources-2.13.jar
+%%IDEA_HOME%%/plugins/gradle/lib/gradle-tooling-api-2.13.jar
 %%IDEA_HOME%%/plugins/gradle/lib/gradle-tooling-extension-api.jar
 %%IDEA_HOME%%/plugins/gradle/lib/gradle-tooling-extension-impl.jar
-%%IDEA_HOME%%/plugins/gradle/lib/gradle-wrapper-2.9.jar
+%%IDEA_HOME%%/plugins/gradle/lib/gradle-wrapper-2.13.jar
 %%IDEA_HOME%%/plugins/gradle/lib/gradle.jar
 %%IDEA_HOME%%/plugins/gradle/lib/guava-jdk5-17.0.jar
 %%IDEA_HOME%%/plugins/gradle/lib/jna-3.2.7.jar
@@ -1509,13 +1516,22 @@ share/applications/idea.desktop
 %%IDEA_HOME%%/plugins/java-decompiler/lib/java-decompiler.jar
 %%IDEA_HOME%%/plugins/java-i18n/lib/java-i18n.jar
 %%IDEA_HOME%%/plugins/java-i18n/lib/resources_en.jar
-%%IDEA_HOME%%/plugins/javaFX/embedder.jar
+%%IDEA_HOME%%/plugins/javaFX/lib/SceneBuilderKit-8.1.1.jar
 %%IDEA_HOME%%/plugins/javaFX/lib/common-javaFX-plugin.jar
 %%IDEA_HOME%%/plugins/javaFX/lib/javaFX-jps-plugin.jar
 %%IDEA_HOME%%/plugins/javaFX/lib/javaFX.jar
 %%IDEA_HOME%%/plugins/javaFX/lib/resources_en.jar
 %%IDEA_HOME%%/plugins/junit/lib/idea-junit.jar
+%%IDEA_HOME%%/plugins/junit/lib/junit-jupiter-api-5.0.0-M1.jar
+%%IDEA_HOME%%/plugins/junit/lib/junit-jupiter-engine-5.0.0-M1.jar
+%%IDEA_HOME%%/plugins/junit/lib/junit-platform-commons-1.0.0-M1.jar
+%%IDEA_HOME%%/plugins/junit/lib/junit-platform-engine-1.0.0-M1.jar
+%%IDEA_HOME%%/plugins/junit/lib/junit-platform-launcher-1.0.0-M1.jar
+%%IDEA_HOME%%/plugins/junit/lib/junit-platform-runner-1.0.0-M1.jar
 %%IDEA_HOME%%/plugins/junit/lib/junit-rt.jar
+%%IDEA_HOME%%/plugins/junit/lib/junit-vintage-engine-4.12.0-M1.jar
+%%IDEA_HOME%%/plugins/junit/lib/junit5-rt.jar
+%%IDEA_HOME%%/plugins/junit/lib/opentest4j-1.0.0-M1.jar
 %%IDEA_HOME%%/plugins/junit/lib/resources_en.jar
 %%IDEA_HOME%%/plugins/maven/lib/artifact-resolver-m2.jar
 %%IDEA_HOME%%/plugins/maven/lib/artifact-resolver-m3.jar
@@ -1602,9 +1618,9 @@ share/applications/idea.desktop
 %%IDEA_HOME%%/plugins/maven/lib/resources_en.jar
 %%IDEA_HOME%%/plugins/maven/lib/wadl-core.jar
 %%IDEA_HOME%%/plugins/properties/lib/properties.jar
-%%IDEA_HOME%%/plugins/settings-repository/lib/jackson-annotations-2.5.1.jar
-%%IDEA_HOME%%/plugins/settings-repository/lib/jackson-core-2.5.1.jar
-%%IDEA_HOME%%/plugins/settings-repository/lib/jackson-databind-2.5.1.jar
+%%IDEA_HOME%%/plugins/settings-repository/lib/jackson-annotations-2.7.1.jar
+%%IDEA_HOME%%/plugins/settings-repository/lib/jackson-core-2.7.1.jar
+%%IDEA_HOME%%/plugins/settings-repository/lib/jackson-databind-2.7.1-1.jar
 %%IDEA_HOME%%/plugins/settings-repository/lib/jgit.jar
 %%IDEA_HOME%%/plugins/settings-repository/lib/resources_en.jar
 %%IDEA_HOME%%/plugins/settings-repository/lib/settings-repository.jar
@@ -1647,7 +1663,7 @@ share/applications/idea.desktop
 %%IDEA_HOME%%/plugins/tasks/lib/tasks-core.jar
 %%IDEA_HOME%%/plugins/tasks/lib/tasks-java.jar
 %%IDEA_HOME%%/plugins/tasks/lib/wsdl4j-1.4.jar
-%%IDEA_HOME%%/plugins/terminal/lib/jediterm-pty-2.1.jar
+%%IDEA_HOME%%/plugins/terminal/lib/jediterm-pty-2.2.jar
 %%IDEA_HOME%%/plugins/terminal/lib/jediterm.in
 %%IDEA_HOME%%/plugins/terminal/lib/resources_en.jar
 %%IDEA_HOME%%/plugins/terminal/lib/terminal.jar