svn commit: r437548 - head/print/hplip

[Tijl Coosemans]

On Tue, 4 Apr 2017 12:00:42 +0200 Mathieu Arnold <mat at FreeBSD.org> wrote:
> Le 02/04/2017 à 12:34, Ben Woods a écrit :
>> 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 at pobox.com>
>>   Reviewed by:	Kevin Oberman <rkoberman at 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  
> 
> All those changes seem dubious, a simple QT4_IMPLIES=X11 and
> QT5_IMPLIES=X11 would have been enough to express all of this.
> 
> Also, it seems X11 is not really an option, as it cannot be used alone,
> maybe it should be folded into the QT4 and QT5 options.

For print servers it's nice to disable X11 via make.conf and not have
Qt or other x11 consumers pulled in.  Maybe the port can switch to Qt5
without a Qt4 option.  I would have waited for Plasma5 to hit the ports
tree before making Qt5 the default though.  Why force people to install
Qt5 if there's no need for it?  And do Qt5 apps use the right theme
under KDE4?