From nobody Sun Mar 10 10:11:20 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tswfq4WlJz5Dl4c; Sun, 10 Mar 2024 10:11:31 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tswfq45Plz4V5j; Sun, 10 Mar 2024 10:11:31 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710065491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qDv6h9J/QlrLxLNRomgMXZVxferCZGXONG9isq9azV4=; b=Dt2jPlD5q2OgH9w61aiXWavaSWifk6/YqMovqdOgt3+7qwy0+mgsA1DhYDjg8NbgN7HBaM iNie3xHMqw7L/O8PhVtwXnbNGhm+CMiCEoz9zslTntDM76h+ep8OQ3nXekWB4Cc1vTfJPP BuZpul5tGwEcBCYfjhcuKUkw6epT6TuGASZgJQJocUnY5NsvuDRrGWcruBPXSdZPEep1RQ GDs2tweaer7zekKXey5pa7ehCbvt97VXLqZOdN+AzMrn0jRathYKinhNlcuKyK3J1G0K/w CiPFxiWtOOjif5nkDn1HdStLFRm5SO4PTDaoszalznO7jzW0FimtSBcUY/o91A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710065491; a=rsa-sha256; cv=none; b=YVJCCS3Vogz4Qws77Eut0Ylrey7jFTVoqavPHn6XlWf07Ttz2WN75ibhaVnuD3MG7V/tjg PzqoXNGtc78cfWEGFGNxdW+jhfUxMLgKvtB1NYd+/PkBTYe51JzYDz5vmL8vCdP7ACfUFc DWxdNSESmEAFvKCeJRpBLY6klFJAHrb9Os7P2oQgOcYQPJNkpn0oEp/pX1ItBiPm/L0k/5 r7XMIQUGuWpA8qWl28D/WmbwP9HLkB2r/V+mxpH3gspvLH0ebu+3hxYmazp0mEfuCMKKah 4L0mGboiiryL+8nvwUCCczOi1EyemNbdQsKuaXhBobnuZ9AJbQ7KrMV68OKQ1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710065491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qDv6h9J/QlrLxLNRomgMXZVxferCZGXONG9isq9azV4=; b=TUK5nzh79Ss+8qwQLiBmnOqimPieJK/zGPxk6y+tODlKk7613kEPOlkDktZUSdIH22eAlv 0vNKUvUXHb9JnfFHIg+HzvxJz5Vn3gbu9YL0fr2gLdOyAqzcG6BPg+YyVVesirsJrHt9U6 EaqowwfuW7hiHMxuJHDXs25Zw3r+YQRp6UyhJrmXGPhCFhvSRlQW4zI/2fpzkZrTYBfJWx 0gON2qT6Kp8hlR/MAWEMMtQWhklMtx3U+Sy8XhK95MuGJjliQmiflvxmFZrTYrBuwH5Y7G qDvCe0MKvHeh2BUOGkeyWdznOfi1syX30p5cx+U/A3hPPGJ0wPJG6k5kwgVqzg== Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Tswfq3htNzGs7; Sun, 10 Mar 2024 10:11:31 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-qt1-f175.google.com with SMTP id d75a77b69052e-42f0d09f567so11816491cf.1; Sun, 10 Mar 2024 03:11:31 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCXEcL69EiFADXKGoDl6/IZ9eScqMNzyBmC+n3yI5jBDPwbSkB0b4Kll26iagK/re3Tr5hhPYRZ4ZrI+jSGGQ8/fdndT9RLgVSTAXJ9ullisdfHV37R/Hi2mw1EaDu9edTSSQvxQkB+deS0NCya9VhiYY8BnOG0= X-Gm-Message-State: AOJu0YwFJyeId+BCbjDGRFz8+5qotBMfYRdsfVazP2GSOUP6ANHMWENd b7VcqveWqsOvX10uSB1xc57zKgR/0DY7uzTQzp9d/sLxxtHyJNXZ57WtJznOrIs1D2UE2HklgY4 o18wZfGKmn4Sfu3luyAmAvbUk+mw= X-Google-Smtp-Source: AGHT+IHWOxRHGtQ1mT3adWdJCcspT8mITEfTH2EbuezE7HaNc44SOmxNIW1CsUTHFLiiYmz5j0vuWHRIvAxcqeRz9NA= X-Received: by 2002:a05:622a:1388:b0:42e:ab25:9526 with SMTP id o8-20020a05622a138800b0042eab259526mr5207181qtk.67.1710065490843; Sun, 10 Mar 2024 03:11:30 -0700 (PDT) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 References: <202403101001.42AA1ASo040815@gitrepo.freebsd.org> In-Reply-To: <202403101001.42AA1ASo040815@gitrepo.freebsd.org> From: Nuno Teixeira Date: Sun, 10 Mar 2024 10:11:20 +0000 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 4b135fdd29a6 - main - Revert "java/intellij: Move man pages to share/man" To: Charlie Li Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hello Charlie, With this revert I get: Charlie Li escreveu (domingo, 10/03/2024 =C3=A0(s) 10= :01): > > The branch main has been updated by vishwin: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=3D4b135fdd29a63e612472af30= 0454bf80a646a228 > > commit 4b135fdd29a63e612472af300454bf80a646a228 > Author: Charlie Li > AuthorDate: 2024-03-10 09:55:34 +0000 > Commit: Charlie Li > 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/wo= rk/stage/usr/local/share/intellij/lib/commons-lang3-3.11.jar:No such file o= r 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=3D intellij > PORTVERSION=3D 2020.2.3 > -PORTREVISION=3D 1 > +PORTREVISION=3D 2 > CATEGORIES=3D java devel > MASTER_SITES=3D https://download-cf.jetbrains.com/idea/ > DISTNAME=3D ideaIC-${PORTVERSION}-no-jbr > @@ -57,7 +57,7 @@ do-install: > ${INSTALL_LIB} ${WRKSRC}/plugins/maven/lib/maven3/lib/jansi-nativ= e/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=3D${PREFIX}/intellij/bi= n/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 --=20 Nuno Teixeira FreeBSD Committer (ports)