From ba12bbbdb236a1e0e34976de8b121d9ed4943a80 Mon Sep 17 00:00:00 2001 From: zhuk Date: Mon, 1 Aug 2016 21:44:37 +0000 Subject: [PATCH] Update to devel/intellij 2016.2, and make Caspar Schutijser actual maintainer (with his agreement, of course). Caspar already put in updating this port more effort than me in this year, so it's a logical step forward. --- devel/intellij/Makefile | 8 +-- devel/intellij/distinfo | 4 +- devel/intellij/pkg/PLIST | 108 ++++++++++++++++++++++----------------- 3 files changed, 68 insertions(+), 52 deletions(-) diff --git a/devel/intellij/Makefile b/devel/intellij/Makefile index 9c21976e152..41e3c0fbb07 100644 --- a/devel/intellij/Makefile +++ b/devel/intellij/Makefile @@ -1,14 +1,14 @@ -# $OpenBSD: Makefile,v 1.36 2016/07/09 21:33:39 zhuk Exp $ +# $OpenBSD: Makefile,v 1.37 2016/08/01 21:44:37 zhuk Exp $ COMMENT= IntelliJ IDEA Java IDE -V= 2016.1.3 +V= 2016.2 DISTNAME= ideaIC-${V} PKGNAME= intellij-${V} CATEGORIES= devel HOMEPAGE= http://www.jetbrains.com/idea/ -MAINTAINER= Vadim Zhukov +MAINTAINER= Caspar Schutijser # Apache v2.0 PERMIT_PACKAGE_CDROM= Yes @@ -26,7 +26,7 @@ NO_TEST= Yes SUBST_VARS+= JAVA_HOME -WRKDIST= ${WRKDIR}/idea-IC-145.1617.8 +WRKDIST= ${WRKDIR}/idea-IC-162.1121.32 IJ= ${PREFIX}/intellij # If NO_BUILD is set, JAVA_HOME doesn't get defined. So do diff --git a/devel/intellij/distinfo b/devel/intellij/distinfo index 2cf06252804..13144db2184 100644 --- a/devel/intellij/distinfo +++ b/devel/intellij/distinfo @@ -1,2 +1,2 @@ -SHA256 (ideaIC-2016.1.3.tar.gz) = 0c0/n9ZQwAuoUYHabWa0uAuOSM5fTxW19NxnRT6WoXk= -SIZE (ideaIC-2016.1.3.tar.gz) = 317001830 +SHA256 (ideaIC-2016.2.tar.gz) = YnDC/q4Y4Qp5DX3aCrX+2SnjU+9BywFlYPeHgQElnZg= +SIZE (ideaIC-2016.2.tar.gz) = 333652005 diff --git a/devel/intellij/pkg/PLIST b/devel/intellij/pkg/PLIST index c2d9478ebb9..5660b936a06 100644 --- a/devel/intellij/pkg/PLIST +++ b/devel/intellij/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.20 2016/05/16 09:39:51 zhuk Exp $ +@comment $OpenBSD: PLIST,v 1.21 2016/08/01 21:44:37 zhuk Exp $ bin/idea bin/intellij intellij/ @@ -84,7 +84,6 @@ intellij/lib/ant/lib/libraries.properties intellij/lib/asm-all.jar intellij/lib/asm-commons.jar intellij/lib/asm.jar -intellij/lib/asm4-all.jar intellij/lib/automaton.jar intellij/lib/batik-all.jar intellij/lib/boot.jar @@ -131,14 +130,13 @@ intellij/lib/jna.jar intellij/lib/jps-builders.jar intellij/lib/jps-launcher.jar intellij/lib/jps-model.jar -intellij/lib/jsch-0.1.52.jar +intellij/lib/jsch-0.1.53.jar intellij/lib/jsch.agentproxy.connector-factory.jar intellij/lib/jsch.agentproxy.core.jar intellij/lib/jsch.agentproxy.pageant.jar intellij/lib/jsch.agentproxy.sshagent.jar intellij/lib/jsch.agentproxy.usocket-jna.jar intellij/lib/jsch.agentproxy.usocket-nc.jar -intellij/lib/jsr166e.jar intellij/lib/jsr173_1.0_api.jar intellij/lib/junit-4.12.jar intellij/lib/junit.jar @@ -158,15 +156,15 @@ intellij/lib/libpty/macosx/x86_64/ intellij/lib/libpty/macosx/x86_64/libpty.dylib intellij/lib/libpty/win/ intellij/lib/libpty/win/x86/ -intellij/lib/libpty/win/x86/libwinpty.dll intellij/lib/libpty/win/x86/winpty-agent.exe +intellij/lib/libpty/win/x86/winpty.dll intellij/lib/libpty/win/x86_64/ intellij/lib/libpty/win/x86_64/cyglaunch.exe -intellij/lib/libpty/win/x86_64/libwinpty.dll intellij/lib/libpty/win/x86_64/winpty-agent.exe +intellij/lib/libpty/win/x86_64/winpty.dll intellij/lib/libpty/win/xp/ -intellij/lib/libpty/win/xp/libwinpty.dll intellij/lib/libpty/win/xp/winpty-agent.exe +intellij/lib/libpty/win/xp/winpty.dll intellij/lib/log4j.jar intellij/lib/markdown4j-2.2.jar intellij/lib/markdownj-core-0.4.2-SNAPSHOT.jar @@ -174,14 +172,14 @@ intellij/lib/microba.jar intellij/lib/miglayout-swing.jar intellij/lib/nanoxml-2.2.3.jar intellij/lib/nekohtml-1.9.14.jar -intellij/lib/netty-all-4.1.0.CR7.jar +intellij/lib/netty-all-4.1.1.Final.jar intellij/lib/openapi.jar intellij/lib/optimizedFileManager.jar intellij/lib/oromatcher.jar intellij/lib/picocontainer.jar intellij/lib/protobuf-2.5.0.jar intellij/lib/proxy-vole_20131209.jar -intellij/lib/pty4j-0.6.jar +intellij/lib/pty4j-0.7.1.jar intellij/lib/purejavacomm.jar intellij/lib/resolver.jar intellij/lib/resources.jar @@ -196,6 +194,7 @@ intellij/lib/serviceMessages.jar intellij/lib/slf4j-api-1.7.10.jar intellij/lib/slf4j-log4j12-1.7.10.jar intellij/lib/snappy-in-java-0.3.1.jar +intellij/lib/sqlite-jdbc-3.6.20.1.jar intellij/lib/src/ intellij/lib/src/trove4j_src.jar intellij/lib/swingx-core-1.6.2.jar @@ -259,7 +258,6 @@ intellij/plugins/Groovy/lib/groovy-rt-constants.jar intellij/plugins/Groovy/lib/groovy-starter.conf intellij/plugins/Groovy/lib/groovy_rt.jar intellij/plugins/Groovy/lib/standardDsls/ -intellij/plugins/Groovy/lib/standardDsls/bindableTransform.gdsl intellij/plugins/Groovy/lib/standardDsls/categoryTransform.gdsl intellij/plugins/Groovy/lib/standardDsls/closuresInMethod.gdsl intellij/plugins/Groovy/lib/standardDsls/defaultMethods.gdsl @@ -270,7 +268,6 @@ intellij/plugins/Groovy/lib/standardDsls/listenerList.gdsl intellij/plugins/Groovy/lib/standardDsls/metaDsl.gdsl intellij/plugins/Groovy/lib/standardDsls/newifyTransform.gdsl intellij/plugins/Groovy/lib/standardDsls/singletonTransform.gdsl -intellij/plugins/Groovy/lib/standardDsls/vetoableTransform.gdsl intellij/plugins/IntelliLang/ intellij/plugins/IntelliLang/lib/ intellij/plugins/IntelliLang/lib/IntelliLang.jar @@ -288,8 +285,9 @@ intellij/plugins/Kotlin/kotlinc/bin/kotlinc-jvm.bat intellij/plugins/Kotlin/kotlinc/bin/kotlinc.bat intellij/plugins/Kotlin/kotlinc/build.txt intellij/plugins/Kotlin/kotlinc/lib/ -intellij/plugins/Kotlin/kotlinc/lib/android-compiler-plugin.jar +intellij/plugins/Kotlin/kotlinc/lib/android-extensions-compiler.jar intellij/plugins/Kotlin/kotlinc/lib/kotlin-ant.jar +intellij/plugins/Kotlin/kotlinc/lib/kotlin-build-common-test.jar intellij/plugins/Kotlin/kotlinc/lib/kotlin-build-common.jar intellij/plugins/Kotlin/kotlinc/lib/kotlin-compiler.jar intellij/plugins/Kotlin/kotlinc/lib/kotlin-daemon-client.jar @@ -315,6 +313,7 @@ intellij/plugins/Kotlin/kotlinc/license/third_party/pcollections_LICENSE.txt intellij/plugins/Kotlin/kotlinc/license/third_party/prototype_license.txt intellij/plugins/Kotlin/kotlinc/license/third_party/rhino_LICENSE.txt intellij/plugins/Kotlin/lib/ +intellij/plugins/Kotlin/lib/android-lint.jar intellij/plugins/Kotlin/lib/javax.inject.jar intellij/plugins/Kotlin/lib/jps/ intellij/plugins/Kotlin/lib/jps/kotlin-jps-plugin.jar @@ -333,15 +332,19 @@ intellij/plugins/android/lib/android.jar intellij/plugins/android/lib/androidAnnotations.jar intellij/plugins/android/lib/androidWidgets/ intellij/plugins/android/lib/androidWidgets/theme-editor-widgets.jar +intellij/plugins/android/lib/antlr4-annotations-4.5.jar +intellij/plugins/android/lib/antlr4-runtime-4.5.jar intellij/plugins/android/lib/asm-5.0.3.jar intellij/plugins/android/lib/asm-analysis-5.0.3.jar intellij/plugins/android/lib/asm-tree-5.0.3.jar intellij/plugins/android/lib/bcpkix-jdk15on-1.48.jar intellij/plugins/android/lib/bcprov-jdk15on-1.48.jar -intellij/plugins/android/lib/builder-model-1.4.0-beta2.jar intellij/plugins/android/lib/builder-model-1.5.0-beta2.jar +intellij/plugins/android/lib/builder-model-2.0.0-alpha7.jar intellij/plugins/android/lib/common.jar intellij/plugins/android/lib/commons-compress-1.0.jar +intellij/plugins/android/lib/commons-io-2.4.jar +intellij/plugins/android/lib/data-binding.jar intellij/plugins/android/lib/device-art-resources/ intellij/plugins/android/lib/device-art-resources/device-art.xml intellij/plugins/android/lib/device-art-resources/galaxy_nexus/ @@ -512,14 +515,17 @@ intellij/plugins/android/lib/device-art-resources/xoom/thumb.png intellij/plugins/android/lib/freemarker-2.3.20.jar intellij/plugins/android/lib/jarutils.jar intellij/plugins/android/lib/javawriter-2.2.1.jar +intellij/plugins/android/lib/jgraphx-3.4.0.1.jar intellij/plugins/android/lib/jps/ intellij/plugins/android/lib/jps/android-gradle-jps.jar intellij/plugins/android/lib/jps/android-jps-plugin.jar intellij/plugins/android/lib/jsr305-1.3.9.jar +intellij/plugins/android/lib/juniversalchardet-1.0.3.jar intellij/plugins/android/lib/kxml2-2.3.0.jar intellij/plugins/android/lib/layoutlib-api.jar intellij/plugins/android/lib/lombok-ast-0.2.3.jar intellij/plugins/android/lib/manifest-merger.jar +intellij/plugins/android/lib/repository.jar intellij/plugins/android/lib/resources_en.jar intellij/plugins/android/lib/sdk-common.jar intellij/plugins/android/lib/sdk-tools.jar @@ -640,22 +646,22 @@ intellij/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app intellij/plugins/android/lib/templates/activities/AndroidTVActivity/root/src/app_package/VideoDetailsFragment.java.ftl intellij/plugins/android/lib/templates/activities/AndroidTVActivity/template-leanback-TV.png intellij/plugins/android/lib/templates/activities/AndroidTVActivity/template.xml -intellij/plugins/android/lib/templates/activities/BlankActivity/ -intellij/plugins/android/lib/templates/activities/BlankActivity/globals.xml.ftl -intellij/plugins/android/lib/templates/activities/BlankActivity/recipe.xml.ftl -intellij/plugins/android/lib/templates/activities/BlankActivity/recipe_fragment.xml.ftl -intellij/plugins/android/lib/templates/activities/BlankActivity/root/ -intellij/plugins/android/lib/templates/activities/BlankActivity/root/res/ -intellij/plugins/android/lib/templates/activities/BlankActivity/root/res/layout/ -intellij/plugins/android/lib/templates/activities/BlankActivity/root/res/layout/activity_fragment_container.xml.ftl -intellij/plugins/android/lib/templates/activities/BlankActivity/root/res/layout/fragment_simple.xml.ftl -intellij/plugins/android/lib/templates/activities/BlankActivity/root/src/ -intellij/plugins/android/lib/templates/activities/BlankActivity/root/src/app_package/ -intellij/plugins/android/lib/templates/activities/BlankActivity/root/src/app_package/SimpleActivity.java.ftl -intellij/plugins/android/lib/templates/activities/BlankActivity/root/src/app_package/SimpleActivityFragment.ftl -intellij/plugins/android/lib/templates/activities/BlankActivity/template.xml -intellij/plugins/android/lib/templates/activities/BlankActivity/template_blank_activity.png -intellij/plugins/android/lib/templates/activities/BlankActivity/template_blank_activity_fragment.png +intellij/plugins/android/lib/templates/activities/BasicActivity/ +intellij/plugins/android/lib/templates/activities/BasicActivity/globals.xml.ftl +intellij/plugins/android/lib/templates/activities/BasicActivity/recipe.xml.ftl +intellij/plugins/android/lib/templates/activities/BasicActivity/recipe_fragment.xml.ftl +intellij/plugins/android/lib/templates/activities/BasicActivity/root/ +intellij/plugins/android/lib/templates/activities/BasicActivity/root/res/ +intellij/plugins/android/lib/templates/activities/BasicActivity/root/res/layout/ +intellij/plugins/android/lib/templates/activities/BasicActivity/root/res/layout/activity_fragment_container.xml.ftl +intellij/plugins/android/lib/templates/activities/BasicActivity/root/res/layout/fragment_simple.xml.ftl +intellij/plugins/android/lib/templates/activities/BasicActivity/root/src/ +intellij/plugins/android/lib/templates/activities/BasicActivity/root/src/app_package/ +intellij/plugins/android/lib/templates/activities/BasicActivity/root/src/app_package/SimpleActivity.java.ftl +intellij/plugins/android/lib/templates/activities/BasicActivity/root/src/app_package/SimpleActivityFragment.ftl +intellij/plugins/android/lib/templates/activities/BasicActivity/template.xml +intellij/plugins/android/lib/templates/activities/BasicActivity/template_basic_activity.png +intellij/plugins/android/lib/templates/activities/BasicActivity/template_basic_activity_fragment.png intellij/plugins/android/lib/templates/activities/BlankWearActivity/ intellij/plugins/android/lib/templates/activities/BlankWearActivity/globals.xml.ftl intellij/plugins/android/lib/templates/activities/BlankWearActivity/recipe.xml.ftl @@ -2058,6 +2064,7 @@ intellij/plugins/android/lib/templates/other/WatchFaceService/root/src/app_packa intellij/plugins/android/lib/templates/other/WatchFaceService/root/src/app_package/MyDigitalWatchFaceService.java.ftl intellij/plugins/android/lib/templates/other/WatchFaceService/template.xml intellij/plugins/android/lib/templates/other/WatchFaceService/template_thumbnail.png +intellij/plugins/android/lib/truth-0.28.jar intellij/plugins/ant/ intellij/plugins/ant/lib/ intellij/plugins/ant/lib/ant-jps-plugin.jar @@ -2112,21 +2119,21 @@ intellij/plugins/github/lib/ intellij/plugins/github/lib/github.jar intellij/plugins/gradle/ intellij/plugins/gradle/lib/ -intellij/plugins/gradle/lib/commons-io-1.4.jar -intellij/plugins/gradle/lib/gradle-base-services-2.9.jar -intellij/plugins/gradle/lib/gradle-base-services-groovy-2.9.jar -intellij/plugins/gradle/lib/gradle-cli-2.9.jar -intellij/plugins/gradle/lib/gradle-core-2.9.jar +intellij/plugins/gradle/lib/commons-io-2.2.jar +intellij/plugins/gradle/lib/gradle-base-services-2.13.jar +intellij/plugins/gradle/lib/gradle-base-services-groovy-2.13.jar +intellij/plugins/gradle/lib/gradle-cli-2.13.jar +intellij/plugins/gradle/lib/gradle-core-2.13.jar intellij/plugins/gradle/lib/gradle-jps-plugin.jar -intellij/plugins/gradle/lib/gradle-messaging-2.9.jar -intellij/plugins/gradle/lib/gradle-model-core-2.9.jar -intellij/plugins/gradle/lib/gradle-model-groovy-2.9.jar -intellij/plugins/gradle/lib/gradle-native-2.9.jar -intellij/plugins/gradle/lib/gradle-resources-2.9.jar -intellij/plugins/gradle/lib/gradle-tooling-api-2.9.jar +intellij/plugins/gradle/lib/gradle-messaging-2.13.jar +intellij/plugins/gradle/lib/gradle-model-core-2.13.jar +intellij/plugins/gradle/lib/gradle-model-groovy-2.13.jar +intellij/plugins/gradle/lib/gradle-native-2.13.jar +intellij/plugins/gradle/lib/gradle-resources-2.13.jar +intellij/plugins/gradle/lib/gradle-tooling-api-2.13.jar intellij/plugins/gradle/lib/gradle-tooling-extension-api.jar intellij/plugins/gradle/lib/gradle-tooling-extension-impl.jar -intellij/plugins/gradle/lib/gradle-wrapper-2.9.jar +intellij/plugins/gradle/lib/gradle-wrapper-2.13.jar intellij/plugins/gradle/lib/gradle.jar intellij/plugins/gradle/lib/guava-jdk5-17.0.jar intellij/plugins/gradle/lib/jna-3.2.7.jar @@ -2157,8 +2164,8 @@ intellij/plugins/java-i18n/lib/ intellij/plugins/java-i18n/lib/java-i18n.jar intellij/plugins/java-i18n/lib/resources_en.jar intellij/plugins/javaFX/ -intellij/plugins/javaFX/embedder.jar intellij/plugins/javaFX/lib/ +intellij/plugins/javaFX/lib/SceneBuilderKit-8.1.1.jar intellij/plugins/javaFX/lib/common-javaFX-plugin.jar intellij/plugins/javaFX/lib/javaFX-jps-plugin.jar intellij/plugins/javaFX/lib/javaFX.jar @@ -2166,7 +2173,16 @@ intellij/plugins/javaFX/lib/resources_en.jar intellij/plugins/junit/ intellij/plugins/junit/lib/ intellij/plugins/junit/lib/idea-junit.jar +intellij/plugins/junit/lib/junit-jupiter-api-5.0.0-M1.jar +intellij/plugins/junit/lib/junit-jupiter-engine-5.0.0-M1.jar +intellij/plugins/junit/lib/junit-platform-commons-1.0.0-M1.jar +intellij/plugins/junit/lib/junit-platform-engine-1.0.0-M1.jar +intellij/plugins/junit/lib/junit-platform-launcher-1.0.0-M1.jar +intellij/plugins/junit/lib/junit-platform-runner-1.0.0-M1.jar intellij/plugins/junit/lib/junit-rt.jar +intellij/plugins/junit/lib/junit-vintage-engine-4.12.0-M1.jar +intellij/plugins/junit/lib/junit5-rt.jar +intellij/plugins/junit/lib/opentest4j-1.0.0-M1.jar intellij/plugins/junit/lib/resources_en.jar intellij/plugins/maven/ intellij/plugins/maven/lib/ @@ -2272,9 +2288,9 @@ intellij/plugins/properties/lib/ intellij/plugins/properties/lib/properties.jar intellij/plugins/settings-repository/ intellij/plugins/settings-repository/lib/ -intellij/plugins/settings-repository/lib/jackson-annotations-2.5.1.jar -intellij/plugins/settings-repository/lib/jackson-core-2.5.1.jar -intellij/plugins/settings-repository/lib/jackson-databind-2.5.1.jar +intellij/plugins/settings-repository/lib/jackson-annotations-2.7.1.jar +intellij/plugins/settings-repository/lib/jackson-core-2.7.1.jar +intellij/plugins/settings-repository/lib/jackson-databind-2.7.1-1.jar intellij/plugins/settings-repository/lib/jgit.jar intellij/plugins/settings-repository/lib/resources_en.jar intellij/plugins/settings-repository/lib/settings-repository.jar @@ -2324,7 +2340,7 @@ intellij/plugins/tasks/lib/tasks-java.jar intellij/plugins/tasks/lib/wsdl4j-1.4.jar intellij/plugins/terminal/ intellij/plugins/terminal/lib/ -intellij/plugins/terminal/lib/jediterm-pty-2.1.jar +intellij/plugins/terminal/lib/jediterm-pty-2.2.jar intellij/plugins/terminal/lib/jediterm.in intellij/plugins/terminal/lib/resources_en.jar intellij/plugins/terminal/lib/terminal.jar