kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge QT5 option with X11 option because it's the only supported toolkit

Browse source 
nowadays.
This commit is contained in:
Tijl Coosemans 2020-09-07 14:27:25 +00:00
parent 4d30d72b5e
commit d214508875
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=547893
2 changed files with 76 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
print/hplip/Makefile
View file

@ -41,8 +41,8 @@ CONFIGURE_ENV+= PYTHONINCLUDEDIR=${PYTHON_INCLUDEDIR}
CPPFLAGS+= -I${LOCALBASE}/include -I${PYTHON_INCLUDEDIR}
LIBS+= -L${LOCALBASE}/lib
OPTIONS_DEFINE= DOCS FAX SCAN SNMP X11 XSANE QT5
OPTIONS_DEFAULT= QT5 SCAN SNMP X11
OPTIONS_DEFINE= DOCS FAX SCAN SNMP X11 XSANE
OPTIONS_DEFAULT= SCAN SNMP X11
OPTIONS_SUB= yes
DOCS_CONFIGURE_ENABLE= doc-build
@ -62,26 +62,14 @@ SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp
SNMP_CONFIGURE_ENABLE= network-build
X11_DESC= Graphical User Interface (Qt)
X11_CONFIGURE_ENABLE= gui-build
X11_CONFIGURE_ENABLE= gui-build qt5
X11_USES= pyqt:5
X11_USE= PYQT=core_run,dbussupport_run,gui_run,widgets_run
XSANE_DESC= Install XSane for scanning (implies SCAN)
XSANE_IMPLIES= SCAN
XSANE_RUN_DEPENDS= xsane:graphics/xsane
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MQT5} && ${PORT_OPTIONS:MX11}
USES+= pyqt:5
USE_PYQT= core_run dbussupport_run gui_run sip widgets_run
CONFIGURE_ARGS+= --enable-qt5
.else
CONFIGURE_ARGS+= --disable-qt5
.endif
.if ${PORT_OPTIONS:MX11} && ! ${PORT_OPTIONS:MQT5}
BROKEN= The X11 option requires the QT5 option
.endif
post-patch:
@${REINPLACE_CMD} -e 's|-ldld||g;' \
-e 's|-ldl||g' \

142
print/hplip/pkg-plist
View file

