Date: Sun, 2 Apr 2017 10:34:07 +0000 (UTC) From: Ben Woods <woodsb02@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r437548 - head/print/hplip Message-ID: <201704021034.v32AY77a032794@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: woodsb02 Date: Sun Apr 2 10:34:06 2017 New Revision: 437548 URL: https://svnweb.freebsd.org/changeset/ports/437548 Log: print/hplip: Improve option logic for X11, QT4, QT5 If X11 option is disabled, the configure args should not enable QT4 or QT5, and their dependencies should not be added. PR: 218213 Reported by: Tom Francis <thomas.francis.jr@pobox.com> Reviewed by: Kevin Oberman <rkoberman@gmail.com> Modified: head/print/hplip/Makefile Modified: head/print/hplip/Makefile ============================================================================== --- head/print/hplip/Makefile Sun Apr 2 10:32:22 2017 (r437547) +++ head/print/hplip/Makefile Sun Apr 2 10:34:06 2017 (r437548) @@ -62,22 +62,34 @@ SCAN_CONFIGURE_ENABLE= scan-build X11_DESC= Graphical User Interface (Qt) X11_CONFIGURE_ENABLE= gui-build -QT4_USES= pyqt:4 -QT4_USE= PYQT=core_run,dbussupport_run,gui_run -QT4_CONFIGURE_ENABLE= qt4 -QT4_IMPLIES= X11 - -QT5_USES= pyqt:5 -QT5_USE= PYQT=core_run,dbussupport_run,gui_run,widgets_run -QT5_CONFIGURE_ENABLE= qt5 -QT5_IMPLIES= X11 - XSANE_DESC= Install XSane for scanning (implies SCAN) XSANE_IMPLIES= SCAN XSANE_RUN_DEPENDS= xsane:graphics/xsane DOCS_CONFIGURE_ENABLE= doc-build +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MQT4} && ${PORT_OPTIONS:MX11} +USES+= pyqt:4 +USE_PYQT= core_run dbussupport_run gui_run +CONFIGURE_ARGS+= --enable-qt4 +.else +CONFIGURE_ARGS+= --disable-qt4 +.endif + +.if ${PORT_OPTIONS:MQT5} && ${PORT_OPTIONS:MX11} +USES+= pyqt:5 +USE_PYQT= core_run dbussupport_run gui_run widgets_run +CONFIGURE_ARGS+= --enable-qt5 +.else +CONFIGURE_ARGS+= --disable-qt5 +.endif + +.if ${PORT_OPTIONS:MX11} && ! ${PORT_OPTIONS:MQT4} && ! ${PORT_OPTIONS:MQT5} +BROKEN= The X11 option requires one of the QT4 or QT5 options +.endif + post-patch: @${REINPLACE_CMD} -e 's|-ldld||g;' \ -e 's|-ldl||g' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704021034.v32AY77a032794>