From owner-svn-ports-all@freebsd.org Sun Apr 2 10:34:08 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 27854D2ACF2; Sun, 2 Apr 2017 10:34:08 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D525F1E9; Sun, 2 Apr 2017 10:34:07 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v32AY773032795; Sun, 2 Apr 2017 10:34:07 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v32AY77a032794; Sun, 2 Apr 2017 10:34:07 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <201704021034.v32AY77a032794@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods Date: Sun, 2 Apr 2017 10:34:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r437548 - head/print/hplip X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Apr 2017 10:34:08 -0000 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 Reviewed by: Kevin Oberman 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 + +.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' \