Index: Makefile =================================================================== --- Makefile (revision 436252) +++ Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= hplip PORTVERSION= 3.16.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print MASTER_SITES= SF @@ -39,9 +39,11 @@ CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE= DOCS FAX SNMP SCAN X11 XSANE -OPTIONS_DEFAULT=SNMP SCAN X11 -OPTIONS_SUB= yes # FAX SCAN X11 +OPTIONS_DEFINE= DOCS FAX SNMP SCAN X11 XSANE +OPTIONS_DEFAULT= SNMP SCAN X11 QT5 +OPTIONS_RADIO= GUI +OPTIONS_RADIO_GUI= QT4 QT5 +OPTIONS_SUB= yes # FAX SNMP SCAN X11 QT4 QT5 FAX_DESC= PC Send Fax support FAX_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}reportlab>=0:print/py-reportlab @@ -57,11 +59,19 @@ SCAN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow SCAN_CONFIGURE_ENABLE= scan-build -X11_DESC= Graphical User Interface (Qt 4) -X11_USES= pyqt:4 -X11_USE= PYQT=dbussupport_run,gui_run -X11_CONFIGURE_ENABLE= qt4 gui-build +X11_DESC= Graphical User Interface (Qt) +X11_CONFIGURE_ENABLE= gui-build +QT4_DESC= Use Qt4 graphical user interface +QT4_USES= pyqt:4 +QT4_USE= PYQT=core_run,dbussupport_run,gui_run +QT4_CONFIGURE_ENABLE= qt4 + +QT5_DESC= Use Qt5 graphical user interface +QT5_USES= pyqt:5 +QT5_USE= PYQT=core_run,gui_run,dbussupport_run,widgets_run +QT5_CONFIGURE_ENABLE= qt5 + XSANE_DESC= Install XSane for scanning (implies SCAN) XSANE_IMPLIES= SCAN XSANE_RUN_DEPENDS= xsane:graphics/xsane Index: pkg-plist =================================================================== --- pkg-plist (revision 436252) +++ pkg-plist (working copy) @@ -554,72 +554,141 @@ %%DATADIR%%/testpage.py %%DATADIR%%/timedate.py %%DATADIR%%/toolbox.py -%%X11%%%%DATADIR%%/ui4/__init__.py -%%X11%%%%DATADIR%%/ui4/aboutdialog.py -%%X11%%%%DATADIR%%/ui4/aboutdialog_base.py -%%X11%%%%DATADIR%%/ui4/aligndialog.py -%%X11%%%%DATADIR%%/ui4/aligndialog_base.py -%%X11%%%%DATADIR%%/ui4/cleandialog.py -%%X11%%%%DATADIR%%/ui4/cleandialog_base.py -%%X11%%%%DATADIR%%/ui4/colorcaldialog.py -%%X11%%%%DATADIR%%/ui4/colorcaldialog_base.py -%%X11%%%%DATADIR%%/ui4/devicesetupdialog.py -%%X11%%%%DATADIR%%/ui4/devicesetupdialog_base.py -%%X11%%%%DATADIR%%/ui4/deviceuricombobox.py -%%X11%%%%DATADIR%%/ui4/devmgr5.py -%%X11%%%%DATADIR%%/ui4/devmgr5_base.py -%%X11%%%%DATADIR%%/ui4/fabgrouptable.py -%%X11%%%%DATADIR%%/ui4/fabnametable.py -%%X11%%%%DATADIR%%/ui4/fabwindow.py -%%X11%%%%DATADIR%%/ui4/fabwindow_base.py -%%X11%%%%DATADIR%%/ui4/faxsetupdialog.py -%%X11%%%%DATADIR%%/ui4/faxsetupdialog_base.py -%%X11%%%%DATADIR%%/ui4/filetable.py -%%X11%%%%DATADIR%%/ui4/firmwaredialog.py -%%X11%%%%DATADIR%%/ui4/firmwaredialog_base.py -%%X11%%%%DATADIR%%/ui4/infodialog.py -%%X11%%%%DATADIR%%/ui4/infodialog_base.py -%%X11%%%%DATADIR%%/ui4/linefeedcaldialog.py -%%X11%%%%DATADIR%%/ui4/linefeedcaldialog_base.py -%%X11%%%%DATADIR%%/ui4/loadpapergroupbox.py -%%X11%%%%DATADIR%%/ui4/makecopiesdialog.py -%%X11%%%%DATADIR%%/ui4/makecopiesdialog_base.py -%%X11%%%%DATADIR%%/ui4/mimetypesdialog.py -%%X11%%%%DATADIR%%/ui4/mimetypesdialog_base.py -%%X11%%%%DATADIR%%/ui4/nodevicesdialog.py -%%X11%%%%DATADIR%%/ui4/nodevicesdialog_base.py -%%X11%%%%DATADIR%%/ui4/plugindiagnose.py -%%X11%%%%DATADIR%%/ui4/plugindiagnose_base.py -%%X11%%%%DATADIR%%/ui4/plugindialog.py -%%X11%%%%DATADIR%%/ui4/plugindialog_base.py -%%X11%%%%DATADIR%%/ui4/pluginlicensedialog.py -%%X11%%%%DATADIR%%/ui4/pluginlicensedialog_base.py -%%X11%%%%DATADIR%%/ui4/pqdiagdialog.py -%%X11%%%%DATADIR%%/ui4/pqdiagdialog_base.py -%%X11%%%%DATADIR%%/ui4/printdialog.py -%%X11%%%%DATADIR%%/ui4/printdialog_base.py -%%X11%%%%DATADIR%%/ui4/printernamecombobox.py -%%X11%%%%DATADIR%%/ui4/printsettingsdialog.py -%%X11%%%%DATADIR%%/ui4/printsettingsdialog_base.py -%%X11%%%%DATADIR%%/ui4/printsettingstoolbox.py -%%X11%%%%DATADIR%%/ui4/printtestpagedialog.py -%%X11%%%%DATADIR%%/ui4/printtestpagedialog_base.py -%%X11%%%%DATADIR%%/ui4/queuesconf.py -%%X11%%%%DATADIR%%/ui4/readonlyradiobutton.py -%%X11%%%%DATADIR%%/ui4/sendfaxdialog.py -%%X11%%%%DATADIR%%/ui4/sendfaxdialog_base.py -%%X11%%%%DATADIR%%/ui4/settingsdialog.py -%%X11%%%%DATADIR%%/ui4/settingsdialog_base.py -%%X11%%%%DATADIR%%/ui4/setupdialog.py -%%X11%%%%DATADIR%%/ui4/setupdialog_base.py -%%X11%%%%DATADIR%%/ui4/systemtray.py -%%X11%%%%DATADIR%%/ui4/systrayframe.py -%%X11%%%%DATADIR%%/ui4/systrayframe_base.py -%%X11%%%%DATADIR%%/ui4/ui_utils.py -%%X11%%%%DATADIR%%/ui4/upgradedialog.py -%%X11%%%%DATADIR%%/ui4/upgradedialog_base.py -%%X11%%%%DATADIR%%/ui4/wifisetupdialog.py -%%X11%%%%DATADIR%%/ui4/wifisetupdialog_base.py +%%QT4%%%%DATADIR%%/ui4/__init__.py +%%QT4%%%%DATADIR%%/ui4/aboutdialog.py +%%QT4%%%%DATADIR%%/ui4/aboutdialog_base.py +%%QT4%%%%DATADIR%%/ui4/aligndialog.py +%%QT4%%%%DATADIR%%/ui4/aligndialog_base.py +%%QT4%%%%DATADIR%%/ui4/cleandialog.py +%%QT4%%%%DATADIR%%/ui4/cleandialog_base.py +%%QT4%%%%DATADIR%%/ui4/colorcaldialog.py +%%QT4%%%%DATADIR%%/ui4/colorcaldialog_base.py +%%QT4%%%%DATADIR%%/ui4/devicesetupdialog.py +%%QT4%%%%DATADIR%%/ui4/devicesetupdialog_base.py +%%QT4%%%%DATADIR%%/ui4/deviceuricombobox.py +%%QT4%%%%DATADIR%%/ui4/devmgr5.py +%%QT4%%%%DATADIR%%/ui4/devmgr5_base.py +%%QT4%%%%DATADIR%%/ui4/fabgrouptable.py +%%QT4%%%%DATADIR%%/ui4/fabnametable.py +%%QT4%%%%DATADIR%%/ui4/fabwindow.py +%%QT4%%%%DATADIR%%/ui4/fabwindow_base.py +%%QT4%%%%DATADIR%%/ui4/faxsetupdialog.py +%%QT4%%%%DATADIR%%/ui4/faxsetupdialog_base.py +%%QT4%%%%DATADIR%%/ui4/filetable.py +%%QT4%%%%DATADIR%%/ui4/firmwaredialog.py +%%QT4%%%%DATADIR%%/ui4/firmwaredialog_base.py +%%QT4%%%%DATADIR%%/ui4/infodialog.py +%%QT4%%%%DATADIR%%/ui4/infodialog_base.py +%%QT4%%%%DATADIR%%/ui4/linefeedcaldialog.py +%%QT4%%%%DATADIR%%/ui4/linefeedcaldialog_base.py +%%QT4%%%%DATADIR%%/ui4/loadpapergroupbox.py +%%QT4%%%%DATADIR%%/ui4/makecopiesdialog.py +%%QT4%%%%DATADIR%%/ui4/makecopiesdialog_base.py +%%QT4%%%%DATADIR%%/ui4/mimetypesdialog.py +%%QT4%%%%DATADIR%%/ui4/mimetypesdialog_base.py +%%QT4%%%%DATADIR%%/ui4/nodevicesdialog.py +%%QT4%%%%DATADIR%%/ui4/nodevicesdialog_base.py +%%QT4%%%%DATADIR%%/ui4/plugindiagnose.py +%%QT4%%%%DATADIR%%/ui4/plugindiagnose_base.py +%%QT4%%%%DATADIR%%/ui4/plugindialog.py +%%QT4%%%%DATADIR%%/ui4/plugindialog_base.py +%%QT4%%%%DATADIR%%/ui4/pluginlicensedialog.py +%%QT4%%%%DATADIR%%/ui4/pluginlicensedialog_base.py +%%QT4%%%%DATADIR%%/ui4/pqdiagdialog.py +%%QT4%%%%DATADIR%%/ui4/pqdiagdialog_base.py +%%QT4%%%%DATADIR%%/ui4/printdialog.py +%%QT4%%%%DATADIR%%/ui4/printdialog_base.py +%%QT4%%%%DATADIR%%/ui4/printernamecombobox.py +%%QT4%%%%DATADIR%%/ui4/printsettingsdialog.py +%%QT4%%%%DATADIR%%/ui4/printsettingsdialog_base.py +%%QT4%%%%DATADIR%%/ui4/printsettingstoolbox.py +%%QT4%%%%DATADIR%%/ui4/printtestpagedialog.py +%%QT4%%%%DATADIR%%/ui4/printtestpagedialog_base.py +%%QT4%%%%DATADIR%%/ui4/queuesconf.py +%%QT4%%%%DATADIR%%/ui4/readonlyradiobutton.py +%%QT4%%%%DATADIR%%/ui4/sendfaxdialog.py +%%QT4%%%%DATADIR%%/ui4/sendfaxdialog_base.py +%%QT4%%%%DATADIR%%/ui4/settingsdialog.py +%%QT4%%%%DATADIR%%/ui4/settingsdialog_base.py +%%QT4%%%%DATADIR%%/ui4/setupdialog.py +%%QT4%%%%DATADIR%%/ui4/setupdialog_base.py +%%QT4%%%%DATADIR%%/ui4/systemtray.py +%%QT4%%%%DATADIR%%/ui4/systrayframe.py +%%QT4%%%%DATADIR%%/ui4/systrayframe_base.py +%%QT4%%%%DATADIR%%/ui4/ui_utils.py +%%QT4%%%%DATADIR%%/ui4/upgradedialog.py +%%QT4%%%%DATADIR%%/ui4/upgradedialog_base.py +%%QT4%%%%DATADIR%%/ui4/wifisetupdialog.py +%%QT4%%%%DATADIR%%/ui4/wifisetupdialog_base.py +%%QT5%%%%DATADIR%%/ui5/__init__.py +%%QT5%%%%DATADIR%%/ui5/aboutdialog.py +%%QT5%%%%DATADIR%%/ui5/aboutdialog_base.py +%%QT5%%%%DATADIR%%/ui5/aligndialog.py +%%QT5%%%%DATADIR%%/ui5/aligndialog_base.py +%%QT5%%%%DATADIR%%/ui5/cleandialog.py +%%QT5%%%%DATADIR%%/ui5/cleandialog_base.py +%%QT5%%%%DATADIR%%/ui5/colorcaldialog.py +%%QT5%%%%DATADIR%%/ui5/colorcaldialog_base.py +%%QT5%%%%DATADIR%%/ui5/devicesetupdialog.py +%%QT5%%%%DATADIR%%/ui5/devicesetupdialog_base.py +%%QT5%%%%DATADIR%%/ui5/deviceuricombobox.py +%%QT5%%%%DATADIR%%/ui5/devmgr5.py +%%QT5%%%%DATADIR%%/ui5/devmgr5_base.py +%%QT5%%%%DATADIR%%/ui5/devmgr_ext.py +%%QT5%%%%DATADIR%%/ui5/fabgrouptable.py +%%QT5%%%%DATADIR%%/ui5/fabnametable.py +%%QT5%%%%DATADIR%%/ui5/fabwindow.py +%%QT5%%%%DATADIR%%/ui5/fabwindow_base.py +%%QT5%%%%DATADIR%%/ui5/faxsetupdialog.py +%%QT5%%%%DATADIR%%/ui5/faxsetupdialog_base.py +%%QT5%%%%DATADIR%%/ui5/filetable.py +%%QT5%%%%DATADIR%%/ui5/firmwaredialog.py +%%QT5%%%%DATADIR%%/ui5/firmwaredialog_base.py +%%QT5%%%%DATADIR%%/ui5/infodialog.py +%%QT5%%%%DATADIR%%/ui5/infodialog_base.py +%%QT5%%%%DATADIR%%/ui5/linefeedcaldialog.py +%%QT5%%%%DATADIR%%/ui5/linefeedcaldialog_base.py +%%QT5%%%%DATADIR%%/ui5/loadpapergroupbox.py +%%QT5%%%%DATADIR%%/ui5/makecopiesdialog.py +%%QT5%%%%DATADIR%%/ui5/makecopiesdialog_base.py +%%QT5%%%%DATADIR%%/ui5/mimetypesdialog.py +%%QT5%%%%DATADIR%%/ui5/mimetypesdialog_base.py +%%QT5%%%%DATADIR%%/ui5/nodevicesdialog.py +%%QT5%%%%DATADIR%%/ui5/nodevicesdialog_base.py +%%QT5%%%%DATADIR%%/ui5/plugindiagnose.py +%%QT5%%%%DATADIR%%/ui5/plugindiagnose_base.py +%%QT5%%%%DATADIR%%/ui5/plugindialog.py +%%QT5%%%%DATADIR%%/ui5/plugindialog_base.py +%%QT5%%%%DATADIR%%/ui5/pluginlicensedialog.py +%%QT5%%%%DATADIR%%/ui5/pluginlicensedialog_base.py +%%QT5%%%%DATADIR%%/ui5/pqdiagdialog.py +%%QT5%%%%DATADIR%%/ui5/pqdiagdialog_base.py +%%QT5%%%%DATADIR%%/ui5/printdialog.py +%%QT5%%%%DATADIR%%/ui5/printdialog_base.py +%%QT5%%%%DATADIR%%/ui5/printernamecombobox.py +%%QT5%%%%DATADIR%%/ui5/printsettings_base.py +%%QT5%%%%DATADIR%%/ui5/printsettingsdialog.py +%%QT5%%%%DATADIR%%/ui5/printsettingsdialog_base.py +%%QT5%%%%DATADIR%%/ui5/printsettingstoolbox.py +%%QT5%%%%DATADIR%%/ui5/printtestpagedialog.py +%%QT5%%%%DATADIR%%/ui5/printtestpagedialog_base.py +%%QT5%%%%DATADIR%%/ui5/queuesconf.py +%%QT5%%%%DATADIR%%/ui5/readonlyradiobutton.py +%%QT5%%%%DATADIR%%/ui5/sendfaxdialog.py +%%QT5%%%%DATADIR%%/ui5/sendfaxdialog_base.py +%%QT5%%%%DATADIR%%/ui5/settingsdialog.py +%%QT5%%%%DATADIR%%/ui5/settingsdialog_base.py +%%QT5%%%%DATADIR%%/ui5/setupdialog.py +%%QT5%%%%DATADIR%%/ui5/setupdialog_base.py +%%QT5%%%%DATADIR%%/ui5/setupdialog_base5.py +%%QT5%%%%DATADIR%%/ui5/systemtray.py +%%QT5%%%%DATADIR%%/ui5/systrayframe.py +%%QT5%%%%DATADIR%%/ui5/systrayframe_base.py +%%QT5%%%%DATADIR%%/ui5/ui_utils.py +%%QT5%%%%DATADIR%%/ui5/upgradedialog.py +%%QT5%%%%DATADIR%%/ui5/upgradedialog_base.py +%%QT5%%%%DATADIR%%/ui5/wifisetupdialog.py +%%QT5%%%%DATADIR%%/ui5/wifisetupdialog_base.py %%DATADIR%%/uninstall.py %%DATADIR%%/unload.py %%DATADIR%%/upgrade.py @@ -911,6 +980,7 @@ share/ppd/HP/hp-pagewide_pro_477_mfp-ps.ppd.gz share/ppd/HP/hp-pagewide_pro_552_printer-ps.ppd.gz share/ppd/HP/hp-pagewide_pro_577_mfp-ps.ppd.gz -%%X11%%@dir %%DATADIR%%/ui4/plugins +%%QT4%%@dir %%DATADIR%%/ui4/plugins +%%QT5%%@dir %%DATADIR%%/ui5/plugins @dir /var/lib/hp @dir /var/lib