Date: Sun, 10 Mar 2024 10:01:10 GMT From: Charlie Li <vishwin@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 4b135fdd29a6 - main - Revert "java/intellij: Move man pages to share/man" Message-ID: <202403101001.42AA1ASo040815@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=4b135fdd29a63e612472af300454bf80a646a228 commit 4b135fdd29a63e612472af300454bf80a646a228 Author: Charlie Li <vishwin@FreeBSD.org> AuthorDate: 2024-03-10 09:55:34 +0000 Commit: Charlie Li <vishwin@FreeBSD.org> CommitDate: 2024-03-10 10:00:46 +0000 Revert "java/intellij: Move man pages to share/man" Apart from the share/man move, the plist fix was not correct: pkg-static: Unable to access file /wrkdirs/usr/ports/java/intellij/work/stage/usr/local/share/intellij/lib/commons-lang3-3.11.jar:No such file or directory The above listed file has nothing to do with Python. Additional files added were also incorrect. Packaging fails as a result. The share/man move will be restored in a later commit after getting some sleep. This reverts commit e71303202ab8b168f9bc05e204d60261c99c56b1. --- java/intellij/Makefile | 4 ++-- java/intellij/pkg-plist | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/java/intellij/Makefile b/java/intellij/Makefile index 162d83bb8bcf..b4dc881d4936 100644 --- a/java/intellij/Makefile +++ b/java/intellij/Makefile @@ -3,7 +3,7 @@ PORTNAME= intellij PORTVERSION= 2020.2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java devel MASTER_SITES= https://download-cf.jetbrains.com/idea/ DISTNAME= ideaIC-${PORTVERSION}-no-jbr @@ -57,7 +57,7 @@ do-install: ${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}/share/man/man1 + ${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 diff --git a/java/intellij/pkg-plist b/java/intellij/pkg-plist index 82e0da6e2fd2..adfa7deab855 100644 --- a/java/intellij/pkg-plist +++ b/java/intellij/pkg-plist @@ -1,4 +1,5 @@ bin/idea +man/man1/idea.1.gz share/applications/idea.desktop %%DATADIR%%/Install-Linux-tar.txt %%DATADIR%%/LICENSE.txt @@ -122,7 +123,7 @@ share/applications/idea.desktop %%DATADIR%%/lib/commons-imaging-1.0-RC-1.jar %%DATADIR%%/lib/commons-io-2.6.jar %%DATADIR%%/lib/commons-lang-2.4.jar -%%DATADIR%%/lib/commons-lang3-%%PYTHON_VER%%.jar +%%DATADIR%%/lib/commons-lang3-3.9.jar %%DATADIR%%/lib/commons-logging-1.2.jar %%DATADIR%%/lib/commons-net-3.6.jar %%DATADIR%%/lib/configuration-store-impl.jar @@ -196,7 +197,6 @@ share/applications/idea.desktop %%DATADIR%%/lib/jing-20030619.jar %%DATADIR%%/lib/jna-platform.jar %%DATADIR%%/lib/jna.jar -%%DATADIR%%/lib/jnaerator-runtime-0.12.jar %%DATADIR%%/lib/jnr-a64asm-1.0.0.jar %%DATADIR%%/lib/jnr-constants-0.9.12.jar %%DATADIR%%/lib/jnr-enxio-0.21.jar @@ -212,7 +212,6 @@ share/applications/idea.desktop %%DATADIR%%/lib/jsoup-1.12.1.jar %%DATADIR%%/lib/jsp-base-openapi.jar %%DATADIR%%/lib/jsr305.jar -%%DATADIR%%/lib/jstun-0.7.5.20200723.jar %%DATADIR%%/lib/junit-4.12.jar %%DATADIR%%/lib/junit.jar %%DATADIR%%/lib/kotlin-gradle-plugin-model-1.3.70.jar @@ -290,7 +289,6 @@ share/applications/idea.desktop %%DATADIR%%/lib/pty4j-0.9.6.jar %%DATADIR%%/lib/purejavacomm-0.0.11.1.jar %%DATADIR%%/lib/qdox-2.0-M10.jar -%%DATADIR%%/lib/quiche-jna-stubs-15.jar %%DATADIR%%/lib/rd-core-0.202.100.jar %%DATADIR%%/lib/rd-framework-0.202.100.jar %%DATADIR%%/lib/rd-swing-0.202.100.jar @@ -315,7 +313,6 @@ share/applications/idea.desktop %%DATADIR%%/lib/testFramework.jar %%DATADIR%%/lib/tests_bootstrap.jar %%DATADIR%%/lib/tips-intellij-idea-community-202.13.jar -%%DATADIR%%/lib/tls-channel-0.3.2.jar %%DATADIR%%/lib/trang-core.jar %%DATADIR%%/lib/trove4j.jar %%DATADIR%%/lib/txw2-2.3.1.jar @@ -2275,7 +2272,6 @@ share/applications/idea.desktop %%DATADIR%%/plugins/yaml/lib/yaml.jar %%DATADIR%%/product-info.json %%DATADIR%%/redist/annotations-java8.jar -share/man/man1/idea.1.gz @dir %%DATADIR%%/plugins/webp/lib/libwebp/linux @dir %%DATADIR%%/plugins/webp/lib/libwebp/mac @dir %%DATADIR%%/plugins/webp/lib/libwebp/win
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403101001.42AA1ASo040815>