Index: head/java/intellij-ultimate/Makefile =================================================================== --- head/java/intellij-ultimate/Makefile (revision 509485) +++ head/java/intellij-ultimate/Makefile (revision 509486) @@ -1,60 +1,69 @@ # Created by: Andrey Cherkashin # $FreeBSD$ # Based on the java/intellij port PORTNAME= intellij-ultimate -PORTVERSION= 2019.1.1 +PORTVERSION= 2019.2 CATEGORIES= java devel -MASTER_SITES= https://download.jetbrains.com/idea/ \ - http://download.jetbrains.com/idea/ +MASTER_SITES= https://download-cf.jetbrains.com/idea/ DISTNAME= ideaIU-${PORTVERSION}-no-jbr +DIST_SUBDIR= jetbrains MAINTAINER= andoriyu@gmail.com COMMENT= IntelliJ IDEA Ultimate Edition LICENSE= IntelliJ-Ultimate LICENSE_NAME= Subscription license agreement for business and organizations LICENSE_TEXT= See: https://www.jetbrains.com/store/license.html LICENSE_PERMS= dist-mirror pkg-mirror auto-accept -RUN_DEPENDS= intellij-fsnotifier>0:java/intellij-fsnotifier +RUN_DEPENDS= intellij-fsnotifier>0:java/intellij-fsnotifier \ + intellij-pty4j>0:java/intellij-pty4j -USES= python:run shebangfix +USES= python:run shebangfix USE_JAVA= yes JAVA_VERSION= 1.8+ -SHEBANG_FILES= bin/printenv.py bin/restart.py +SHEBANG_FILES= bin/printenv.py bin/restart.py \ + plugins/spy-js/server/node_modules/node-uuid/benchmark/bench.sh \ + plugins/spy-js/server/proxy-nix.sh \ + plugins/spy-js/server/proxy-osx.sh + NO_ARCH= yes NO_BUILD= yes -WRKSRC= ${WRKDIR}/idea-IU-191.6707.61 +WRKSRC= ${WRKDIR}/idea-IU-192.5728.98 -.include "${.CURDIR}/../intellij/common.mk" - -PLIST_SUB+= IDEA_HOME=${IDEA_HOME} -SUB_FILES+= idea idea.desktop pkg-message -SUB_LIST+= IDEA_HOME=${IDEA_HOME} +SUB_FILES= idea idea.desktop pkg-message +SUB_LIST= DATADIR=${DATADIR} CONFLICTS= intellij-20* do-install: - ${MKDIR} ${STAGEDIR}${IDEA_HOME} - @${TAR} -czf - -C ${WRKSRC} . | ${TAR} xzf - -C ${STAGEDIR}${IDEA_HOME} # Linux/Windows/OS X only so remove them - @${RM} -f ${STAGEDIR}${IDEA_HOME}/bin/fsnotifier \ - ${STAGEDIR}${IDEA_HOME}/bin/fsnotifier-arm \ - ${STAGEDIR}${IDEA_HOME}/bin/fsnotifier64 \ - ${STAGEDIR}${IDEA_HOME}/bin/libdbm64.so \ - ${STAGEDIR}${IDEA_HOME}/bin/libyjpagent-linux.so \ - ${STAGEDIR}${IDEA_HOME}/bin/libyjpagent-linux64.so - @${RM} -rf ${STAGEDIR}${IDEA_HOME}/jre/jre/ \ - ${STAGEDIR}${IDEA_HOME}/lib/pty4j-native/ \ - ${STAGEDIR}${IDEA_HOME}/plugins/android/lib/libwebp/ + @${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 + ${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_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=${IDEA_HOME}/bin/fsnotifier" >> ${STAGEDIR}${IDEA_HOME}/bin/idea.properties + ${ECHO} "idea.filewatcher.executable.path=${PREFIX}/intellij/bin/fsnotifier" >> ${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 .include Index: head/java/intellij-ultimate/distinfo =================================================================== --- head/java/intellij-ultimate/distinfo (revision 509485) +++ head/java/intellij-ultimate/distinfo (revision 509486) @@ -1,3 +1,3 @@ -TIMESTAMP = 1556533823 -SHA256 (ideaIU-2019.1.1-no-jbr.tar.gz) = d1f52f6fcd004d4c6faa0775e74969ca1d881de772397758bd8613b9e8dcf4dd -SIZE (ideaIU-2019.1.1-no-jbr.tar.gz) = 618114586 +TIMESTAMP = 1565558458 +SHA256 (jetbrains/ideaIU-2019.2-no-jbr.tar.gz) = 78588740bbd5c8054316d6b4217ff79a39cbecf3ca762db2b450b4cdbcc39f72 +SIZE (jetbrains/ideaIU-2019.2-no-jbr.tar.gz) = 665943132 Index: head/java/intellij-ultimate/files/idea.1 =================================================================== --- head/java/intellij-ultimate/files/idea.1 (revision 509485) +++ head/java/intellij-ultimate/files/idea.1 (revision 509486) @@ -1,17 +1,17 @@ .\" $OpenBSD: mdoc.template,v 1.10 2007/05/31 22:10:19 jmc Exp $ .Dd $Mdocdate: April 9 2010 $ -.Dt IDEA 1 +.Dt idea 1 .Os .Sh NAME .Nm idea .Nd launch IntelliJ IDEA Java Integrated Development Environment .Sh SYNOPSIS .Nm .Op jvm-args .Sh DESCRIPTION .Nm -starts up the IntelliJ IDEA Community Edition Java Integrated +starts up the IntelliJ IDEA Ultimate Edition Java Integrated Development Environment. .Sh SEE ALSO The web site http://www.jetbrains.com/idea/. Index: head/java/intellij-ultimate/files/idea.desktop.in =================================================================== --- head/java/intellij-ultimate/files/idea.desktop.in (revision 509485) +++ head/java/intellij-ultimate/files/idea.desktop.in (revision 509486) @@ -1,12 +1,12 @@ [Desktop Entry] Version=1.0 Encoding=UTF-8 Type=Application Name=IntelliJ IDEA Ultimate Edition GenericName=IntelliJ IDEA Ultimate Edition Comment=IntelliJ Integrated Development Environment -Icon=%%IDEA_HOME%%/bin/idea.png -Exec=%%IDEA_HOME%%/bin/idea.sh +Icon=%%DATADIR%%/bin/idea.png +Exec=%%DATADIR%%/bin/idea.sh Terminal=false StartupNotify=true Categories=Application;Development; Index: head/java/intellij-ultimate/files/idea.in =================================================================== --- head/java/intellij-ultimate/files/idea.in (revision 509485) +++ head/java/intellij-ultimate/files/idea.in (revision 509486) @@ -1,3 +1,3 @@ #!/bin/sh -exec "%%IDEA_HOME%%/bin/idea.sh" "$@" +exec "%%DATADIR%%/bin/idea.sh" "$@" Index: head/java/intellij-ultimate/files/pkg-message.in =================================================================== --- head/java/intellij-ultimate/files/pkg-message.in (revision 509485) +++ head/java/intellij-ultimate/files/pkg-message.in (revision 509486) @@ -1,12 +1,12 @@ [ { type: install message: <