it's missing "@pkgpath security/pinentry,-qt5" - I would also use * rather
than a version spec in the @conflict lines on the off-chance this might
need to be updated in -stable.
--
Sent from a phone, apologies for poor formatting.
On 15 October 2026 06:53:09 Rafael Sadowski <[email protected]> wrote:
On Wed Oct 14, 2026 at 08:02:27AM +0200, Antoine Jacoutot wrote:
It could benefit from an upgrade path.
--
Antoine
Thanks Antoine,
A new diff that replaces -qt6 and -qt5 with a new -qt subpackage and
provides upgrade paths for both.
diff --git a/devel/quirks/Makefile b/devel/quirks/Makefile
index e22b09f9aaf..6158237f14f 100644
--- a/devel/quirks/Makefile
+++ b/devel/quirks/Makefile
@@ -3,7 +3,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-7.231
+PKGNAME = quirks-7.232
PKG_ARCH = *
MAINTAINER = Marc Espie <[email protected]>
diff --git a/devel/quirks/files/Quirks.pm b/devel/quirks/files/Quirks.pm
index c237d81464b..68cbdd972ab 100644
--- a/devel/quirks/files/Quirks.pm
+++ b/devel/quirks/files/Quirks.pm
@@ -274,6 +274,9 @@ my $stem_extensions = {
'p7zip-rar' => '7zip-rar',
'kyua-cli' => 'kyua',
'kyua-testers' => 'kyua',
+# 8.1
+ 'pinentry-qt5' => 'pinentry-qt',
+ 'pinentry-qt6' => 'pinentry-qt',
};
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index 5046d2a45cc..cedfd94589a 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -1,7 +1,6 @@
COMMENT-main = PIN or passphrase entry dialog (ncurses interface)
COMMENT-gnome3 =PIN or passphrase entry dialog (GNOME 3 interface)
-COMMENT-qt5 = PIN or passphrase entry dialog (Qt5 interface)
-COMMENT-qt6 = PIN or passphrase entry dialog (Qt6 interface)
+COMMENT-qt = PIN or passphrase entry dialog (Qt6 interface)
VERSION = 1.3.3
DISTNAME = pinentry-${VERSION}
@@ -35,26 +34,15 @@ WANTLIB-gnome3 += gck-2 gcr-4 p11-kit
LIB_DEPENDS-gnome3 = ${LIB_DEPENDS} \
x11/gnome/gcr4
-WANTLIB-qt5 += ${WANTLIB}
-WANTLIB-qt5 += ${COMPILER_LIBCXX} KF5WaylandClient Qt5Core Qt5Gui
-WANTLIB-qt5 += Qt5Widgets Qt5X11Extras X11 m
+WANTLIB-qt += ${WANTLIB}
+WANTLIB-qt += ${COMPILER_LIBCXX} Qt6Core Qt6Gui Qt6Widgets m
+WANTLIB-qt += KF6GuiAddons KF6WindowSystem
-LIB_DEPENDS-qt5 = ${LIB_DEPENDS} \
- devel/kf5/kwayland \
- x11/qt5/qtbase \
- x11/qt5/qtx11extras
-RUN_DEPENDS-qt5 = ${FULLPKGNAME-main}:${FULLPKGPATH-main} \
- devel/desktop-file-utils
-
-WANTLIB-qt6 += ${WANTLIB}
-WANTLIB-qt6 += ${COMPILER_LIBCXX} Qt6Core Qt6Gui Qt6Widgets m
-WANTLIB-qt6 += KF6GuiAddons KF6WindowSystem
-
-LIB_DEPENDS-qt6 = ${LIB_DEPENDS} \
+LIB_DEPENDS-qt = ${LIB_DEPENDS} \
devel/kf6/kguiaddons \
devel/kf6/kwindowsystem \
x11/qt6/qtbase
-RUN_DEPENDS-qt6 = ${FULLPKGNAME-main}:${FULLPKGPATH-main} \
+RUN_DEPENDS-qt = ${FULLPKGNAME-main}:${FULLPKGPATH-main} \
devel/desktop-file-utils
CONFIGURE_STYLE = gnu
@@ -66,14 +54,15 @@ CONFIGURE_ARGS = --enable-pinentry-curses \
--disable-pinentry-qt4 \
--disable-pinentry-emacs \
--disable-pinentry-gtk2 \
+ --disable-pinentry-qt5 \
--disable-pinentry-efl \
--disable-pinentry-tqt \
--disable-pinentry-fltk
-MULTI_PACKAGES = -main -gnome3 -qt5 -qt6
+MULTI_PACKAGES = -main -gnome3 -qt
-PSEUDO_FLAVORS = no_gnome3 no_qt5 no_qt6 bootstrap
-FLAVOR ?= no_gnome3 no_qt5 no_qt6 bootstrap
+PSEUDO_FLAVORS = no_gnome3 no_qt bootstrap
+FLAVOR ?= no_gnome3 no_qt bootstrap
.include <bsd.port.arch.mk>
@@ -81,11 +70,8 @@ FLAVOR ?= no_gnome3 no_qt5 no_qt6 bootstrap
CONFIGURE_ARGS += --disable-pinentry-gnome3
.endif
-.if !${BUILD_PACKAGES:M-qt5}
-CONFIGURE_ARGS += --disable-pinentry-qt5
-.endif
-.if !${BUILD_PACKAGES:M-qt6}
+.if !${BUILD_PACKAGES:M-qt}
# XXX could use the followings once we have them available as packages:
# devel/kf6/kguiaddons
# devel/kf6/kwindowsystem
@@ -98,7 +84,7 @@ post-install:
${SUBST_CMD} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${FILESDIR}/pinentry-wrapper.in ${PREFIX}/bin/pinentry
-# pinentry.png is only installed by the qt5 and qt6 install targets;
+# pinentry.png is only installed by the qt install targets;
# to prevent juggling with PFRAG and PLIST conflict or to create a dedicated
# subpackage, just install it unconditionally
${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps/
diff --git a/security/pinentry/pkg/DESCR-qt b/security/pinentry/pkg/DESCR-qt
new file mode 100644
index 00000000000..1fb3e412277
--- /dev/null
+++ b/security/pinentry/pkg/DESCR-qt
@@ -0,0 +1 @@
+This package provides a Qt6 interface to pinentry.
diff --git a/security/pinentry/pkg/DESCR-qt5 b/security/pinentry/pkg/DESCR-qt5
deleted file mode 100644
index 0aeaf200728..00000000000
--- a/security/pinentry/pkg/DESCR-qt5
+++ /dev/null
@@ -1 +0,0 @@
-This package provides a Qt5 interface to pinentry.
diff --git a/security/pinentry/pkg/DESCR-qt6 b/security/pinentry/pkg/DESCR-qt6
deleted file mode 100644
index 1fb3e412277..00000000000
--- a/security/pinentry/pkg/DESCR-qt6
+++ /dev/null
@@ -1 +0,0 @@
-This package provides a Qt6 interface to pinentry.
diff --git a/security/pinentry/pkg/PLIST-qt b/security/pinentry/pkg/PLIST-qt
new file mode 100644
index 00000000000..1e51184c289
--- /dev/null
+++ b/security/pinentry/pkg/PLIST-qt
@@ -0,0 +1,6 @@
+@conflict pinentry-qt5-<1.3.0
+@conflict pinentry-qt6-<=1.3.2p0
+@pkgpath security/pinentry,-qt6
+@bin bin/pinentry-qt
+share/applications/org.gnupg.pinentry-qt.desktop
+@tag update-desktop-database
diff --git a/security/pinentry/pkg/PLIST-qt5 b/security/pinentry/pkg/PLIST-qt5
deleted file mode 100644
index c1f62b83e5b..00000000000
--- a/security/pinentry/pkg/PLIST-qt5
+++ /dev/null
@@ -1,3 +0,0 @@
-@bin bin/pinentry-qt5
-share/applications/org.gnupg.pinentry-qt5.desktop
-@tag update-desktop-database
diff --git a/security/pinentry/pkg/PLIST-qt6 b/security/pinentry/pkg/PLIST-qt6
deleted file mode 100644
index e16cc583369..00000000000
--- a/security/pinentry/pkg/PLIST-qt6
+++ /dev/null
@@ -1,4 +0,0 @@
-@conflict pinentry-qt5-<1.3.0
-@bin bin/pinentry-qt
-share/applications/org.gnupg.pinentry-qt.desktop
-@tag update-desktop-database
