From nobody Sun Mar 10 10:13:24 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 4TswjD2KJpz5Dl1s; Sun, 10 Mar 2024 10:13:36 +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 4TswjD1cF4z4VcZ; Sun, 10 Mar 2024 10:13:36 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710065616; 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=GbVDIgrAxCJep0Y4+uBrk1LNL+uUTuqLqDf85j8oz1Q=; b=TLgVazQH/cazwkafzloEFP9tnpCqb2eS9A12+jf4naILKDE4VG/Wub25ksW1GMCxYrUbBo 8j5iqBBupAVcmbuSUyeb5UDzh1hBVxFdcT/sU6Hn3GXwVbFV6S8fqGKfEHLCyjK+4IW9Gt yKdKfQFo0w3DNoIaSvVVl2S8xVgHhnp4/XaTdya1ksRQwTTnlIH+rw5p7eVYNoFylDviDU nFaYK2s+vH/5NX4rQLw+5uR5b97ADKmbm9eSMAHjGVVMfbJo8PPjCfDUk/CpJtsUkv9pil ryYbMRH5L9CnsIszqCz1GeauNHfC4xoQBiOKJZaO9uKtfw4MpTsz8tm7EJgtxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710065616; a=rsa-sha256; cv=none; b=IvFc+/C7i1Lg4CLnddiZ0UhRYR2hsbww+GX1utWYjWCvY1+Do03V/lBD3JLYfvj029r2uQ VV1LvtsKMjT73pVOedlOFh+g8WKHvqTaK0uNbDFBQkukfddQJxCRXZtQ4zbmUFZOaqDw0W SCACX8dQyo+K/m+ktQ8DhpXUrq51/hT7pofe47FUBQiteCCXwbKVfHGXzYD/hCHCFbQvHs jz96Dffq8ED/DR8F0Imn3ZJw3bnUAyQ70ilZzFpL0jcc6ejdGaq3x4H5jYUFtTD0sViUJq qFEKiP08+6HAf+eU8WXRhfqmS6C9rTHCIdlPOCXd55hs8fNhFy7X8CnG4OXIQg== 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=1710065616; 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=GbVDIgrAxCJep0Y4+uBrk1LNL+uUTuqLqDf85j8oz1Q=; b=er9bGwq1HFTXA1i/BxSVnuVJOjqZW5y7ejLFmVJ6jtdtbDhmExNSuRLfeSp47paFCxT7ye IpQ1fjZxBlOFEi83T0sR7A88kHOtrUsTOmyL9ZWPzF/NzvWx2C3xhhHgpNOyFePmr5LMpk Y3vlRQFDQBnQXBmw71/P7rC6V9jAh9h+dtp3U0/zCQY4ZX00b4zZys6oxeo5+uFjVi0//L 7WZx0aO1ADjo8jswxRj1QSuY9eRSNjKbOaWRvS90ALZQd1LM6V/5rvONYPPAf6t7ugLxGB 8uQUXffKLMStn3Ak4Od7Z3QBiPNY6STNRyalOZy8ODyhksyt+yT/F2k88KycxQ== Received: from mail-oi1-f178.google.com (mail-oi1-f178.google.com [209.85.167.178]) (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 4TswjD1CQyzGxQ; Sun, 10 Mar 2024 10:13:36 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-oi1-f178.google.com with SMTP id 5614622812f47-3c1ec2d05feso1631596b6e.0; Sun, 10 Mar 2024 03:13:36 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCWs47sO/AOw/nQWD81RvGxu/k2AVZlA02AT/0AifGxNdroFGIsPX8i5GRg+IFi6KRWWfc0ASFQM1DNvuVbSnDoBXsDQoH1dJ3taajQ/dS+MO4eBfw79o3cIOnDfqInDSuPDVYDHb/1YQqnNA3+LSPTcC8Kx6BA= X-Gm-Message-State: AOJu0YxMhRW2moTRagH8iLDb00Ba3+cH6QcXtzBIdT/KJXhfLuD7ejrZ /2H+LhJLwJ8cP/chg4wCmLqXlF/vyxJ4UnNcT/STDJhPN89Gol795ykMg4ivwCE7iCR/wFdsuqn GYXyz0UiRtctcbR7qGOa53YVHHdU= X-Google-Smtp-Source: AGHT+IFHVgSqaADMJ2WGwVUrJA483b8IOTd7/H9F4bRDlxMQ/INeDDP9hsIP+HOozaKLxYaXkWi0m0BkMnwy/MaVljs= X-Received: by 2002:a05:6808:e85:b0:3c2:1d38:b296 with SMTP id k5-20020a0568080e8500b003c21d38b296mr5251712oil.20.1710065615138; Sun, 10 Mar 2024 03:13:35 -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:13:24 +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 (...) The error from my commit is that I messed with %%PYTHON_VER%% and 3.9 plist values from make makeplist. Nuno Teixeira escreveu (domingo, 10/03/2024 =C3=A0(s)= 10:11): > > (...) > > =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=3D4b135fdd29a63e612472= af300454bf80a646a228 > > > > > > 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/intelli= j/work/stage/usr/local/share/intellij/lib/commons-lang3-3.11.jar:No such fi= le 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 getti= ng > > > 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-n= ative/freebsd64/libjansi.so \ > > > ${STAGEDIR}${DATADIR}/plugins/maven/lib/maven3/lib/ja= nsi-native/freebsd64/ > > > ${INSTALL_SCRIPT} ${WRKDIR}/idea ${STAGEDIR}${PREFIX}/bin/ide= a > > > - ${INSTALL_MAN} ${FILESDIR}/idea.1 ${STAGEDIR}${PREFIX}/share/= man/man1 > > > + ${INSTALL_MAN} ${FILESDIR}/idea.1 ${STAGEDIR}${PREFIX}/man/ma= n1 > > > ${INSTALL_DATA} ${WRKDIR}/idea.desktop ${STAGEDIR}${PREFIX}/s= hare/applications/ > > > # Use fsnotifier replacement provided by java/intellij-fsnotifier > > > ${ECHO} "idea.filewatcher.executable.path=3D${PREFIX}/intelli= j/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) > > > > -- > Nuno Teixeira > FreeBSD Committer (ports) --=20 Nuno Teixeira FreeBSD Committer (ports)