Hi. This updates pinentry to the latest stable release (1.2.0). While here, drop the gtk2 subpackage and add a qt5 one.
OK? Index: devel/quirks/Makefile =================================================================== RCS file: /cvs/ports/devel/quirks/Makefile,v retrieving revision 1.1340 diff -u -p -r1.1340 Makefile --- devel/quirks/Makefile 8 Jan 2022 17:33:18 -0000 1.1340 +++ devel/quirks/Makefile 13 Jan 2022 12:00:48 -0000 @@ -5,7 +5,7 @@ CATEGORIES = devel databases DISTFILES = # API.rev -PKGNAME = quirks-4.93 +PKGNAME = quirks-4.94 PKG_ARCH = * MAINTAINER = Marc Espie <[email protected]> Index: devel/quirks/files/Quirks.pm =================================================================== RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v retrieving revision 1.1357 diff -u -p -r1.1357 Quirks.pm --- devel/quirks/files/Quirks.pm 8 Jan 2022 17:33:18 -0000 1.1357 +++ devel/quirks/files/Quirks.pm 13 Jan 2022 12:00:48 -0000 @@ -694,6 +694,7 @@ my $stem_extensions = { 'apertium-mk-bg' => 'apertium-mkd-bul', 'apertium-mk-en' => 'apertium-mkd-eng', 'apertium-pt-ca' => 'apertium-por-cat', + 'pinentry-gtk2' => 'pinentry-gnome3', }; my $obsolete_reason = {}; Index: security/pinentry/Makefile =================================================================== RCS file: /cvs/ports/security/pinentry/Makefile,v retrieving revision 1.27 diff -u -p -r1.27 Makefile --- security/pinentry/Makefile 7 Jul 2021 07:53:30 -0000 1.27 +++ security/pinentry/Makefile 13 Jan 2022 12:00:48 -0000 @@ -1,18 +1,14 @@ # $OpenBSD: Makefile,v 1.27 2021/07/07 07:53:30 edd Exp $ COMMENT-main = PIN or passphrase entry dialog (ncurses interface) -COMMENT-gtk2 = PIN or passphrase entry dialog (gtk2 interface) COMMENT-gnome3 =PIN or passphrase entry dialog (GNOME 3 interface) +COMMENT-qt5 = PIN or passphrase entry dialog (Qt5 interface) -VERSION = 1.1.1 +VERSION = 1.2.0 DISTNAME = pinentry-${VERSION} CATEGORIES = security EXTRACT_SUFX = .tar.bz2 -PKGNAME-main = ${DISTNAME} -PKGNAME-gtk2 = pinentry-gtk2-${VERSION} -PKGNAME-gnome3 =pinentry-gnome3-${VERSION} - MASTER_SITES = ${MASTER_SITE_GNUPG:=pinentry/} HOMEPAGE = https://www.gnupg.org/related_software/pinentry/index.en.html @@ -28,39 +24,37 @@ WANTLIB += curses secret-1 LIB_DEPENDS = security/libassuan \ x11/gnome/libsecret -WANTLIB-gtk2 += ${WANTLIB} -WANTLIB-gtk2 += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama -WANTLIB-gtk2 += Xrandr Xrender atk-1.0 cairo fontconfig freetype gdk-x11-2.0 -WANTLIB-gtk2 += gdk_pixbuf-2.0 gtk-x11-2.0 pango-1.0 pangocairo-1.0 -WANTLIB-gtk2 += pangoft2-1.0 z - -LIB_DEPENDS-gtk2 = ${LIB_DEPENDS} \ - x11/gtk+2 - WANTLIB-gnome3 += ${WANTLIB} WANTLIB-gnome3 += atk-1.0 cairo cairo-gobject gck-1 gcr-base-3 gcr-ui-3 -WANTLIB-gnome3 += gdk-3 gdk_pixbuf-2.0 gtk-3 p11-kit pango-1.0 pangocairo-1.0 +WANTLIB-gnome3 += gdk-3 gdk_pixbuf-2.0 gtk-3 harfbuzz p11-kit pango-1.0 +WANTLIB-gnome3 += pangocairo-1.0 LIB_DEPENDS-gnome3 = ${LIB_DEPENDS} \ x11/gnome/gcr +WANTLIB-qt5 += ${WANTLIB} +WANTLIB-qt5 += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Widgets m + +LIB_DEPENDS-qt5 = ${LIB_DEPENDS} \ + x11/qt5/qtbase + CONFIGURE_STYLE = gnu CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include -D_XOPEN_SOURCE_EXTENDED" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS = --enable-pinentry-curses \ - --disable-pinentry-qt \ + --disable-pinentry-tty \ + --disable-pinentry-emacs \ + --disable-pinentry-gtk2 \ + --disable-pinentry-efl \ + --disable-pinentry-tqt \ --disable-pinentry-fltk -MULTI_PACKAGES = -main -gtk2 -gnome3 +MULTI_PACKAGES = -main -gnome3 -qt5 -PSEUDO_FLAVORS= no_gtk2 no_gnome3 bootstrap -FLAVOR?= no_gtk2 no_gnome3 bootstrap +PSEUDO_FLAVORS= no_gnome3 bootstrap +FLAVOR?= no_gnome3 bootstrap .include <bsd.port.arch.mk> - -.if !${BUILD_PACKAGES:M-gtk2} -CONFIGURE_ARGS += --disable-pinentry-gtk2 -.endif .if !${BUILD_PACKAGES:M-gnome3} CONFIGURE_ARGS += --disable-pinentry-gnome3 Index: security/pinentry/distinfo =================================================================== RCS file: /cvs/ports/security/pinentry/distinfo,v retrieving revision 1.8 diff -u -p -r1.8 distinfo --- security/pinentry/distinfo 7 Jul 2021 07:53:30 -0000 1.8 +++ security/pinentry/distinfo 13 Jan 2022 12:00:48 -0000 @@ -1,2 +1,2 @@ -SHA256 (pinentry-1.1.1.tar.bz2) = zRKgZAE+0Y4u6EdeZpufWNsbIloBRN69uFpozs3bpX8= -SIZE (pinentry-1.1.1.tar.bz2) = 515723 +SHA256 (pinentry-1.2.0.tar.bz2) = EAcgRaPgQ9BYH5HNVnb8rH/+6VehZjat7apPWDphZHA= +SIZE (pinentry-1.2.0.tar.bz2) = 498390 Index: security/pinentry/pkg/DESCR-gtk2 =================================================================== RCS file: security/pinentry/pkg/DESCR-gtk2 diff -N security/pinentry/pkg/DESCR-gtk2 --- security/pinentry/pkg/DESCR-gtk2 4 Nov 2011 12:12:56 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1 +0,0 @@ -This package provides a GTK2 interface to pinentry. Index: security/pinentry/pkg/DESCR-qt5 =================================================================== RCS file: security/pinentry/pkg/DESCR-qt5 diff -N security/pinentry/pkg/DESCR-qt5 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ security/pinentry/pkg/DESCR-qt5 13 Jan 2022 12:00:48 -0000 @@ -0,0 +1 @@ +This package provides a Qt5 interface to pinentry. Index: security/pinentry/pkg/PLIST-gnome3 =================================================================== RCS file: /cvs/ports/security/pinentry/pkg/PLIST-gnome3,v retrieving revision 1.1 diff -u -p -r1.1 PLIST-gnome3 --- security/pinentry/pkg/PLIST-gnome3 12 Oct 2015 05:43:53 -0000 1.1 +++ security/pinentry/pkg/PLIST-gnome3 13 Jan 2022 12:00:48 -0000 @@ -1,2 +1,4 @@ @comment $OpenBSD: PLIST-gnome3,v 1.1 2015/10/12 05:43:53 ajacoutot Exp $ +@conflict pinentry-gtk2-* +@pkgpath security/pinentry,-gtk2 @bin bin/pinentry-gnome3 Index: security/pinentry/pkg/PLIST-gtk2 =================================================================== RCS file: security/pinentry/pkg/PLIST-gtk2 diff -N security/pinentry/pkg/PLIST-gtk2 --- security/pinentry/pkg/PLIST-gtk2 4 Nov 2011 12:12:56 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,2 +0,0 @@ -@comment $OpenBSD: PLIST-gtk2,v 1.1 2011/11/04 12:12:56 stsp Exp $ -@bin bin/pinentry-gtk-2 Index: security/pinentry/pkg/PLIST-qt5 =================================================================== RCS file: security/pinentry/pkg/PLIST-qt5 diff -N security/pinentry/pkg/PLIST-qt5 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ security/pinentry/pkg/PLIST-qt5 13 Jan 2022 12:00:48 -0000 @@ -0,0 +1,2 @@ +@comment $OpenBSD: PLIST-gtk2,v 1.1 2011/11/04 12:12:56 stsp Exp $ +@bin bin/pinentry-qt -- Antoine
