From nobody Sun Mar 10 10:11:53 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 4TswgT3y4Dz5Dky4; Sun, 10 Mar 2024 10:12:05 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 4TswgT1s3Wz4Vhk; Sun, 10 Mar 2024 10:12:05 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710065525; 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=acT/paLai8XIde8XcpeV7hsYMZskRC8YvDQXQkl9KqI=; b=Xfd5G+tg9elAB4lc9UHrnpgdaoCwhUVViWfJfvEKqSWrcWTRL9/wPbXu9K+AxH6mP3ljVP xqNJA/9yJDLEqwzSs8DFsQJGxPwgTEfwj9BKDvwdkQ63Z6UgDN1yKS7bkyUcntjgpM78nM cgMzdt8SOh8bsFr8o8X8RxcK4v9rNFz7RNrexc7zJSMEeos4xAq79IOeQdxkVqf+t4btwd 7aMWpXb0ZbUpJkytp+XNUnaovaIK2eLXoeI1ATnyyEGKCzWmiyLfLDSATGN+iyC/xbwBAL eCWIflZ1xUffiLCwjm+AFHWwqB0TkusdbTKSy4AXHpskXq19WWt69MU7SaYL9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710065525; a=rsa-sha256; cv=none; b=UbOBd6q0Towmj7dteI4m9ebdNFkhDuhs7siHMlVVUSzuaxu6v8hJDc7i2b8vTrQC6+FtHP /oWQI+Psmzdn/ttgAxSMXdR7swJJ8YjihqYWgFshOOyZKSqAZxhzJDGMA/mLU9TdW6H4dn RXw3heuEPP33bznheiDNdKZTc+a4S8FXP7a9SqlqNtSWERjrYVRBNPKBBHfl9O4Vdd+Kkj ByT9Z9n0tN+Bk84fkV+5AIeaddwoT4Uc06sZ4bgLJj8XkGl5hRq1j8AuqeHlQlOPgPWTsv vjg8LYoUjGLTyn+VRR6Xh1ln6b5fkdi0RfphtC7NKIxJ2kxM5HqoI+vrRsXagg== 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=1710065525; 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=acT/paLai8XIde8XcpeV7hsYMZskRC8YvDQXQkl9KqI=; b=x7BUY53g4InJkvMmrnNyt1cLfytGL0aLRJcfR4rOXW8t/TFx5VoY/G8kC7b0kbZuoFursD 3u8963BuG1ftOd7Q8EQwsFK99uMyVAVthr5urTaaB0JDYdOmIcIVbkIfY8CsCyd2QHCtOY 3EQ/cnM3TEPfLoHQdOpWijXkwtJNrfXRVPUhoMEsic0ZtdhQMLhJwftLAxiyvPmI3o2oZo i+45V6ACz5ANJaEXT/USgU0CM232SNUaVLR1vK0w17BqpJSsWza8nTxWzaa/H4x7IHNLTJ EEAeIa6QKsusj8pLDEWJZpLXxmiQ1aDyEtEVUNUE9N13KZzPYJnN04Vkl0GKUg== Received: from mail-oa1-f43.google.com (mail-oa1-f43.google.com [209.85.160.43]) (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 4TswgT1S7FzFZW; Sun, 10 Mar 2024 10:12:05 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-oa1-f43.google.com with SMTP id 586e51a60fabf-21fb368b468so2384617fac.0; Sun, 10 Mar 2024 03:12:05 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCUUrzLmxQ/qdkxREd4o01JBRy7rKt/5BM94xYkOGftJcAzpeS4FI2t0VCYGIPvCaRmA4OLTk5lr/HO+Lrytcq/8Ze+VsD82Txp92eBw27phaLisQ9eJPYoNY57ub/DfpVb2b3O4rqI1BP6Q20ZSN/VE5vXL25I= X-Gm-Message-State: AOJu0Yxfya/d7CnxnPkriCVgoLyaE2usBfSOgcOA2EdSLk3a9mYtK5Aq D9wwB6kiaelau7/uennpKSRQcIyyxk6vnyJkd8b9O47BWAMxCdhCsBH47TXmarixMYSlwVuGP8R ILqW9R2KulhCNK0bhEWzKIsk1k/Q= X-Google-Smtp-Source: AGHT+IEv+hEnMkfI6ejd/Gqz9LkHG6TRR27zcalutNAzhyUFdLp59POI1Csxlt+V7SLWsKbR5jvJSkBJFO59V1xvx0c= X-Received: by 2002:a05:6358:7320:b0:17b:640b:a2b0 with SMTP id d32-20020a056358732000b0017b640ba2b0mr5839739rwg.2.1710065524374; Sun, 10 Mar 2024 03:12:04 -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: From: Nuno Teixeira Date: Sun, 10 Mar 2024 10:11:53 +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 (...) =3D=3D=3D=3D> Compressing man pages (compress-man) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D> Running Q/A tests (stage-qa) Warning: Installing man files in /usr/local/man is no longer supported. Consider installing these files in /usr/local/share/man instead. 138445 -r--r--r-- 1 nobody wheel 285 Mar 10 10:10:18 2024 /wrkdirs/usr/ports/java/intellij/work/stage/usr/local/man/man1/idea.1.gz =3D=3D=3D=3D> Checking for pkg-plist issues (check-plist) =3D=3D=3D> Parsing plist =3D=3D=3D> Checking for items in STAGEDIR missing from pkg-plist Error: Orphaned: %%DATADIR%%/lib/jnaerator-runtime-0.12.jar Error: Orphaned: %%DATADIR%%/lib/jstun-0.7.5.20200723.jar Error: Orphaned: %%DATADIR%%/lib/quiche-jna-stubs-15.jar Error: Orphaned: %%DATADIR%%/lib/tls-channel-0.3.2.jar =3D=3D=3D> Checking for items in pkg-plist which are not in STAGEDIR =3D=3D=3D> Error: Plist issues found. *** Error code 1 Stop. make: stopped in /usr/ports/java/intellij Nuno Teixeira escreveu (domingo, 10/03/2024 =C3=A0(s)= 10:11): > > 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=3D4b135fdd29a63e612472af= 300454bf80a646a228 > > > > 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/= 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=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-nat= ive/freebsd64/libjansi.so \ > > ${STAGEDIR}${DATADIR}/plugins/maven/lib/maven3/lib/jans= i-native/freebsd64/ > > ${INSTALL_SCRIPT} ${WRKDIR}/idea ${STAGEDIR}${PREFIX}/bin/idea > > - ${INSTALL_MAN} ${FILESDIR}/idea.1 ${STAGEDIR}${PREFIX}/share/ma= n/man1 > > + ${INSTALL_MAN} ${FILESDIR}/idea.1 ${STAGEDIR}${PREFIX}/man/man1 > > ${INSTALL_DATA} ${WRKDIR}/idea.desktop ${STAGEDIR}${PREFIX}/sha= re/applications/ > > # Use fsnotifier replacement provided by java/intellij-fsnotifier > > ${ECHO} "idea.filewatcher.executable.path=3D${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 > > > > -- > Nuno Teixeira > FreeBSD Committer (ports) --=20 Nuno Teixeira FreeBSD Committer (ports)