From nobody Tue Oct 19 23:43:22 2021 X-Original-To: dev-commits-ports-all@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 97C6118038D2; Tue, 19 Oct 2021 23:43:33 +0000 (UTC) (envelope-from pkubaj@anongoth.pl) Received: from mail.anongoth.pl (mail.anongoth.pl [46.248.190.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X448 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "anongoth.pl", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HYr0j3C4qz4l0P; Tue, 19 Oct 2021 23:43:33 +0000 (UTC) (envelope-from pkubaj@anongoth.pl) Received: from anongoth.pl (unknown [192.168.1.15]) (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 did not present a certificate) (Authenticated sender: pkubaj@anongoth.pl) by mail.anongoth.pl (Postfix) with ESMTPSA id A50D310CDC3; Wed, 20 Oct 2021 01:43:23 +0200 (CEST) Date: Wed, 20 Oct 2021 01:43:22 +0200 From: Piotr Kubaj To: Eric Turgeon Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 674d093cd093 - main - x11/mate-panel: Revert "x11/mate-panel: Revert to 1.24.2 and bump PORTEPOCH" Message-ID: References: <202110192337.19JNbWYG049096@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="Cb5X8ymZmOuXmIj7" Content-Disposition: inline In-Reply-To: <202110192337.19JNbWYG049096@gitrepo.freebsd.org> X-Rspamd-Queue-Id: 4HYr0j3C4qz4l0P X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-Spam: Yes X-ThisMailContainsUnwantedMimeParts: N --Cb5X8ymZmOuXmIj7 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Since you previously bumped PORTEPOCH, upgrading won't work now. You need to leave PORTEPOCH. On 21-10-19 23:37:32, Eric Turgeon wrote: > The branch main has been updated by ericbsd: >=20 > URL: https://cgit.FreeBSD.org/ports/commit/?id=3D674d093cd09349d36e8dec9c= 0dcdf05daf0fc988 >=20 > commit 674d093cd09349d36e8dec9c0dcdf05daf0fc988 > Author: Eric Turgeon > AuthorDate: 2021-10-19 23:34:33 +0000 > Commit: Eric Turgeon > CommitDate: 2021-10-19 23:37:24 +0000 >=20 > x11/mate-panel: Revert "x11/mate-panel: Revert to 1.24.2 and bump POR= TEPOCH" > =20 > This reverts commit 0d45d70a5fdf13af63c2363ae7c57a1def43415f. > =20 > It should have never been reverted at the first place. > =20 > PR: 259058 > Reported by: John Hein > --- > x11/mate-panel/Makefile | 6 +----- > x11/mate-panel/distinfo | 8 +++----- > x11/mate-panel/pkg-plist | 4 ++++ > 3 files changed, 8 insertions(+), 10 deletions(-) >=20 > diff --git a/x11/mate-panel/Makefile b/x11/mate-panel/Makefile > index 77916eda144b..7b25c860e717 100644 > --- a/x11/mate-panel/Makefile > +++ b/x11/mate-panel/Makefile > @@ -1,15 +1,11 @@ > # Created by: Joe Marcus Clarke > =20 > PORTNAME=3D mate-panel > -PORTVERSION=3D 1.24.2 > -PORTEPOCH=3D 1 > +PORTVERSION=3D 1.26.1 > CATEGORIES=3D x11 mate > MASTER_SITES=3D MATE > DIST_SUBDIR=3D mate > =20 > -PATCH_SITES=3D https://github.com/mate-desktop/${PORTNAME}/commit/ > -PATCHFILES+=3D 9f15be59faa7.patch:-p1 # https://github.com/mate-desktop/= mate-panel/pull/1104 > - > MAINTAINER=3D gnome@FreeBSD.org > COMMENT=3D Panel component for the MATE Desktop > =20 > diff --git a/x11/mate-panel/distinfo b/x11/mate-panel/distinfo > index a142fac86d82..2fab1231762e 100644 > --- a/x11/mate-panel/distinfo > +++ b/x11/mate-panel/distinfo > @@ -1,5 +1,3 @@ > -TIMESTAMP =3D 1623609107 > -SHA256 (mate/mate-panel-1.24.2.tar.xz) =3D 30c5ba0392ec76b110220ee6d10bb= dba76af36586592a6b3d604db70602848ea > -SIZE (mate/mate-panel-1.24.2.tar.xz) =3D 3271432 > -SHA256 (mate/9f15be59faa7.patch) =3D f3e7c063a122ae41809276b61a2ec306a27= 562ef65832eb3ffe92063868ad819 > -SIZE (mate/9f15be59faa7.patch) =3D 804 > +TIMESTAMP =3D 1633811941 > +SHA256 (mate/mate-panel-1.26.1.tar.xz) =3D 683038c483456e5068f5bb20c3d56= 5936700c9898005c7149ee7aa44e5cc110d > +SIZE (mate/mate-panel-1.26.1.tar.xz) =3D 3309564 > diff --git a/x11/mate-panel/pkg-plist b/x11/mate-panel/pkg-plist > index 52184bf6ff0c..b4c58e6ba6ba 100644 > --- a/x11/mate-panel/pkg-plist > +++ b/x11/mate-panel/pkg-plist > @@ -813,6 +813,9 @@ share/help/zh_CN/mate-clock/legal.xml > share/help/zh_CN/mate-fish/figures/fish_applet.png > share/help/zh_CN/mate-fish/index.docbook > share/help/zh_CN/mate-fish/legal.xml > +share/help/zh-Hans/mate-clock/figures/clock_applet.png > +share/help/zh-Hans/mate-clock/index.docbook > +share/help/zh-Hans/mate-clock/legal.xml > share/help/zh_HK/mate-clock/figures/clock_applet.png > share/help/zh_HK/mate-clock/index.docbook > share/help/zh_HK/mate-clock/legal.xml > @@ -955,6 +958,7 @@ share/locale/el/LC_MESSAGES/mate-panel.mo > share/locale/en_AU/LC_MESSAGES/mate-panel.mo > share/locale/en_CA/LC_MESSAGES/mate-panel.mo > share/locale/en_GB/LC_MESSAGES/mate-panel.mo > +share/locale/en_US/LC_MESSAGES/mate-panel.mo > share/locale/eo/LC_MESSAGES/mate-panel.mo > share/locale/es/LC_MESSAGES/mate-panel.mo > share/locale/es_AR/LC_MESSAGES/mate-panel.mo --Cb5X8ymZmOuXmIj7 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEycyIeNkkgohzsoorelmbhSCDnJ0FAmFvWBoACgkQelmbhSCD nJ09Eg/7B/UeeQrj9SCBcrAUs5KRN3tsh7WSdDn/ZfTrBCRbEiM37ICh40dCjXUW +e/hEfMzJydRyV8LOq9NjL139fYlbvFxBm35VXNn8HRIqPJToI+XsLvokvJJnFaA cokNAal3QRzZcWq6b3H3i2DUfyakSTWPTLz2dii6C3O6F5Fg/PU516+h4DAZ7UK4 bh7JoBddGQ6tThAcXcdmAe7J1dEf2rYZ0la1cfSGOeQuJih/32WXcSGblcFm+sHx 2H2k/1EF3FXA4K0+thOOYJNG7Wk4+2qvgHAJbxTSsC/1T/U62tum0xrSk17/6H7n sbd4FMz7jeqfhko+J37knkRJRC05aGyHdKtOfHxjzCC//w3ilDx7Y6GcdG30naF0 lYbLrAdCHaZXr6w/6E43AW0yrGXb8WGo510p1Z8hhsOX3m0ajimY7kO7YEXohLTH BSGAihs9PyN4vmHcexMOz2Il24AIydzFUYY8+oqzcOX7H7hwRjOEtI4SnybleGpd tiY4jMwZURqppr+jFSMrTD8vtNxr+US+kevH5Dvc955BVVTne1NJa54/tQmiytVn hkPIG93vEvrHHBrcKLrQfffXnS51Tsztb3dGlMmtagCErEBZMEqIR9w0ik5p5BSr N/WWWTGxG4fsv290ccGuGuHF6pvoRQJuuc+ZLhVYnxE/nd4efyI= =c1i7 -----END PGP SIGNATURE----- --Cb5X8ymZmOuXmIj7--