Attachment 206861 Details for Bug 240082 – jetbrains-phpstorm.diff

[patch] jetbrains-phpstorm.diff

jetbrains-phpstorm.diff (text/plain), 8.17 KB, created by Dmitry Wagin on 2019-08-24 19:58:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Wagin

Created: 2019-08-24 19:58:06 UTC

Size: 8.17 KB

patch

obsolete

>Index: devel/jetbrains-phpstorm/Makefile
>===================================================================
>--- devel/jetbrains-phpstorm/Makefile	(revision 509728)
>+++ devel/jetbrains-phpstorm/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	phpstorm
>-PORTVERSION=	2019.2
>+PORTVERSION=	2019.2.1
> CATEGORIES=	devel java
> MASTER_SITES=	https://download-cf.jetbrains.com/webide/
> PKGNAMEPREFIX=	jetbrains-
>@@ -17,13 +17,12 @@
> 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 \
>-		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
> 
>@@ -30,21 +29,17 @@
> NO_ARCH=	yes
> NO_BUILD=	yes
> 
>-WRKSRC=		${WRKDIR}/PhpStorm-192.5728.108
>+WRKSRC=		${WRKDIR}/PhpStorm-192.6262.66
> 
> SUB_FILES=	phpstorm phpstorm.desktop pkg-message
>-SUB_LIST=	DATADIR=${DATADIR}
> 
> do-install:
> # Linux/Windows/OS X only so remove them
> 	@${RM} -r ${WRKSRC}/bin/fsnotifier \
> 		${WRKSRC}/bin/fsnotifier-arm \
>-		${WRKSRC}/bin/fsnotifier64
>-# 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}/bin/fsnotifier64 \
>+		${WRKSRC}/jbr \
>+		${WRKSRC}/lib/pty4j-native
> 	${MKDIR} ${STAGEDIR}${DATADIR}
> 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} \
> 		"! -name *\.so ! -name *\.dll ! -name *\.dylib ! -name *\.pdb ! -name *\.sh")
>@@ -52,8 +47,6 @@
> 	${INSTALL_SCRIPT} ${WRKDIR}/phpstorm ${STAGEDIR}${PREFIX}/bin/phpstorm
> 	${INSTALL_MAN} ${FILESDIR}/phpstorm.1 ${STAGEDIR}${PREFIX}/man/man1
> 	${INSTALL_DATA} ${WRKDIR}/phpstorm.desktop ${STAGEDIR}${PREFIX}/share/applications/
>-	cd ${WRKSRC}/lib && ${JAVA_HOME}/bin/jar xf icons.jar
>-	${INSTALL_DATA} ${WRKSRC}/lib/icon.png ${STAGEDIR}${DATADIR}/phpstorm.png
> # Use fsnotifier replacement provided by java/intellij-fsnotifier
> 	${ECHO} "idea.filewatcher.executable.path=${PREFIX}/intellij/bin/fsnotifier" >> ${STAGEDIR}${DATADIR}/bin/idea.properties
> # Fix slow render
>Index: devel/jetbrains-phpstorm/distinfo
>===================================================================
>--- devel/jetbrains-phpstorm/distinfo	(revision 509728)
>+++ devel/jetbrains-phpstorm/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1564838887
>-SHA256 (jetbrains/PhpStorm-2019.2.tar.gz) = a7b81953467fc1c1b3f270bd905018b40243d9f2aeb11b70e648489b843db84f
>-SIZE (jetbrains/PhpStorm-2019.2.tar.gz) = 355722144
>+TIMESTAMP = 1566676178
>+SHA256 (jetbrains/PhpStorm-2019.2.1.tar.gz) = 4f102a1dcfad15d27b0674465bf5f5cd628388ee98bf5c0d64be1954cc4529d4
>+SIZE (jetbrains/PhpStorm-2019.2.1.tar.gz) = 356318912
>Index: devel/jetbrains-phpstorm/files/pkg-message.in
>===================================================================
>--- devel/jetbrains-phpstorm/files/pkg-message.in	(revision 509728)
>+++ devel/jetbrains-phpstorm/files/pkg-message.in	(working copy)
>@@ -1,10 +1,10 @@
> [
> { type: install
>   message: <<EOM
>-There is native (faster) file watching support backed by kqueue which is
>-enabled by default.  If you encounter problems  problems with watching large
>-trees, you disable it by appending the following property into
>-%%DATADIR%%/bin/idea.properties:
>+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 adding the following property via the menu
>+entry Help -> Edit Custom Properties...
> 
>       idea.filewatcher.disabled=true
> EOM
>Index: devel/jetbrains-phpstorm/pkg-plist
>===================================================================
>--- devel/jetbrains-phpstorm/pkg-plist	(revision 509728)
>+++ devel/jetbrains-phpstorm/pkg-plist	(working copy)
>@@ -35,8 +35,8 @@
> %%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
>@@ -45,7 +45,7 @@
> %%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
>@@ -60,7 +60,7 @@
> %%DATADIR%%/lib/error_prone_annotations-2.3.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/groovy-all-2.4.17.jar
>@@ -67,9 +67,9 @@
> %%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/imageio-core-3.4.1.jar
> %%DATADIR%%/lib/imageio-metadata-3.4.1.jar
>@@ -96,7 +96,7 @@
> %%DATADIR%%/lib/jaxen-1.2.0.jar
> %%DATADIR%%/lib/jbcrypt-1.0.0.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/jettison-1.4.0.jar
> %%DATADIR%%/lib/jing-20030619.jar
>@@ -132,16 +132,16 @@
> %%DATADIR%%/lib/miglayout-core-5.2.jar
> %%DATADIR%%/lib/miglayout-swing-5.2.jar
> %%DATADIR%%/lib/nanoxml-2.2.3.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/openapi.jar
> %%DATADIR%%/lib/org.eclipse.lsp4j-0.7.1.jar
> %%DATADIR%%/lib/org.eclipse.lsp4j.jsonrpc-0.7.1.jar
>@@ -164,11 +164,11 @@
> %%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/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/serviceMessages.jar
> %%DATADIR%%/lib/slf4j-api-1.7.25.jar
>@@ -228,7 +228,6 @@
> %%DATADIR%%/license/xerces_license.txt
> %%DATADIR%%/license/xmlrpc_license.txt
> %%DATADIR%%/license/yourkit-license-redist.txt
>-%%DATADIR%%/phpstorm.png
> %%DATADIR%%/plugins/AngularJS/lib/AngularJS.jar
> %%DATADIR%%/plugins/AngularJS/lib/resources_en.jar
> %%DATADIR%%/plugins/AngularJS/ngCli/runner.js
>@@ -242,6 +241,7 @@
> %%DATADIR%%/plugins/CSS/lib/css.jar
> %%DATADIR%%/plugins/CSS/lib/resources_en.jar
> %%DATADIR%%/plugins/DatabaseTools/lib/database-impl.jar
>+%%DATADIR%%/plugins/DatabaseTools/lib/database-minicat.jar
> %%DATADIR%%/plugins/DatabaseTools/lib/database-openapi.jar
> %%DATADIR%%/plugins/DatabaseTools/lib/dekaf-single-2.0.0.390.jar
> %%DATADIR%%/plugins/DatabaseTools/lib/jdbc-console.jar

Actions: View | Diff

Attachments on bug 240082: 206861 | 206863