diff --git a/.portsignore b/.portsignore index 9b0373acb06d..eee7b575877b 100644 --- a/.portsignore +++ b/.portsignore @@ -3139,6 +3139,7 @@ security/pidgin-otr security/pinentry-efl security/pinentry-fltk security/pinentry-qt5 +security/pinentry-qt6 security/plasma6-kscreenlocker security/plasma6-ksshaskpass security/plasma6-kwallet-pam diff --git a/security/Makefile b/security/Makefile index b84353b58b54..aad924524043 100644 --- a/security/Makefile +++ b/security/Makefile @@ -813,7 +813,6 @@ SUBDIR += pinentry-curses SUBDIR += pinentry-gnome SUBDIR += pinentry-gtk2 - SUBDIR += pinentry-qt6 SUBDIR += pinentry-tty SUBDIR += pixiewps SUBDIR += pkcrack diff --git a/security/pinentry-qt6/Makefile b/security/pinentry-qt6/Makefile deleted file mode 100644 index 608d035ceb5d..000000000000 --- a/security/pinentry-qt6/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -PORTNAME= pinentry -PORTREVISION= 0 - -COMMENT= Qt 6 version of the GnuPG password dialog - -PINENTRY_GUI= qt6 - -MASTERDIR= ${.CURDIR}/../pinentry - -.include "${MASTERDIR}/Makefile" diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile index 3b784ac339eb..5c4205506db9 100644 --- a/security/pinentry/Makefile +++ b/security/pinentry/Makefile @@ -20,7 +20,7 @@ NO_BUILD= yes PLIST_FILES= bin/pinentry OPTIONS_SINGLE= FRONTEND -OPTIONS_SINGLE_FRONTEND= GNOME GTK2 NCURSES QT6 TTY +OPTIONS_SINGLE_FRONTEND= GNOME GTK2 NCURSES TTY OPTIONS_DEFAULT= NCURSES FRONTEND_DESC= Default frontend @@ -37,10 +37,6 @@ GTK2_DESC= Gtk+ 2 frontend PINENTRY_GTK2= pinentry-gtk-2 GTK2_RUN_DEPENDS= ${PINENTRY_GTK2}:security/pinentry-gtk2 -QT6_DESC= Qt 6 frontend -PINENTRY_QT6= pinentry-qt -QT6_RUN_DEPENDS= ${PINENTRY_QT6}:security/pinentry-qt6 - GNOME_DESC= GNOME frontend PINENTRY_GNOME= pinentry-gnome3 # Due to a dependency loop that exists between security/pinentry-gnome, @@ -90,19 +86,7 @@ CONFIGURE_ARGS+=--disable-pinentry-gnome3 .endif CONFIGURE_ARGS+=--disable-pinentry-qt5 - -.if ${PINENTRY_GUI} == "qt6" -USES+= compiler:c++17-lang kde:6 qt:6 -USE_CXXSTD= c++17 -USE_KDE= guiaddons windowsystem -USE_QT= base -PLIST_FILES= bin/pinentry-qt \ - share/applications/org.gnupg.pinentry-qt.desktop \ - share/pixmaps/pinentry.png -CONFIGURE_ARGS+=--enable-pinentry-qt -.else CONFIGURE_ARGS+=--disable-pinentry-qt -.endif .if ${PINENTRY_GUI} == "gtk2" USES+= gnome