@ -562,76 +562,76 @@ share/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi
%%DATADIR%%/testpage.py
%%DATADIR%%/timedate.py
%%DATADIR%%/toolbox.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/__init__.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/aboutdialog.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/aboutdialog_base.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/aligndialog.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/aligndialog_base.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/cleandialog.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/cleandialog_base.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/colorcaldialog.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/colorcaldialog_base.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/devicesetupdialog.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/devicesetupdialog_base.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/deviceuricombobox.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/devmgr5.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/devmgr5_base.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/devmgr_ext.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/fabgrouptable.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/fabnametable.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/fabwindow.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/fabwindow_base.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/faxsetupdialog.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/faxsetupdialog_base.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/filetable.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/firmwaredialog.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/firmwaredialog_base.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/infodialog.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/infodialog_base.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/linefeedcaldialog.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/linefeedcaldialog_base.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/loadpapergroupbox.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/makecopiesdialog.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/makecopiesdialog_base.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/mimetypesdialog.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/mimetypesdialog_base.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/nodevicesdialog.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/nodevicesdialog_base.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/plugindiagnose.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/plugindiagnose_base.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/plugindialog.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/plugindialog_base.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/pluginlicensedialog.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/pluginlicensedialog_base.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/pqdiagdialog.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/pqdiagdialog_base.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/printdialog.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/printdialog_base.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/printernamecombobox.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/printsettings_base.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/printsettingsdialog.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/printsettingsdialog_base.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/printsettingstoolbox.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/printtestpagedialog.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/printtestpagedialog_base.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/queuesconf.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/readonlyradiobutton.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/scandialog.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/sendfaxdialog.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/sendfaxdialog_base.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/settingsdialog.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/settingsdialog_base.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/setupdialog.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/setupdialog_base.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/setupdialog_base5.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/systemtray.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/systrayframe.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/systrayframe_base.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/ui_utils.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/upgradedialog.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/upgradedialog_base.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/wifisetupdialog.py
%%X11%%%%QT5%%%%DATADIR%%/ui5/wifisetupdialog_base.py
%%X11%%%%DATADIR%%/ui5/__init__.py
%%X11%%%%DATADIR%%/ui5/aboutdialog.py
%%X11%%%%DATADIR%%/ui5/aboutdialog_base.py
%%X11%%%%DATADIR%%/ui5/aligndialog.py
%%X11%%%%DATADIR%%/ui5/aligndialog_base.py
%%X11%%%%DATADIR%%/ui5/cleandialog.py
%%X11%%%%DATADIR%%/ui5/cleandialog_base.py
%%X11%%%%DATADIR%%/ui5/colorcaldialog.py
%%X11%%%%DATADIR%%/ui5/colorcaldialog_base.py
%%X11%%%%DATADIR%%/ui5/devicesetupdialog.py
%%X11%%%%DATADIR%%/ui5/devicesetupdialog_base.py
%%X11%%%%DATADIR%%/ui5/deviceuricombobox.py
%%X11%%%%DATADIR%%/ui5/devmgr5.py
%%X11%%%%DATADIR%%/ui5/devmgr5_base.py
%%X11%%%%DATADIR%%/ui5/devmgr_ext.py
%%X11%%%%DATADIR%%/ui5/fabgrouptable.py
%%X11%%%%DATADIR%%/ui5/fabnametable.py
%%X11%%%%DATADIR%%/ui5/fabwindow.py
%%X11%%%%DATADIR%%/ui5/fabwindow_base.py
%%X11%%%%DATADIR%%/ui5/faxsetupdialog.py
%%X11%%%%DATADIR%%/ui5/faxsetupdialog_base.py
%%X11%%%%DATADIR%%/ui5/filetable.py
%%X11%%%%DATADIR%%/ui5/firmwaredialog.py
%%X11%%%%DATADIR%%/ui5/firmwaredialog_base.py
%%X11%%%%DATADIR%%/ui5/infodialog.py
%%X11%%%%DATADIR%%/ui5/infodialog_base.py
%%X11%%%%DATADIR%%/ui5/linefeedcaldialog.py
%%X11%%%%DATADIR%%/ui5/linefeedcaldialog_base.py
%%X11%%%%DATADIR%%/ui5/loadpapergroupbox.py
%%X11%%%%DATADIR%%/ui5/makecopiesdialog.py
%%X11%%%%DATADIR%%/ui5/makecopiesdialog_base.py
%%X11%%%%DATADIR%%/ui5/mimetypesdialog.py
%%X11%%%%DATADIR%%/ui5/mimetypesdialog_base.py
%%X11%%%%DATADIR%%/ui5/nodevicesdialog.py
%%X11%%%%DATADIR%%/ui5/nodevicesdialog_base.py
%%X11%%%%DATADIR%%/ui5/plugindiagnose.py
%%X11%%%%DATADIR%%/ui5/plugindiagnose_base.py
%%X11%%%%DATADIR%%/ui5/plugindialog.py
%%X11%%%%DATADIR%%/ui5/plugindialog_base.py
%%X11%%%%DATADIR%%/ui5/pluginlicensedialog.py
%%X11%%%%DATADIR%%/ui5/pluginlicensedialog_base.py
%%X11%%%%DATADIR%%/ui5/pqdiagdialog.py
%%X11%%%%DATADIR%%/ui5/pqdiagdialog_base.py
%%X11%%%%DATADIR%%/ui5/printdialog.py
%%X11%%%%DATADIR%%/ui5/printdialog_base.py
%%X11%%%%DATADIR%%/ui5/printernamecombobox.py
%%X11%%%%DATADIR%%/ui5/printsettings_base.py
%%X11%%%%DATADIR%%/ui5/printsettingsdialog.py
%%X11%%%%DATADIR%%/ui5/printsettingsdialog_base.py
%%X11%%%%DATADIR%%/ui5/printsettingstoolbox.py
%%X11%%%%DATADIR%%/ui5/printtestpagedialog.py
%%X11%%%%DATADIR%%/ui5/printtestpagedialog_base.py
%%X11%%%%DATADIR%%/ui5/queuesconf.py
%%X11%%%%DATADIR%%/ui5/readonlyradiobutton.py
%%X11%%%%DATADIR%%/ui5/scandialog.py
%%X11%%%%DATADIR%%/ui5/sendfaxdialog.py
%%X11%%%%DATADIR%%/ui5/sendfaxdialog_base.py
%%X11%%%%DATADIR%%/ui5/settingsdialog.py
%%X11%%%%DATADIR%%/ui5/settingsdialog_base.py
%%X11%%%%DATADIR%%/ui5/setupdialog.py
%%X11%%%%DATADIR%%/ui5/setupdialog_base.py
%%X11%%%%DATADIR%%/ui5/setupdialog_base5.py
%%X11%%%%DATADIR%%/ui5/systemtray.py
%%X11%%%%DATADIR%%/ui5/systrayframe.py
%%X11%%%%DATADIR%%/ui5/systrayframe_base.py
%%X11%%%%DATADIR%%/ui5/ui_utils.py
%%X11%%%%DATADIR%%/ui5/upgradedialog.py
%%X11%%%%DATADIR%%/ui5/upgradedialog_base.py
%%X11%%%%DATADIR%%/ui5/wifisetupdialog.py
%%X11%%%%DATADIR%%/ui5/wifisetupdialog_base.py
%%DATADIR%%/uiscan.py
%%DATADIR%%/uninstall.py
%%DATADIR%%/unload.py
@ -1862,6 +1862,6 @@ share/ppd/HP/hp-tango.ppd.gz
@dir %%DATADIR%%/data/images/devices
@dir %%DATADIR%%/data/images/other
%%X11%%@dir %%DATADIR%%/ui4/plugins
%%X11%%%%QT5%%@dir %%DATADIR%%/ui5/plugins
%%X11%%@dir %%DATADIR%%/ui5/plugins
@dir /var/lib/hp
@dir /var/lib