From nobody Sat Apr 30 19:39:51 2022 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 68BB61ABE849; Sat, 30 Apr 2022 19:39:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KrKSS1NsGz3rj6; Sat, 30 Apr 2022 19:39:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651347592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hUA+MfLNNH2m3Ov+bQIQfICLUsuBmSpeastyBaLcWeM=; b=xYJgbEaYQI+yDXP4O6z7xcazGer/6V1pRWDJZV5bB84LBHfCycOyG2j1wqTNI7M3fOibQl lO96+v5Ro0wONl7i10ORbCHj+EwhHMY6TyOWD8E2gUlSg7edHLoAaZJIftKYeFp2cRCuX4 m9pdrDj5Q22XgO0ARDs2DGRmHBd9X8uK4EXt9YEoVtWaol7HzRf0WWka0IZHSfZVWuK8nr IjO5ncxPUtjH5odqF9k/HbtAC4y4JMBEtn70DW4sgy22yC+88446tQJGQLXY6hvn0muryP m9UakkYiyW4HSRo3A9JQ81qXrGmxZZdZBmFznQmYF9UY7b0KOhO7UiD2cDdrKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E418027681; Sat, 30 Apr 2022 19:39:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23UJdpZR097170; Sat, 30 Apr 2022 19:39:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23UJdpk8097169; Sat, 30 Apr 2022 19:39:51 GMT (envelope-from git) Date: Sat, 30 Apr 2022 19:39:51 GMT Message-Id: <202204301939.23UJdpk8097169@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 6c2c407eeff2 - main - security/pinentry-gnome3: De-version and rename 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: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6c2c407eeff27aa5d77e044a57d987612b339a0e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651347592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hUA+MfLNNH2m3Ov+bQIQfICLUsuBmSpeastyBaLcWeM=; b=Ylfnt4+NXWUDbMIuEH9dtlf5mZMV43oYZKI1JiQfEJi8O5rMpl0eXHCUy26c6zyxBIKgwl s+Q1HMXlLcmm9NuauYZPq2Tv0KxxO5cjKPRunKAPv5wZ9C4deaAKHN5jpfacZgkZdVuIuY eoERvw9s/5E6VPC1aKj0iW3TnvlCkSmVLJvvYuJioeOO2dKL979Ul5uc1az1pVCemwwnlB Ka4Okt6DWihWL38VI+jSrJioj8HTLpanh3b0X/2PcRTQMRHwENhlGd2tcPtN6gWdXEa0Mz ibBkX7YXMr++/ocme5NLFIJ3CI0e6YT8DD24QVeCk9h4ctDv8QobgPTJ41jmxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651347592; a=rsa-sha256; cv=none; b=aONlVsQJtQ2dKHX12+5VcEgSUwceQ9RoHRbrGJPO/D7GoVX27g8Z0Cc8YG/x8Txhz+Xy1F FeVHSSn6J2zrr6L+es0wwbhmFE7vJtMpGA9MVeOs9wWeJopGlRrB8eSSc5CxwC18yuGc5t 9wDld8z1Bj1AkmGSbVOQELwoHesdqKvIm/g7dqsQ5U+Vdq8eRckb82ACO3TCogBl4aORfZ 4bQeZFtYEsTeY8BSgUFkD9OEbb7caFKTkgxVyy0O5WYHLrZwAjLpICn2H6K8W6J0+vck+t tPwvwueysfyQUn5bfOFtCkYp57i+Z36cFhmQbplTGGh+bI2a0dd/IYyf4wP9Xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=6c2c407eeff27aa5d77e044a57d987612b339a0e commit 6c2c407eeff27aa5d77e044a57d987612b339a0e Author: Jason E. Hale AuthorDate: 2022-04-30 19:22:41 +0000 Commit: Jason E. Hale CommitDate: 2022-04-30 19:22:41 +0000 security/pinentry-gnome3: De-version and rename Due to the new GNOME versioning scheme, security/pinentry-gnome3 has been renamed to security/pinentry-gnome and all references to "GNOME 3" have been dropped in favor of just "GNOME". The binary itself still installs as pinentry-gnome3 at this time, however. Rename the option GNOME3 -> GNOME in security/pinentry. PR: 263681 Reported by: PauAmma --- MOVED | 1 + security/Makefile | 2 +- .../{pinentry-gnome3 => pinentry-gnome}/Makefile | 4 ++-- security/pinentry/Makefile | 18 +++++++-------- security/pinentry/pkg-message.gnome | 26 ++++++++++++++++++++++ security/pinentry/pkg-message.gnome3 | 26 ---------------------- 6 files changed, 39 insertions(+), 38 deletions(-) diff --git a/MOVED b/MOVED index 17a4eaec9e81..6d11155f0496 100644 --- a/MOVED +++ b/MOVED @@ -17140,3 +17140,4 @@ net/google-cloud-sdk-app-engine-go||2022-04-27|Obsolete, not supported by the cu www/py-dj32-django-modelcluster|www/py-django-modelcluster|2022-04-30|Remove obsoleted port. Use www/py-django-modelcluster instead www/rubygem-rack-proxy06|www/rubygem-rack-proxy|2022-04-30|Remove obsoleted port. Use www/rubygem-rack-proxy instead security/py-ssh|security/py-paramiko|2022-04-30|Remove obsoleted port. Use security/py-paramiko instead +security/pinentry-gnome3|security/pinentry-gnome|2022-04-30|De-versioned due to new GNOME versioning scheme diff --git a/security/Makefile b/security/Makefile index 66f61f6149ac..ed80372f48a9 100644 --- a/security/Makefile +++ b/security/Makefile @@ -781,7 +781,7 @@ SUBDIR += pinentry-curses SUBDIR += pinentry-efl SUBDIR += pinentry-fltk - SUBDIR += pinentry-gnome3 + SUBDIR += pinentry-gnome SUBDIR += pinentry-gtk2 SUBDIR += pinentry-qt5 SUBDIR += pinentry-tty diff --git a/security/pinentry-gnome3/Makefile b/security/pinentry-gnome/Makefile similarity index 58% rename from security/pinentry-gnome3/Makefile rename to security/pinentry-gnome/Makefile index 0e8076f68bba..713d3747a985 100644 --- a/security/pinentry-gnome3/Makefile +++ b/security/pinentry-gnome/Makefile @@ -1,9 +1,9 @@ PORTNAME= pinentry PORTREVISION= 0 -COMMENT= GNOME 3 version of the GnuPG password dialog +COMMENT= GNOME version of the GnuPG password dialog -PINENTRY_GUI= gnome3 +PINENTRY_GUI= gnome MASTERDIR= ${.CURDIR}/../pinentry diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile index 05470ffba39b..d6c09217f9f5 100644 --- a/security/pinentry/Makefile +++ b/security/pinentry/Makefile @@ -2,7 +2,7 @@ PORTNAME= pinentry PORTVERSION= 1.2.0 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= security MASTER_SITES= GNUPG/pinentry @@ -21,7 +21,7 @@ NO_BUILD= yes PLIST_FILES= bin/pinentry OPTIONS_SINGLE= FRONTEND -OPTIONS_SINGLE_FRONTEND= TTY NCURSES EFL FLTK GTK2 QT5 GNOME3 +OPTIONS_SINGLE_FRONTEND= EFL FLTK GNOME GTK2 NCURSES QT5 TTY OPTIONS_DEFAULT= NCURSES FRONTEND_DESC= Default frontend @@ -50,13 +50,13 @@ QT5_DESC= Qt 5 frontend PINENTRY_QT5= pinentry-qt5 QT5_RUN_DEPENDS= ${PINENTRY_QT5}:security/pinentry-qt5 -GNOME3_DESC= GNOME 3 frontend -PINENTRY_GNOME3= pinentry-gnome3 -# Due to a dependency loop that exists between security/pinentry-gnome3, +GNOME_DESC= GNOME frontend +PINENTRY_GNOME= pinentry-gnome3 +# Due to a dependency loop that exists between security/pinentry-gnome, # security/gcr, security/gnupg and security/pinentry, the user must install -# pinentry-gnome3 manually. See pkg-message.gnome3 for more details. -#GNOME3_RUN_DEPENDS= ${PINENTRY_GNOME3}:security/pinentry-gnome3 -GNOME3_VARS= PKGMESSAGE+=${.CURDIR}/pkg-message.gnome3 +# pinentry-gnome manually. See pkg-message.gnome for more details. +#GNOME_RUN_DEPENDS= ${PINENTRY_GNOME}:security/pinentry-gnome +GNOME_VARS= PKGMESSAGE+=${.CURDIR}/pkg-message.gnome .include @@ -88,7 +88,7 @@ LIBSECRET_LIB_DEPENDS= libsecret-1.so:security/libsecret LIBSECRET_USES= gnome LIBSECRET_USE= GNOME=glib20 -.if ${PINENTRY_GUI} == "gnome3" +.if ${PINENTRY_GUI} == "gnome" OPTIONS_SLAVE= LIBSECRET LIB_DEPENDS+= libgcr-base-3.so:security/gcr PLIST_FILES= bin/pinentry-gnome3 diff --git a/security/pinentry/pkg-message.gnome b/security/pinentry/pkg-message.gnome new file mode 100644 index 000000000000..7e8734df7d66 --- /dev/null +++ b/security/pinentry/pkg-message.gnome @@ -0,0 +1,26 @@ +[ +{ type: install + message: <