hplip: Drop the qt4 option (disabled by default)

Keep the qt5 options.

3 files changed, 9 insertions, 474 deletions

diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index 750fa065e49..e9ea8125b42 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.82 2019/08/11 13:22:39 wiz Exp $
+# $NetBSD: Makefile,v 1.83 2019/10/27 15:20:22 kamil Exp $
 
 DISTNAME=	hplip-3.18.5
-PKGREVISION=	10
+PKGREVISION=	11
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hplip/}
 
diff --git a/print/hplip/PLIST.qt4 b/print/hplip/PLIST.qt4
deleted file mode 100644
index 1f69e520c40..00000000000
--- a/print/hplip/PLIST.qt4
+++ /dev/null
@@ -1,457 +0,0 @@
-@comment $NetBSD: PLIST.qt4,v 1.1 2016/05/28 21:03:56 schnoebe Exp $
-bin/hp-toolbox
-share/PolicyKit/policy/com.hp.hplip.policy
-share/applications/hplip.desktop
-share/dbus-1/system-services/com.hp.hplip.service
-share/examples/hplip/dbus-1/system.d/com.hp.hplip.conf
-share/examples/hplip/xdg/autostart/hplip-systray.desktop
-share/hplip/data/images/128x128/audio.png
-share/hplip/data/images/128x128/bmp.png
-share/hplip/data/images/128x128/gif.png
-share/hplip/data/images/128x128/hp_logo.png
-share/hplip/data/images/128x128/jpg.png
-share/hplip/data/images/128x128/movie.png
-share/hplip/data/images/128x128/mpg.png
-share/hplip/data/images/128x128/png.png
-share/hplip/data/images/128x128/tif.png
-share/hplip/data/images/128x128/unknown.png
-share/hplip/data/images/16x16/active.png
-share/hplip/data/images/16x16/add_user.png
-share/hplip/data/images/16x16/add_user_quick.png
-share/hplip/data/images/16x16/add_users.png
-share/hplip/data/images/16x16/battery.png
-share/hplip/data/images/16x16/busy.png
-share/hplip/data/images/16x16/cancel.png
-share/hplip/data/images/16x16/close.png
-share/hplip/data/images/16x16/down.png
-share/hplip/data/images/16x16/down_user.png
-share/hplip/data/images/16x16/download.png
-share/hplip/data/images/16x16/edit.png
-share/hplip/data/images/16x16/error.png
-share/hplip/data/images/16x16/fab.png
-share/hplip/data/images/16x16/fax.png
-share/hplip/data/images/16x16/folder_open.png
-share/hplip/data/images/16x16/folder_remove.png
-share/hplip/data/images/16x16/help.png
-share/hplip/data/images/16x16/hp_logo.png
-share/hplip/data/images/16x16/idle.png
-share/hplip/data/images/16x16/info.png
-share/hplip/data/images/16x16/inkdrop.png
-share/hplip/data/images/16x16/list_add.png
-share/hplip/data/images/16x16/list_remove.png
-share/hplip/data/images/16x16/makecopies.png
-share/hplip/data/images/16x16/mimetypes.png
-share/hplip/data/images/16x16/minus.png
-share/hplip/data/images/16x16/next.png
-share/hplip/data/images/16x16/ok.png
-share/hplip/data/images/16x16/paper.png
-share/hplip/data/images/16x16/pcard.png
-share/hplip/data/images/16x16/plus.png
-share/hplip/data/images/16x16/prev.png
-share/hplip/data/images/16x16/print.png
-share/hplip/data/images/16x16/quit.png
-share/hplip/data/images/16x16/refresh.png
-share/hplip/data/images/16x16/refresh1.png
-share/hplip/data/images/16x16/remove_user.png
-share/hplip/data/images/16x16/scan.png
-share/hplip/data/images/16x16/settings.png
-share/hplip/data/images/16x16/status_refresh.png
-share/hplip/data/images/16x16/thumbnail.png
-share/hplip/data/images/16x16/toner.png
-share/hplip/data/images/16x16/troubleshoot.png
-share/hplip/data/images/16x16/up.png
-share/hplip/data/images/16x16/up_user.png
-share/hplip/data/images/16x16/warning.png
-share/hplip/data/images/24x24/add_to_group.png
-share/hplip/data/images/24x24/new_group.png
-share/hplip/data/images/24x24/new_group_from_selection.png
-share/hplip/data/images/24x24/new_user.png
-share/hplip/data/images/24x24/remove_from_group.png
-share/hplip/data/images/24x24/remove_group.png
-share/hplip/data/images/24x24/remove_user.png
-share/hplip/data/images/24x24/rename_group.png
-share/hplip/data/images/256x256/hp_logo.png
-share/hplip/data/images/256x256/logo.png
-share/hplip/data/images/32x32/align.png
-share/hplip/data/images/32x32/battery.png
-share/hplip/data/images/32x32/busy.png
-share/hplip/data/images/32x32/clean.png
-share/hplip/data/images/32x32/colorcal.png
-share/hplip/data/images/32x32/cups.png
-share/hplip/data/images/32x32/download.png
-share/hplip/data/images/32x32/error.png
-share/hplip/data/images/32x32/ews.png
-share/hplip/data/images/32x32/fab.png
-share/hplip/data/images/32x32/fax-disabled.png
-share/hplip/data/images/32x32/fax.png
-share/hplip/data/images/32x32/fax_machine.png
-share/hplip/data/images/32x32/fax_setup.png
-share/hplip/data/images/32x32/firmware.png
-share/hplip/data/images/32x32/help.png
-share/hplip/data/images/32x32/hp_logo.png
-share/hplip/data/images/32x32/idle.png
-share/hplip/data/images/32x32/info.png
-share/hplip/data/images/32x32/inkdrop.png
-share/hplip/data/images/32x32/keys.png
-share/hplip/data/images/32x32/linefeed_cal.png
-share/hplip/data/images/32x32/lock.png
-share/hplip/data/images/32x32/lporg.png
-share/hplip/data/images/32x32/makecopies-disabled.png
-share/hplip/data/images/32x32/makecopies.png
-share/hplip/data/images/32x32/ok.png
-share/hplip/data/images/32x32/paper.png
-share/hplip/data/images/32x32/pcard-disabled.png
-share/hplip/data/images/32x32/pcard.png
-share/hplip/data/images/32x32/plugin.png
-share/hplip/data/images/32x32/pq_diag.png
-share/hplip/data/images/32x32/print-disabled.png
-share/hplip/data/images/32x32/print.png
-share/hplip/data/images/32x32/scan-disabled.png
-share/hplip/data/images/32x32/scan.png
-share/hplip/data/images/32x32/settings.png
-share/hplip/data/images/32x32/testpage.png
-share/hplip/data/images/32x32/toner.png
-share/hplip/data/images/32x32/toner_cartridge.png
-share/hplip/data/images/32x32/troubleshoot.png
-share/hplip/data/images/32x32/warning.png
-share/hplip/data/images/32x32/wireless.png
-share/hplip/data/images/64x64/hp_logo.png
-share/hplip/data/images/devices/120.png
-share/hplip/data/images/devices/COLOR_INKJET_PRINTER_CP1700.png
-share/hplip/data/images/devices/CP_1700.png
-share/hplip/data/images/devices/DESKJET_1120C.png
-share/hplip/data/images/devices/DESKJET_1220C.png
-share/hplip/data/images/devices/DESKJET_2500C.png
-share/hplip/data/images/devices/DESKJET_3820.png
-share/hplip/data/images/devices/DESKJET_5740.png
-share/hplip/data/images/devices/DESKJET_610.png
-share/hplip/data/images/devices/DESKJET_630C.png
-share/hplip/data/images/devices/DESKJET_650C.png
-share/hplip/data/images/devices/DESKJET_840C.png
-share/hplip/data/images/devices/DESKJET_916C.png
-share/hplip/data/images/devices/DESKJET_9600.png
-share/hplip/data/images/devices/DESKJET_960C.png
-share/hplip/data/images/devices/DESKJET_970C.png
-share/hplip/data/images/devices/DESKJET_990C.png
-share/hplip/data/images/devices/DESKJET_995C.png
-share/hplip/data/images/devices/Deskjet_3740.png
-share/hplip/data/images/devices/Deskjet_5400_series.png
-share/hplip/data/images/devices/Deskjet_5700.png
-share/hplip/data/images/devices/Deskjet_5900_series.png
-share/hplip/data/images/devices/Deskjet_6500.png
-share/hplip/data/images/devices/Deskjet_6800.png
-share/hplip/data/images/devices/HP_2000C.png
-share/hplip/data/images/devices/HP_2500C.png
-share/hplip/data/images/devices/HP_BI_3000.png
-share/hplip/data/images/devices/HP_Business_Inkjet_1200.png
-share/hplip/data/images/devices/HP_Color_LaserJet_1500.png
-share/hplip/data/images/devices/HP_Color_LaserJet_2840.png
-share/hplip/data/images/devices/HP_Color_LaserJet_4500.png
-share/hplip/data/images/devices/HP_Color_LaserJet_4730mfp.png
-share/hplip/data/images/devices/HP_Color_LaserJet_8550.png
-share/hplip/data/images/devices/HP_LJ1xxx.png
-share/hplip/data/images/devices/HP_LaserJet_1012.png
-share/hplip/data/images/devices/HP_LaserJet_1220.png
-share/hplip/data/images/devices/HP_LaserJet_3200M.png
-share/hplip/data/images/devices/HP_LaserJet_3300_3310_3320.png
-share/hplip/data/images/devices/HP_LaserJet_4000.png
-share/hplip/data/images/devices/HP_LaserJet_4100_MFP.png
-share/hplip/data/images/devices/HP_LaserJet_4M.png
-share/hplip/data/images/devices/HP_LaserJet_5Si.png
-share/hplip/data/images/devices/HP_LaserJet_6MP.png
-share/hplip/data/images/devices/HP_LaserJet_8100_Series.png
-share/hplip/data/images/devices/HP_LaserJet_9000_MFP.png
-share/hplip/data/images/devices/HP_LaserJet_9040_MFP.png
-share/hplip/data/images/devices/HP_LaserJet_9500dn.png
-share/hplip/data/images/devices/HP_LaserJet_m1005.png
-share/hplip/data/images/devices/HP_LaserJet_m1522.png
-share/hplip/data/images/devices/HP_Officejet_Pro_L7700.png
-share/hplip/data/images/devices/LASERJET_3500.png
-share/hplip/data/images/devices/LASERJET_4650.png
-share/hplip/data/images/devices/LASERJET_4650dtn.png
-share/hplip/data/images/devices/LASERJET_5500.png
-share/hplip/data/images/devices/LASERJET_5500dtn.png
-share/hplip/data/images/devices/LASERJET_5550.png
-share/hplip/data/images/devices/LASERJET_5550DTN.png
-share/hplip/data/images/devices/OFFICEJET_PRO_1150C.png
-share/hplip/data/images/devices/OfficeJet_5105.png
-share/hplip/data/images/devices/OfficeJet_6100_Series.png
-share/hplip/data/images/devices/OfficeJet_8500_a910.png
-share/hplip/data/images/devices/OfficeJet_G85.png
-share/hplip/data/images/devices/OfficeJet_Series_300.png
-share/hplip/data/images/devices/Officejet_6150_Series.png
-share/hplip/data/images/devices/Officejet_6200_series.png
-share/hplip/data/images/devices/Officejet_7200_series.png
-share/hplip/data/images/devices/Officejet_9100_series.png
-share/hplip/data/images/devices/PHOTOSMART_100.png
-share/hplip/data/images/devices/PHOTOSMART_1218.png
-share/hplip/data/images/devices/PHOTOSMART_1315.png
-share/hplip/data/images/devices/PHOTOSMART_P1100.png
-share/hplip/data/images/devices/PSC_900_Series.png
-share/hplip/data/images/devices/Photosmart_2600_series.png
-share/hplip/data/images/devices/Photosmart_2700_series.png
-share/hplip/data/images/devices/Photosmart_3300_series.png
-share/hplip/data/images/devices/Photosmart_370_series.png
-share/hplip/data/images/devices/Photosmart_7400_series.png
-share/hplip/data/images/devices/Photosmart_8050.png
-share/hplip/data/images/devices/Photosmart_8100_series.png
-share/hplip/data/images/devices/Photosmart_8250.png
-share/hplip/data/images/devices/Photosmart_8400_series.png
-share/hplip/data/images/devices/Photosmart_8750_series.png
-share/hplip/data/images/devices/Photosmart_C3100.png
-share/hplip/data/images/devices/Photosmart_C4100.png
-share/hplip/data/images/devices/Photosmart_C5100.png
-share/hplip/data/images/devices/Photosmart_C6100.png
-share/hplip/data/images/devices/Photosmart_D5060.png
-share/hplip/data/images/devices/Photosmart_D5100.png
-share/hplip/data/images/devices/Photosmart_D6160.png
-share/hplip/data/images/devices/Photosmart_D7100.png
-share/hplip/data/images/devices/Photosmart_D7300.png
-share/hplip/data/images/devices/Photosmart_Pro_B8300.png
-share/hplip/data/images/devices/Photosmart_Pro_B9180.png
-share/hplip/data/images/devices/Photosmart_a310.png
-share/hplip/data/images/devices/Photosmart_a510.png
-share/hplip/data/images/devices/Photosmart_a710.png
-share/hplip/data/images/devices/cp1160.png
-share/hplip/data/images/devices/default_business_inkjet.png
-share/hplip/data/images/devices/default_designjet.png
-share/hplip/data/images/devices/default_deskjet.png
-share/hplip/data/images/devices/default_laserjet.png
-share/hplip/data/images/devices/default_officejet.png
-share/hplip/data/images/devices/default_photosmart.png
-share/hplip/data/images/devices/default_printer.png
-share/hplip/data/images/devices/default_psc.png
-share/hplip/data/images/devices/desket_5650.png
-share/hplip/data/images/devices/deskjet_1280.png
-share/hplip/data/images/devices/deskjet_3200.png
-share/hplip/data/images/devices/deskjet_3320.png
-share/hplip/data/images/devices/deskjet_3325.png
-share/hplip/data/images/devices/deskjet_3420.png
-share/hplip/data/images/devices/deskjet_3425.png
-share/hplip/data/images/devices/deskjet_3500.png
-share/hplip/data/images/devices/deskjet_3600.png
-share/hplip/data/images/devices/deskjet_3840.png
-share/hplip/data/images/devices/deskjet_5100.png
-share/hplip/data/images/devices/deskjet_5550.png
-share/hplip/data/images/devices/deskjet_5552.png
-share/hplip/data/images/devices/deskjet_5600.png
-share/hplip/data/images/devices/deskjet_6120.png
-share/hplip/data/images/devices/deskjet_6980.png
-share/hplip/data/images/devices/deskjet_D2360.png
-share/hplip/data/images/devices/dj350.png
-share/hplip/data/images/devices/dj450.png
-share/hplip/data/images/devices/hp_LaserJet_1200.png
-share/hplip/data/images/devices/hp_LaserJet_2100.png
-share/hplip/data/images/devices/hp_LaserJet_3015.png
-share/hplip/data/images/devices/hp_LaserJet_3020.png
-share/hplip/data/images/devices/hp_LaserJet_4345_mfp.png
-share/hplip/data/images/devices/hp_LaserJet_5000.png
-share/hplip/data/images/devices/hp_LaserJet_8000.png
-share/hplip/data/images/devices/hp_business_inkjet_1100.png
-share/hplip/data/images/devices/hp_business_inkjet_2200.png
-share/hplip/data/images/devices/hp_business_inkjet_2600.png
-share/hplip/data/images/devices/hp_business_inkjet_3000.png
-share/hplip/data/images/devices/hp_color_LaserJet_2550.png
-share/hplip/data/images/devices/hp_color_LaserJet_3700.png
-share/hplip/data/images/devices/hp_color_LaserJet_4600.png
-share/hplip/data/images/devices/hp_color_LaserJet_9500.png
-share/hplip/data/images/devices/hp_color_laserjet_cm1015_mfp.png
-share/hplip/data/images/devices/hp_color_laserjet_cm1312_mfp.png
-share/hplip/data/images/devices/hp_color_laserjet_cp2025.png
-share/hplip/data/images/devices/hp_color_laserjet_cp3505.png
-share/hplip/data/images/devices/hp_color_laserjet_cp3525.png
-share/hplip/data/images/devices/hp_color_laserjet_cp4005.png
-share/hplip/data/images/devices/hp_color_laserjet_cp6015.png
-share/hplip/data/images/devices/hp_deskjet_9300.png
-share/hplip/data/images/devices/hp_deskjet_f4200.png
-share/hplip/data/images/devices/hp_laserjet_3050.png
-share/hplip/data/images/devices/hp_laserjet_m2727_mfp.png
-share/hplip/data/images/devices/hp_laserjet_p2015.png
-share/hplip/data/images/devices/hp_photosmart_b8500_series.png
-share/hplip/data/images/devices/laserjet_2410.png
-share/hplip/data/images/devices/officejet_4200_series.png
-share/hplip/data/images/devices/officejet_500.png
-share/hplip/data/images/devices/officejet_5500_series.png
-share/hplip/data/images/devices/officejet_5600.png
-share/hplip/data/images/devices/officejet_j3600_series.png
-share/hplip/data/images/devices/officejet_j5500_series.png
-share/hplip/data/images/devices/officejet_k550.png
-share/hplip/data/images/devices/officejet_k80.png
-share/hplip/data/images/devices/photosmart_7150.png
-share/hplip/data/images/devices/photosmart_7900_series.png
-share/hplip/data/images/devices/photosmart_a610.png
-share/hplip/data/images/devices/photosmart_a820_series.png
-share/hplip/data/images/devices/psc_1100_series.png
-share/hplip/data/images/devices/psc_1610.png
-share/hplip/data/images/devices/psc_2300_series.png
-share/hplip/data/images/other/aio_align.png
-share/hplip/data/images/other/align10.png
-share/hplip/data/images/other/clean.png
-share/hplip/data/images/other/color_adj.png
-share/hplip/data/images/other/confidential_coverpage.png
-share/hplip/data/images/other/confidential_title.png
-share/hplip/data/images/other/fax.png
-share/hplip/data/images/other/fax2.png
-share/hplip/data/images/other/generic_coverpage.png
-share/hplip/data/images/other/generic_title.png
-share/hplip/data/images/other/h-k-2.png
-share/hplip/data/images/other/h-k-3.png
-share/hplip/data/images/other/h-kc-2.png
-share/hplip/data/images/other/h-kc-3.png
-share/hplip/data/images/other/hp-tux-printer.png
-share/hplip/data/images/other/load_paper.png
-share/hplip/data/images/other/opensource-75x65.png
-share/hplip/data/images/other/panel_lcd.png
-share/hplip/data/images/other/pens.png
-share/hplip/data/images/other/powered_by_python.png
-share/hplip/data/images/other/signal0.png
-share/hplip/data/images/other/signal1.png
-share/hplip/data/images/other/signal2.png
-share/hplip/data/images/other/signal3.png
-share/hplip/data/images/other/signal4.png
-share/hplip/data/images/other/signal5.png
-share/hplip/data/images/other/standard_coverpage.png
-share/hplip/data/images/other/type4_color_patch.png
-share/hplip/data/images/other/type4_gray_patch.png
-share/hplip/data/images/other/urgent_coverpage.png
-share/hplip/data/images/other/urgent_title.png
-share/hplip/data/images/other/usb_connection.png
-share/hplip/data/images/other/v-c-2.png
-share/hplip/data/images/other/v-c-3.png
-share/hplip/data/images/other/v-k-2.png
-share/hplip/data/images/other/v-k-3.png
-share/hplip/data/images/other/v-kc-2.png
-share/hplip/data/images/other/v-kc-3.png
-share/hplip/data/images/other/zca.png
-share/hplip/ui4/__init__.py
-share/hplip/ui4/__init__.pyc
-share/hplip/ui4/aboutdialog.py
-share/hplip/ui4/aboutdialog.pyc
-share/hplip/ui4/aboutdialog_base.py
-share/hplip/ui4/aboutdialog_base.pyc
-share/hplip/ui4/aligndialog.py
-share/hplip/ui4/aligndialog.pyc
-share/hplip/ui4/aligndialog_base.py
-share/hplip/ui4/aligndialog_base.pyc
-share/hplip/ui4/cleandialog.py
-share/hplip/ui4/cleandialog.pyc
-share/hplip/ui4/cleandialog_base.py
-share/hplip/ui4/cleandialog_base.pyc
-share/hplip/ui4/colorcaldialog.py
-share/hplip/ui4/colorcaldialog.pyc
-share/hplip/ui4/colorcaldialog_base.py
-share/hplip/ui4/colorcaldialog_base.pyc
-share/hplip/ui4/devicesetupdialog.py
-share/hplip/ui4/devicesetupdialog.pyc
-share/hplip/ui4/devicesetupdialog_base.py
-share/hplip/ui4/devicesetupdialog_base.pyc
-share/hplip/ui4/deviceuricombobox.py
-share/hplip/ui4/deviceuricombobox.pyc
-share/hplip/ui4/devmgr5.py
-share/hplip/ui4/devmgr5.pyc
-share/hplip/ui4/devmgr5_base.py
-share/hplip/ui4/devmgr5_base.pyc
-share/hplip/ui4/fabgrouptable.py
-share/hplip/ui4/fabgrouptable.pyc
-share/hplip/ui4/fabnametable.py
-share/hplip/ui4/fabnametable.pyc
-share/hplip/ui4/fabwindow.py
-share/hplip/ui4/fabwindow.pyc
-share/hplip/ui4/fabwindow_base.py
-share/hplip/ui4/fabwindow_base.pyc
-share/hplip/ui4/faxsetupdialog.py
-share/hplip/ui4/faxsetupdialog.pyc
-share/hplip/ui4/faxsetupdialog_base.py
-share/hplip/ui4/faxsetupdialog_base.pyc
-share/hplip/ui4/filetable.py
-share/hplip/ui4/filetable.pyc
-share/hplip/ui4/firmwaredialog.py
-share/hplip/ui4/firmwaredialog.pyc
-share/hplip/ui4/firmwaredialog_base.py
-share/hplip/ui4/firmwaredialog_base.pyc
-share/hplip/ui4/infodialog.py
-share/hplip/ui4/infodialog.pyc
-share/hplip/ui4/infodialog_base.py
-share/hplip/ui4/infodialog_base.pyc
-share/hplip/ui4/linefeedcaldialog.py
-share/hplip/ui4/linefeedcaldialog.pyc
-share/hplip/ui4/linefeedcaldialog_base.py
-share/hplip/ui4/linefeedcaldialog_base.pyc
-share/hplip/ui4/loadpapergroupbox.py
-share/hplip/ui4/loadpapergroupbox.pyc
-share/hplip/ui4/makecopiesdialog.py
-share/hplip/ui4/makecopiesdialog.pyc
-share/hplip/ui4/makecopiesdialog_base.py
-share/hplip/ui4/makecopiesdialog_base.pyc
-share/hplip/ui4/mimetypesdialog.py
-share/hplip/ui4/mimetypesdialog.pyc
-share/hplip/ui4/mimetypesdialog_base.py
-share/hplip/ui4/mimetypesdialog_base.pyc
-share/hplip/ui4/nodevicesdialog.py
-share/hplip/ui4/nodevicesdialog.pyc
-share/hplip/ui4/nodevicesdialog_base.py
-share/hplip/ui4/nodevicesdialog_base.pyc
-share/hplip/ui4/plugindiagnose.py
-share/hplip/ui4/plugindiagnose.pyc
-share/hplip/ui4/plugindiagnose_base.py
-share/hplip/ui4/plugindiagnose_base.pyc
-share/hplip/ui4/plugindialog.py
-share/hplip/ui4/plugindialog.pyc
-share/hplip/ui4/plugindialog_base.py
-share/hplip/ui4/plugindialog_base.pyc
-share/hplip/ui4/pluginlicensedialog.py
-share/hplip/ui4/pluginlicensedialog.pyc
-share/hplip/ui4/pluginlicensedialog_base.py
-share/hplip/ui4/pluginlicensedialog_base.pyc
-share/hplip/ui4/pqdiagdialog.py
-share/hplip/ui4/pqdiagdialog.pyc
-share/hplip/ui4/pqdiagdialog_base.py
-share/hplip/ui4/pqdiagdialog_base.pyc
-share/hplip/ui4/printdialog.py
-share/hplip/ui4/printdialog.pyc
-share/hplip/ui4/printdialog_base.py
-share/hplip/ui4/printdialog_base.pyc
-share/hplip/ui4/printernamecombobox.py
-share/hplip/ui4/printernamecombobox.pyc
-share/hplip/ui4/printsettingsdialog.py
-share/hplip/ui4/printsettingsdialog.pyc
-share/hplip/ui4/printsettingsdialog_base.py
-share/hplip/ui4/printsettingsdialog_base.pyc
-share/hplip/ui4/printsettingstoolbox.py
-share/hplip/ui4/printsettingstoolbox.pyc
-share/hplip/ui4/printtestpagedialog.py
-share/hplip/ui4/printtestpagedialog.pyc
-share/hplip/ui4/printtestpagedialog_base.py
-share/hplip/ui4/printtestpagedialog_base.pyc
-share/hplip/ui4/queuesconf.py
-share/hplip/ui4/queuesconf.pyc
-share/hplip/ui4/readonlyradiobutton.py
-share/hplip/ui4/readonlyradiobutton.pyc
-share/hplip/ui4/sendfaxdialog.py
-share/hplip/ui4/sendfaxdialog.pyc
-share/hplip/ui4/sendfaxdialog_base.py
-share/hplip/ui4/sendfaxdialog_base.pyc
-share/hplip/ui4/settingsdialog.py
-share/hplip/ui4/settingsdialog.pyc
-share/hplip/ui4/settingsdialog_base.py
-share/hplip/ui4/settingsdialog_base.pyc
-share/hplip/ui4/setupdialog.py
-share/hplip/ui4/setupdialog.pyc
-share/hplip/ui4/setupdialog_base.py
-share/hplip/ui4/setupdialog_base.pyc
-share/hplip/ui4/systemtray.py
-share/hplip/ui4/systemtray.pyc
-share/hplip/ui4/systrayframe.py
-share/hplip/ui4/systrayframe.pyc
-share/hplip/ui4/systrayframe_base.py
-share/hplip/ui4/systrayframe_base.pyc
-share/hplip/ui4/ui_utils.py
-share/hplip/ui4/ui_utils.pyc
-share/hplip/ui4/upgradedialog.py
-share/hplip/ui4/upgradedialog.pyc
-share/hplip/ui4/upgradedialog_base.py
-share/hplip/ui4/upgradedialog_base.pyc
-share/hplip/ui4/wifisetupdialog.py
-share/hplip/ui4/wifisetupdialog.pyc
-share/hplip/ui4/wifisetupdialog_base.py
-share/hplip/ui4/wifisetupdialog_base.pyc
diff --git a/print/hplip/options.mk b/print/hplip/options.mk
index 13050c15ead..f70b8eb4bb8 100644
--- a/print/hplip/options.mk
+++ b/print/hplip/options.mk
@@ -1,21 +1,19 @@
-# $NetBSD: options.mk,v 1.17 2019/09/02 13:19:59 adam Exp $
+# $NetBSD: options.mk,v 1.18 2019/10/27 15:20:22 kamil Exp $
 #
 # HPLIP dependencies are detailed in the following page:
 # http://hplipopensource.com/hplip-web/install/manual/distros/other.html
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.hplip
-PKG_SUPPORTED_OPTIONS=	fax sane
+PKG_SUPPORTED_OPTIONS=	fax sane qt5
 PKG_SUGGESTED_OPTIONS=	fax
