On Thu, Apr 27, 2017 at 09:40:50PM +0100, Stuart Henderson wrote:
> On 2017/04/27 21:14, Caspar Schutijser wrote:
> > Below is a new diff that updates devel/intellij to 2017.1.2. In addition
> > to the update, I modified the startup script (files/idea) to increase
> > datasize-cur, similar to what the chromium port is doing. This was
> > prompted by an email from gpdsb at mailbox dot org on misc@.
> >
> > On amd64, I tried out different values for datasize-cur. I settled
> > on 2048000; 1536000 was not enough on amd64. On i386, where I also did
> > some testing this time, 1536000 seems to be enough but I don't think
> > making it dependent on the architecture is the way to go here.
> > Comments/input welcome.
>
> They are specifically using different max heap size and other JVM
> options on different arches (see idea.vmoptions, idea64.vmoptions),
> so it might actually make sense to make this arch-dependent.
Ah, that's right. Thanks! Diff below sets a lower value for i386.
Thanks,
Caspar Schutijser
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/intellij/Makefile,v
retrieving revision 1.42
diff -u -p -r1.42 Makefile
--- Makefile 9 Mar 2017 06:28:48 -0000 1.42
+++ Makefile 28 Apr 2017 13:18:27 -0000
@@ -2,7 +2,7 @@
COMMENT= IntelliJ IDEA Java IDE
-V= 2016.3.5
+V= 2017.1.2
DISTNAME= ideaIC-${V}
PKGNAME= intellij-${V}
CATEGORIES= devel
@@ -26,7 +26,7 @@ NO_TEST= Yes
SUBST_VARS+= JAVA_HOME
-WRKDIST= ${WRKDIR}/idea-IC-163.13906.18
+WRKDIST= ${WRKDIR}/idea-IC-171.4249.39
IJ= ${PREFIX}/intellij
# If NO_BUILD is set, JAVA_HOME doesn't get defined. So do
@@ -38,6 +38,7 @@ do-install:
${INSTALL_DATA_DIR} ${IJ}
@tar -czf - -C ${WRKDIST} . | tar xzf - -C ${IJ}
@rm -rf ${IJ}/jre
+ @rm -rf ${IJ}/jre64
@rm -rf ${IJ}/plugins/android
@rm -rf
${IJ}/plugins/gradle/lib/native-platform-{freebsd,linux,osx,windows}*.jar
@${SUBST_PROGRAM} ${FILESDIR}/idea ${PREFIX}/bin/idea
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/intellij/distinfo,v
retrieving revision 1.23
diff -u -p -r1.23 distinfo
--- distinfo 9 Mar 2017 06:28:48 -0000 1.23
+++ distinfo 28 Apr 2017 13:18:27 -0000
@@ -1,2 +1,2 @@
-SHA256 (ideaIC-2016.3.5.tar.gz) = hdoegQNpaMJytm9uTWLBF0VTUuvHaWknQqar/JfsvGw=
-SIZE (ideaIC-2016.3.5.tar.gz) = 410605527
+SHA256 (ideaIC-2017.1.2.tar.gz) = CiJ5Snx9ipfgsXmSO/+lMRBGvA2yvDMOI6veJLY0D4s=
+SIZE (ideaIC-2017.1.2.tar.gz) = 427932328
Index: files/idea
===================================================================
RCS file: /cvs/ports/devel/intellij/files/idea,v
retrieving revision 1.2
diff -u -p -r1.2 idea
--- files/idea 30 Apr 2010 19:02:17 -0000 1.2
+++ files/idea 28 Apr 2017 13:18:27 -0000
@@ -5,6 +5,10 @@
# OpenBSD-specific startup script for IntelliJ IDE
IDEA_HOME=${TRUEPREFIX}/intellij
+DATASIZE="2048000"
+if arch -s | grep i386 >/dev/null ; then
+ DATASIZE="1536000"
+fi
#-----------------------------------------------------------------------------
# Determine configuration settings
@@ -23,6 +27,18 @@ if [ ! -x "${IDEA_HOME}/bin/idea.sh" ];
echo "Error: IDEA_HOME may not be defined correctly: ${IDEA_HOME}"
echo " Unable to find launcher binary: ${IDEA_HOME}/bin/idea.sh"
exit 1
+fi
+
+xm_log() {
+ echo -n "$@\nDo you want to run IntelliJ IDEA anyway?\n\
+(If you don't increase these limits, IntelliJ IDEA might fail to work
properly.)" | \
+ ${X11BASE}/bin/xmessage -file - -center -buttons yes:0,no:1
-default no
+}
+
+if [ $(ulimit -Sd) -lt ${DATASIZE} ]; then
+ ulimit -Sd ${DATASIZE} || \
+ xm_log "Cannot increase datasize-cur to at least ${DATASIZE}"
+ [ $? -eq 0 ] || exit
fi
PATH=${IDEA_JDK}/bin:$PATH exec "${IDEA_HOME}/bin/idea.sh" $@
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/intellij/pkg/PLIST,v
retrieving revision 1.25
diff -u -p -r1.25 PLIST
--- pkg/PLIST 7 Feb 2017 09:36:22 -0000 1.25
+++ pkg/PLIST 28 Apr 2017 13:18:27 -0000
@@ -17,8 +17,6 @@ intellij/bin/idea.sh
intellij/bin/idea.vmoptions
intellij/bin/idea64.vmoptions
intellij/bin/inspect.sh
-intellij/bin/libbreakgen.so
-intellij/bin/libbreakgen64.so
intellij/bin/log.xml
intellij/bin/printenv.py
intellij/bin/restart.py
@@ -126,6 +124,7 @@ intellij/lib/jayatana-1.2.4.jar
intellij/lib/jcip-annotations.jar
intellij/lib/jdkAnnotations.jar
intellij/lib/jdom.jar
+intellij/lib/jediterm-pty-2.5.jar
intellij/lib/jgoodies-common-1.2.1.jar
intellij/lib/jgoodies-forms.jar
intellij/lib/jgoodies-looks-2.4.2.jar
@@ -134,6 +133,7 @@ intellij/lib/jimfs-1.1.jar
intellij/lib/jing.jar
intellij/lib/jna-platform.jar
intellij/lib/jna.jar
+intellij/lib/jps-builders-6.jar
intellij/lib/jps-builders.jar
intellij/lib/jps-launcher.jar
intellij/lib/jps-model.jar
@@ -145,6 +145,7 @@ intellij/lib/jsch.agentproxy.sshagent.ja
intellij/lib/jsch.agentproxy.usocket-jna.jar
intellij/lib/jsch.agentproxy.usocket-nc.jar
intellij/lib/jsr173_1.0_api.jar
+intellij/lib/jsr305.jar
intellij/lib/junit-4.12.jar
intellij/lib/junit.jar
intellij/lib/kotlin-reflect.jar
@@ -162,7 +163,7 @@ intellij/lib/miglayout-core-5.0.jar
intellij/lib/miglayout-swing-5.0.jar
intellij/lib/nanoxml-2.2.3.jar
intellij/lib/nekohtml-1.9.14.jar
-intellij/lib/netty-all-4.1.5.Final.jar
+intellij/lib/netty-all-4.1.9.Final.jar
intellij/lib/openapi.jar
intellij/lib/optimizedFileManager.jar
intellij/lib/oromatcher.jar
@@ -175,15 +176,14 @@ intellij/lib/resolver.jar
intellij/lib/resources.jar
intellij/lib/resources_en.jar
intellij/lib/rngom-20051226-patched.jar
-intellij/lib/rt/
-intellij/lib/rt/jps-plugin-system.jar
intellij/lib/sanselan-0.98-snapshot.jar
intellij/lib/serviceMessages.jar
intellij/lib/sherpa-solver.jar
intellij/lib/slf4j-api-1.7.10.jar
intellij/lib/slf4j-log4j12-1.7.10.jar
+intellij/lib/snakeyaml-1.17.jar
intellij/lib/snappy-in-java-0.5.1.jar
-intellij/lib/sqlite-jdbc-3.6.20.1.jar
+intellij/lib/sqlite-jdbc-3.8.11.2.jar
intellij/lib/streamex-0.6.2.jar
intellij/lib/swingx-core-1.6.2.jar
intellij/lib/trang-core.jar
@@ -227,6 +227,7 @@ intellij/license/saxon-conditions.html
intellij/license/sqljet-license.txt
intellij/license/svnkit-license.txt
intellij/license/swingx_license.txt
+intellij/license/trove4j_license.txt
intellij/license/winp_license.txt
intellij/license/xerces_license.txt
intellij/license/xmlrpc_license.txt
@@ -249,13 +250,9 @@ intellij/plugins/Groovy/lib/standardDsls
intellij/plugins/Groovy/lib/standardDsls/categoryTransform.gdsl
intellij/plugins/Groovy/lib/standardDsls/closuresInMethod.gdsl
intellij/plugins/Groovy/lib/standardDsls/defaultMethods.gdsl
-intellij/plugins/Groovy/lib/standardDsls/extensions.gdsl
intellij/plugins/Groovy/lib/standardDsls/gantScript.gdsl
-intellij/plugins/Groovy/lib/standardDsls/indexedProperty.gdsl
-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/IntelliLang/
intellij/plugins/IntelliLang/lib/
intellij/plugins/IntelliLang/lib/IntelliLang.jar
@@ -273,11 +270,11 @@ intellij/plugins/Kotlin/kotlinc/bin/kotl
intellij/plugins/Kotlin/kotlinc/bin/kotlinc.bat
intellij/plugins/Kotlin/kotlinc/build.txt
intellij/plugins/Kotlin/kotlinc/lib/
+intellij/plugins/Kotlin/kotlinc/lib/allopen-compiler-plugin.jar
intellij/plugins/Kotlin/kotlinc/lib/android-extensions-compiler.jar
intellij/plugins/Kotlin/kotlinc/lib/kotlin-annotation-processing.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
intellij/plugins/Kotlin/kotlinc/lib/kotlin-jslib-sources.jar
@@ -287,7 +284,16 @@ intellij/plugins/Kotlin/kotlinc/lib/kotl
intellij/plugins/Kotlin/kotlinc/lib/kotlin-runner.jar
intellij/plugins/Kotlin/kotlinc/lib/kotlin-runtime-sources.jar
intellij/plugins/Kotlin/kotlinc/lib/kotlin-runtime.jar
+intellij/plugins/Kotlin/kotlinc/lib/kotlin-script-runtime-sources.jar
+intellij/plugins/Kotlin/kotlinc/lib/kotlin-script-runtime.jar
+intellij/plugins/Kotlin/kotlinc/lib/kotlin-stdlib-js-sources.jar
+intellij/plugins/Kotlin/kotlinc/lib/kotlin-stdlib-js.jar
+intellij/plugins/Kotlin/kotlinc/lib/kotlin-stdlib-sources.jar
+intellij/plugins/Kotlin/kotlinc/lib/kotlin-stdlib.jar
+intellij/plugins/Kotlin/kotlinc/lib/kotlin-test-js.jar
intellij/plugins/Kotlin/kotlinc/lib/kotlin-test.jar
+intellij/plugins/Kotlin/kotlinc/lib/noarg-compiler-plugin.jar
+intellij/plugins/Kotlin/kotlinc/lib/sam-with-receiver-compiler-plugin.jar
intellij/plugins/Kotlin/kotlinc/license/
intellij/plugins/Kotlin/kotlinc/license/LICENSE.txt
intellij/plugins/Kotlin/kotlinc/license/NOTICE.txt
@@ -302,17 +308,29 @@ intellij/plugins/Kotlin/kotlinc/license/
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/kotlinc/license/third_party/scala_license.txt
intellij/plugins/Kotlin/lib/
+intellij/plugins/Kotlin/lib/allopen-compiler-plugin.jar
+intellij/plugins/Kotlin/lib/allopen-ide-plugin.jar
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
intellij/plugins/Kotlin/lib/kotlin-android-extensions-compiler-plugin.jar
intellij/plugins/Kotlin/lib/kotlin-android-extensions-plugin.jar
+intellij/plugins/Kotlin/lib/kotlin-daemon-client.jar
+intellij/plugins/Kotlin/lib/kotlin-gradle-tooling.jar
intellij/plugins/Kotlin/lib/kotlin-plugin.jar
intellij/plugins/Kotlin/lib/kotlin-reflect.jar
intellij/plugins/Kotlin/lib/kotlin-runtime.jar
+intellij/plugins/Kotlin/lib/kotlin-script-runtime.jar
intellij/plugins/Kotlin/lib/markdown.jar
+intellij/plugins/Kotlin/lib/noarg-compiler-plugin.jar
+intellij/plugins/Kotlin/lib/noarg-ide-plugin.jar
+intellij/plugins/Kotlin/lib/sam-with-receiver-compiler-plugin.jar
+intellij/plugins/Kotlin/lib/sam-with-receiver-ide-plugin.jar
+intellij/plugins/Kotlin/lib/uast-common.jar
+intellij/plugins/Kotlin/lib/uast-java.jar
intellij/plugins/ant/
intellij/plugins/ant/lib/
intellij/plugins/ant/lib/ant-jps-plugin.jar
@@ -369,28 +387,29 @@ intellij/plugins/gradle/
intellij/plugins/gradle/lib/
intellij/plugins/gradle/lib/commons-io-2.2.jar
intellij/plugins/gradle/lib/commons-lang-2.6.jar
-intellij/plugins/gradle/lib/gradle-base-services-3.1.jar
-intellij/plugins/gradle/lib/gradle-base-services-groovy-3.1.jar
-intellij/plugins/gradle/lib/gradle-cli-3.1.jar
-intellij/plugins/gradle/lib/gradle-core-3.1.jar
+intellij/plugins/gradle/lib/gradle-base-services-3.3.jar
+intellij/plugins/gradle/lib/gradle-base-services-groovy-3.3.jar
+intellij/plugins/gradle/lib/gradle-cli-3.3.jar
+intellij/plugins/gradle/lib/gradle-core-3.3.jar
intellij/plugins/gradle/lib/gradle-jps-plugin.jar
-intellij/plugins/gradle/lib/gradle-logging-3.1.jar
-intellij/plugins/gradle/lib/gradle-messaging-3.1.jar
-intellij/plugins/gradle/lib/gradle-model-core-3.1.jar
-intellij/plugins/gradle/lib/gradle-model-groovy-3.1.jar
-intellij/plugins/gradle/lib/gradle-native-3.1.jar
-intellij/plugins/gradle/lib/gradle-process-services-3.1.jar
-intellij/plugins/gradle/lib/gradle-resources-3.1.jar
-intellij/plugins/gradle/lib/gradle-tooling-api-3.1.jar
+intellij/plugins/gradle/lib/gradle-logging-3.3.jar
+intellij/plugins/gradle/lib/gradle-messaging-3.3.jar
+intellij/plugins/gradle/lib/gradle-model-core-3.3.jar
+intellij/plugins/gradle/lib/gradle-model-groovy-3.3.jar
+intellij/plugins/gradle/lib/gradle-native-3.3.jar
+intellij/plugins/gradle/lib/gradle-process-services-3.3.jar
+intellij/plugins/gradle/lib/gradle-resources-3.3.jar
+intellij/plugins/gradle/lib/gradle-tooling-api-3.3.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-3.1.jar
+intellij/plugins/gradle/lib/gradle-version-info-3.3.jar
+intellij/plugins/gradle/lib/gradle-wrapper-3.3.jar
intellij/plugins/gradle/lib/gradle.jar
intellij/plugins/gradle/lib/guava-jdk5-17.0.jar
-intellij/plugins/gradle/lib/jsr305-1.3.9.jar
+intellij/plugins/gradle/lib/jansi-1.14.jar
intellij/plugins/gradle/lib/kryo-2.22.jar
intellij/plugins/gradle/lib/minlog-1.2.jar
-intellij/plugins/gradle/lib/native-platform-0.11.jar
+intellij/plugins/gradle/lib/native-platform-0.12.jar
intellij/plugins/gradle/lib/objenesis-1.2.jar
intellij/plugins/gradle/lib/reflectasm-1.07.jar
intellij/plugins/gradle/lib/resources_en.jar
@@ -407,7 +426,7 @@ intellij/plugins/java-i18n/lib/java-i18n
intellij/plugins/java-i18n/lib/resources_en.jar
intellij/plugins/javaFX/
intellij/plugins/javaFX/lib/
-intellij/plugins/javaFX/lib/SceneBuilderKit-8.1.1.jar
+intellij/plugins/javaFX/lib/SceneBuilderKit-8.2.0.jar
intellij/plugins/javaFX/lib/common-javaFX-plugin.jar
intellij/plugins/javaFX/lib/javaFX-jps-plugin.jar
intellij/plugins/javaFX/lib/javaFX.jar
@@ -415,16 +434,17 @@ intellij/plugins/javaFX/lib/resources_en
intellij/plugins/junit/
intellij/plugins/junit/lib/
intellij/plugins/junit/lib/idea-junit.jar
-intellij/plugins/junit/lib/junit-jupiter-api-5.0.0-M3.jar
-intellij/plugins/junit/lib/junit-jupiter-engine-5.0.0-M3.jar
-intellij/plugins/junit/lib/junit-platform-commons-1.0.0-M3.jar
-intellij/plugins/junit/lib/junit-platform-engine-1.0.0-M3.jar
-intellij/plugins/junit/lib/junit-platform-launcher-1.0.0-M3.jar
-intellij/plugins/junit/lib/junit-platform-runner-1.0.0-M3.jar
+intellij/plugins/junit/lib/junit-jupiter-api-5.0.0-M4.jar
+intellij/plugins/junit/lib/junit-jupiter-engine-5.0.0-M4.jar
+intellij/plugins/junit/lib/junit-platform-commons-1.0.0-M4.jar
+intellij/plugins/junit/lib/junit-platform-engine-1.0.0-M4.jar
+intellij/plugins/junit/lib/junit-platform-launcher-1.0.0-M4.jar
+intellij/plugins/junit/lib/junit-platform-runner-1.0.0-M4.jar
+intellij/plugins/junit/lib/junit-platform-suite-api-1.0.0-M4.jar
intellij/plugins/junit/lib/junit-rt.jar
-intellij/plugins/junit/lib/junit-vintage-engine-4.12.0-M3.jar
+intellij/plugins/junit/lib/junit-vintage-engine-4.12.0-M4.jar
intellij/plugins/junit/lib/junit5-rt.jar
-intellij/plugins/junit/lib/opentest4j-1.0.0-M1.jar
+intellij/plugins/junit/lib/opentest4j-1.0.0-M2.jar
intellij/plugins/junit/lib/resources_en.jar
intellij/plugins/maven/
intellij/plugins/maven/lib/
@@ -632,7 +652,6 @@ intellij/plugins/terminal/fish/
intellij/plugins/terminal/fish/config.fish
intellij/plugins/terminal/jediterm-bash.in
intellij/plugins/terminal/lib/
-intellij/plugins/terminal/lib/jediterm-pty-2.2.1.jar
intellij/plugins/terminal/lib/resources_en.jar
intellij/plugins/terminal/lib/terminal.jar
intellij/plugins/testng/
