Date: Sun, 25 Aug 2019 15:03:16 +0000 (UTC) From: Boris Samorodov <bsam@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r509798 - in head/java/intellij: . files Message-ID: <201908251503.x7PF3Gkp067079@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bsam Date: Sun Aug 25 15:03:15 2019 New Revision: 509798 URL: https://svnweb.freebsd.org/changeset/ports/509798 Log: java/intellij: Update to 2019.2.1 and more PR: 240080 Submitted by: Dmitry Wagin <dmitry.wagin@ya.ru> . update to 2019.2.1 . drop dependency on intellij-pt4j port -- the FreeBSD native library is already included in the upstream pty4j jar . install FreeBSD native library for jansi . fix the "Typeahead timeout is exceeded" error . small cleanup Modified: head/java/intellij/Makefile head/java/intellij/distinfo head/java/intellij/files/pkg-message.in head/java/intellij/pkg-plist Modified: head/java/intellij/Makefile ============================================================================== --- head/java/intellij/Makefile Sun Aug 25 14:14:53 2019 (r509797) +++ head/java/intellij/Makefile Sun Aug 25 15:03:15 2019 (r509798) @@ -5,7 +5,7 @@ # Vadim Zhukov <zhuk@openbsd.org> PORTNAME= intellij -PORTVERSION= 2019.2 +PORTVERSION= 2019.2.1 CATEGORIES= java devel MASTER_SITES= https://download-cf.jetbrains.com/idea/ DISTNAME= ideaIC-${PORTVERSION}-no-jbr @@ -16,24 +16,22 @@ COMMENT= IntelliJ IDEA Community Edition LICENSE= APACHE20 -RUN_DEPENDS= intellij-fsnotifier>0:java/intellij-fsnotifier \ - intellij-pty4j>0:java/intellij-pty4j +RUN_DEPENDS= intellij-fsnotifier>0:java/intellij-fsnotifier USES= python:run shebangfix USE_JAVA= yes -JAVA_VERSION= 1.8+ +JAVA_VERSION= 8+ SHEBANG_FILES= bin/printenv.py bin/restart.py NO_ARCH= yes +NO_ARCH_IGNORE= libjansi.so NO_BUILD= yes -INSTALL_TARGET= install-strip -WRKSRC= ${WRKDIR}/idea-IC-192.5728.98 +WRKSRC= ${WRKDIR}/idea-IC-192.6262.58 SUB_FILES= idea idea.desktop pkg-message -SUB_LIST= DATADIR=${DATADIR} CONFLICTS= intellij-ultimate-* do-install: @@ -41,23 +39,29 @@ do-install: @${RM} -r ${WRKSRC}/bin/fsnotifier \ ${WRKSRC}/bin/fsnotifier-arm \ ${WRKSRC}/bin/fsnotifier64 \ - ${WRKSRC}/plugins/android/lib/libwebp \ - ${WRKSRC}/plugins/maven/lib/maven3/lib/jansi-native \ - ${WRKSRC}/plugins/performanceTesting/bin -# Remove the bundled native Pty4J support libraries, they are replaced -# by java/intellij-pty4j - @${RM} -r ${WRKSRC}/lib/pty4j-native -# Remove bundled linux JetBrains Runtime and OpenJDK - @${RM} -r ${WRKSRC}/jbr ${WRKSRC}/jre64 + ${WRKSRC}/lib/pty4j-native/ \ + ${WRKSRC}/plugins/android/lib/libwebp/ \ + ${WRKSRC}/plugins/maven/lib/maven3/lib/jansi-native/linux32/ \ + ${WRKSRC}/plugins/maven/lib/maven3/lib/jansi-native/linux64/ \ + ${WRKSRC}/plugins/maven/lib/maven3/lib/jansi-native/osx/ \ + ${WRKSRC}/plugins/maven/lib/maven3/lib/jansi-native/windows32/ \ + ${WRKSRC}/plugins/maven/lib/maven3/lib/jansi-native/windows64/ \ + ${WRKSRC}/plugins/performanceTesting/bin/ ${MKDIR} ${STAGEDIR}${DATADIR} @(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} \ "! -name *\.so ! -name *\.dll ! -name *\.dylib ! -name *\.pdb ! -name *\.sh") @(cd ${WRKSRC} && ${COPYTREE_BIN} . ${STAGEDIR}${DATADIR} "-name *\.sh") + ${INSTALL_LIB} ${WRKSRC}/plugins/maven/lib/maven3/lib/jansi-native/freebsd32/libjansi.so \ + ${STAGEDIR}${DATADIR}/plugins/maven/lib/maven3/lib/jansi-native/freebsd32/ + ${INSTALL_LIB} ${WRKSRC}/plugins/maven/lib/maven3/lib/jansi-native/freebsd64/libjansi.so \ + ${STAGEDIR}${DATADIR}/plugins/maven/lib/maven3/lib/jansi-native/freebsd64/ ${INSTALL_SCRIPT} ${WRKDIR}/idea ${STAGEDIR}${PREFIX}/bin/idea ${INSTALL_MAN} ${FILESDIR}/idea.1 ${STAGEDIR}${PREFIX}/man/man1 ${INSTALL_DATA} ${WRKDIR}/idea.desktop ${STAGEDIR}${PREFIX}/share/applications/ # Use fsnotifier replacement provided by java/intellij-fsnotifier ${ECHO} "idea.filewatcher.executable.path=${PREFIX}/intellij/bin/fsnotifier" >> ${STAGEDIR}${DATADIR}/bin/idea.properties +# Fix "Typeahead timeout is exceeded" error + ${ECHO} "action.aware.typeAhead=false" >> ${STAGEDIR}${DATADIR}/bin/idea.properties # Fix slow render ${ECHO} "-Dsun.java2d.xrender=false" >> ${STAGEDIR}${DATADIR}/bin/idea.vmoptions ${ECHO} "-Dsun.java2d.xrender=false" >> ${STAGEDIR}${DATADIR}/bin/idea64.vmoptions Modified: head/java/intellij/distinfo ============================================================================== --- head/java/intellij/distinfo Sun Aug 25 14:14:53 2019 (r509797) +++ head/java/intellij/distinfo Sun Aug 25 15:03:15 2019 (r509798) @@ -1,3 +1,3 @@ -TIMESTAMP = 1565566115 -SHA256 (jetbrains/ideaIC-2019.2-no-jbr.tar.gz) = 7ab6ad4b54b32425cd7e5a8554cb34443e37611b230b94c559f878b1e68030f5 -SIZE (jetbrains/ideaIC-2019.2-no-jbr.tar.gz) = 531207945 +TIMESTAMP = 1566671924 +SHA256 (jetbrains/ideaIC-2019.2.1-no-jbr.tar.gz) = ee8fb4cdb6c29d75b1987225f1f92517319c429c9bb6a0dfc3e0c23cb6688e98 +SIZE (jetbrains/ideaIC-2019.2.1-no-jbr.tar.gz) = 593703673 Modified: head/java/intellij/files/pkg-message.in ============================================================================== --- head/java/intellij/files/pkg-message.in Sun Aug 25 14:14:53 2019 (r509797) +++ head/java/intellij/files/pkg-message.in Sun Aug 25 15:03:15 2019 (r509798) @@ -3,8 +3,8 @@ message: <<EOM There is a native (faster) file watching support backed by kqueue which is enabled by default. If you encounter problems with watching large -trees, you can disable it by appending the following property into -%%DATADIR%%/bin/idea.properties: +trees, you can disable it by adding the following property via the menu +entry Help -> Edit Custom Properties... idea.filewatcher.disabled=true Modified: head/java/intellij/pkg-plist ============================================================================== --- head/java/intellij/pkg-plist Sun Aug 25 14:14:53 2019 (r509797) +++ head/java/intellij/pkg-plist Sun Aug 25 15:03:15 2019 (r509798) @@ -100,8 +100,8 @@ share/applications/idea.desktop %%DATADIR%%/lib/batik-transcoder-1.12.0-8.jar %%DATADIR%%/lib/batik-util-1.12.0-8.jar %%DATADIR%%/lib/batik-xml-1.12.0-8.jar -%%DATADIR%%/lib/bcpkix-jdk15on-1.61.jar -%%DATADIR%%/lib/bcprov-jdk15on-1.61.jar +%%DATADIR%%/lib/bcpkix-jdk15on-1.62.jar +%%DATADIR%%/lib/bcprov-jdk15on-1.62.jar %%DATADIR%%/lib/bootstrap.jar %%DATADIR%%/lib/built-in-server.jar %%DATADIR%%/lib/cglib-nodep-3.2.4.jar @@ -109,7 +109,7 @@ share/applications/idea.desktop %%DATADIR%%/lib/common-image-3.4.1.jar %%DATADIR%%/lib/common-io-3.4.1.jar %%DATADIR%%/lib/common-lang-3.4.1.jar -%%DATADIR%%/lib/commons-codec-1.12.jar +%%DATADIR%%/lib/commons-codec-1.13.jar %%DATADIR%%/lib/commons-collections-3.2.2.jar %%DATADIR%%/lib/commons-compress-1.18.jar %%DATADIR%%/lib/commons-httpclient-3.1-patched.jar @@ -118,9 +118,6 @@ share/applications/idea.desktop %%DATADIR%%/lib/commons-lang-2.4.jar %%DATADIR%%/lib/commons-logging-1.2.jar %%DATADIR%%/lib/commons-net-3.6.jar -%%DATADIR%%/lib/completion-ranking-java-0.0.7.jar -%%DATADIR%%/lib/completion-ranking-kotlin-0.0.2.jar -%%DATADIR%%/lib/completion-ranking-python-0.0.4.jar %%DATADIR%%/lib/configuration-store-impl.jar %%DATADIR%%/lib/credential-store.jar %%DATADIR%%/lib/cucumber-core-1.2.4.jar @@ -132,7 +129,7 @@ share/applications/idea.desktop %%DATADIR%%/lib/exception-analyzer-api-1.0.1.jar %%DATADIR%%/lib/extensions.jar %%DATADIR%%/lib/external-system-rt.jar -%%DATADIR%%/lib/fluent-hc-4.5.8.jar +%%DATADIR%%/lib/fluent-hc-4.5.9.jar %%DATADIR%%/lib/forms-1.1-preview.jar %%DATADIR%%/lib/forms_rt.jar %%DATADIR%%/lib/gherkin-2.12.2.jar @@ -140,9 +137,9 @@ share/applications/idea.desktop %%DATADIR%%/lib/gson-2.8.5.jar %%DATADIR%%/lib/guava-25.1-jre.jar %%DATADIR%%/lib/hamcrest-core-1.3.jar -%%DATADIR%%/lib/httpclient-4.5.8.jar +%%DATADIR%%/lib/httpclient-4.5.9.jar %%DATADIR%%/lib/httpcore-4.4.11.jar -%%DATADIR%%/lib/httpmime-4.5.8.jar +%%DATADIR%%/lib/httpmime-4.5.9.jar %%DATADIR%%/lib/icons.jar %%DATADIR%%/lib/idea.jar %%DATADIR%%/lib/idea_rt.jar @@ -174,7 +171,7 @@ share/applications/idea.desktop %%DATADIR%%/lib/jcip-annotations-1.0.jar %%DATADIR%%/lib/jdkAnnotations.jar %%DATADIR%%/lib/jdom.jar -%%DATADIR%%/lib/jediterm-pty-2.19.jar +%%DATADIR%%/lib/jediterm-pty-2.20.jar %%DATADIR%%/lib/jetCheck-0.2.1.jar %%DATADIR%%/lib/jing-20030619.jar %%DATADIR%%/lib/jna-platform.jar @@ -196,6 +193,7 @@ share/applications/idea.desktop %%DATADIR%%/lib/kotlin-test-common-1.3.31.jar %%DATADIR%%/lib/kotlinx-coroutines-core-1.2.1.jar %%DATADIR%%/lib/kotlinx-coroutines-jdk8-1.2.1.jar +%%DATADIR%%/lib/layoutlib.jar %%DATADIR%%/lib/log4j.jar %%DATADIR%%/lib/lz4-java-1.6.0.jar %%DATADIR%%/lib/markdownj-core-0.4.2-SNAPSHOT.jar @@ -204,16 +202,16 @@ share/applications/idea.desktop %%DATADIR%%/lib/miglayout-swing-5.2.jar %%DATADIR%%/lib/nanoxml-2.2.3.jar %%DATADIR%%/lib/nekohtml-1.9.22.jar -%%DATADIR%%/lib/netty-buffer-4.1.36.Final.jar -%%DATADIR%%/lib/netty-codec-4.1.36.Final.jar -%%DATADIR%%/lib/netty-codec-http-4.1.36.Final.jar -%%DATADIR%%/lib/netty-codec-http2-4.1.36.Final.jar -%%DATADIR%%/lib/netty-codec-socks-4.1.36.Final.jar -%%DATADIR%%/lib/netty-common-4.1.36.Final.jar -%%DATADIR%%/lib/netty-handler-4.1.36.Final.jar -%%DATADIR%%/lib/netty-handler-proxy-4.1.36.Final.jar -%%DATADIR%%/lib/netty-resolver-4.1.36.Final.jar -%%DATADIR%%/lib/netty-transport-4.1.36.Final.jar +%%DATADIR%%/lib/netty-buffer-4.1.38.Final.jar +%%DATADIR%%/lib/netty-codec-4.1.38.Final.jar +%%DATADIR%%/lib/netty-codec-http-4.1.38.Final.jar +%%DATADIR%%/lib/netty-codec-http2-4.1.38.Final.jar +%%DATADIR%%/lib/netty-codec-socks-4.1.38.Final.jar +%%DATADIR%%/lib/netty-common-4.1.38.Final.jar +%%DATADIR%%/lib/netty-handler-4.1.38.Final.jar +%%DATADIR%%/lib/netty-handler-proxy-4.1.38.Final.jar +%%DATADIR%%/lib/netty-resolver-4.1.38.Final.jar +%%DATADIR%%/lib/netty-transport-4.1.38.Final.jar %%DATADIR%%/lib/objenesis-3.0.1.jar %%DATADIR%%/lib/openapi.jar %%DATADIR%%/lib/org.eclipse.xtend.lib-2.14.0.jar @@ -236,12 +234,12 @@ share/applications/idea.desktop %%DATADIR%%/lib/pty4j-0.9.4.jar %%DATADIR%%/lib/purejavacomm-0.0.11.1.jar %%DATADIR%%/lib/randomForestRegressor-0.0.11.jar -%%DATADIR%%/lib/rd-core-0.191.46.jar -%%DATADIR%%/lib/rd-swing-0.191.46.jar +%%DATADIR%%/lib/rd-core-0.191.63.jar +%%DATADIR%%/lib/rd-swing-0.191.63.jar %%DATADIR%%/lib/reactive-streams-1.0.2.jar %%DATADIR%%/lib/resources.jar %%DATADIR%%/lib/resources_en.jar -%%DATADIR%%/lib/rhino-1.7.10.jar +%%DATADIR%%/lib/rhino-1.7.11.jar %%DATADIR%%/lib/rngom-20051226-patched.jar %%DATADIR%%/lib/rxjava-2.2.8.jar %%DATADIR%%/lib/sa-jdwp-1.12.jar @@ -674,13 +672,14 @@ share/applications/idea.desktop %%DATADIR%%/plugins/android/lib/java-lib-model-3.3.0.jar %%DATADIR%%/plugins/android/lib/java-lib-model-builder-3.3.0.jar %%DATADIR%%/plugins/android/lib/javawriter-2.2.1.jar +%%DATADIR%%/plugins/android/lib/jdk11/layoutlib.jar +%%DATADIR%%/plugins/android/lib/jdk8/layoutlib.jar %%DATADIR%%/plugins/android/lib/jgraphx-3.4.1.3.jar %%DATADIR%%/plugins/android/lib/jps/android-jps-plugin.jar %%DATADIR%%/plugins/android/lib/kxml2-2.3.0.jar %%DATADIR%%/plugins/android/lib/layoutInspector-26.3.0.jar -%%DATADIR%%/plugins/android/lib/layoutlib-api-26.3.0.jar +%%DATADIR%%/plugins/android/lib/layoutlib-api-26.3.0-sp1.jar %%DATADIR%%/plugins/android/lib/layoutlib-loader.jar -%%DATADIR%%/plugins/android/lib/layoutlib.jar %%DATADIR%%/plugins/android/lib/layoutlib/build.prop %%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/AndroidClock.ttf %%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/CarroisGothicSC-Regular.ttf @@ -9778,6 +9777,9 @@ share/applications/idea.desktop %%DATADIR%%/plugins/maven/lib/maven3/lib/guice-4.2.1-no_aop.jar %%DATADIR%%/plugins/maven/lib/maven3/lib/j2objc-annotations-1.1.jar %%DATADIR%%/plugins/maven/lib/maven3/lib/jansi-1.17.1.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/jansi-native/README.txt +%%DATADIR%%/plugins/maven/lib/maven3/lib/jansi-native/freebsd32/libjansi.so +%%DATADIR%%/plugins/maven/lib/maven3/lib/jansi-native/freebsd64/libjansi.so %%DATADIR%%/plugins/maven/lib/maven3/lib/javax.inject-1.jar %%DATADIR%%/plugins/maven/lib/maven3/lib/jcl-over-slf4j-1.7.25.jar %%DATADIR%%/plugins/maven/lib/maven3/lib/jcl-over-slf4j.license @@ -9830,6 +9832,14 @@ share/applications/idea.desktop %%DATADIR%%/plugins/sh/lib/resources_en.jar %%DATADIR%%/plugins/sh/lib/sh.jar %%DATADIR%%/plugins/smali/lib/smali.jar +%%DATADIR%%/plugins/stats-collector/lib/completion-ranking-java-0.0.7.jar +%%DATADIR%%/plugins/stats-collector/lib/completion-ranking-kotlin-0.0.2.jar +%%DATADIR%%/plugins/stats-collector/lib/completion-ranking-python-0.0.4.jar +%%DATADIR%%/plugins/stats-collector/lib/features.jar +%%DATADIR%%/plugins/stats-collector/lib/log-events.jar +%%DATADIR%%/plugins/stats-collector/lib/resources_en.jar +%%DATADIR%%/plugins/stats-collector/lib/stats-collector.jar +%%DATADIR%%/plugins/stats-collector/lib/statsCollector-completionRanker.jar %%DATADIR%%/plugins/stream-debugger/lib/resources_en.jar %%DATADIR%%/plugins/stream-debugger/lib/stream-debugger.jar %%DATADIR%%/plugins/svn4idea/lib/resources_en.jar
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908251503.x7PF3Gkp067079>