-PKG_OPTIONS_GROUP.gui=	qt4 qt5
-PKG_OPTIONS_OPTIONAL_GROUPS += gui
 
 PKG_OPTIONS_LEGACY_OPTS+=	scan:sane
-PKG_OPTIONS_LEGACY_OPTS+=	gui:qt4
-PKG_OPTIONS_LEGACY_OPTS+=	qt:qt4
+PKG_OPTIONS_LEGACY_OPTS+=	gui:qt5
+PKG_OPTIONS_LEGACY_OPTS+=	qt:qt5
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mqt4) || !empty(PKG_OPTIONS:Mqt5)
+.if !empty(PKG_OPTIONS:Mqt5)
 PYTHON_VERSIONS_ACCEPTED=	 27 # py-notify
 CONFIGURE_ARGS+=	--enable-gui-build
 CONFIGURE_ARGS+=	--enable-policykit
@@ -24,16 +22,10 @@ MAKE_DIRS+=		${PKG_SYSCONFDIR}/dbus-1/system.d
 .include "../../security/policykit/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 DEPENDS+=	${PYPKGPREFIX}-notify-[0-9]*:../../sysutils/py-notify
-. if !empty(PKG_OPTIONS:Mqt4)
-PLIST_SRC+=		PLIST.qt4
-CONFIGURE_ARGS+=	--enable-qt4
-.  include "../../x11/py-qt4/buildlink3.mk"
-. endif
-. if !empty(PKG_OPTIONS:Mqt5)
 PLIST_SRC+=		PLIST.qt5
+CONFIGURE_ARGS+=	--disable-qt4
 CONFIGURE_ARGS+=	--enable-qt5
-.  include "../../x11/py-qt5/buildlink3.mk"
-. endif
+.include "../../x11/py-qt5/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-policykit
 CONFIGURE_ARGS+=	--disable-qt4