From owner-svn-ports-head@freebsd.org Sat Mar 16 23:40:10 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AFE8A15421F5; Sat, 16 Mar 2019 23:40:10 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 54E5982AB6; Sat, 16 Mar 2019 23:40:10 +0000 (UTC) (envelope-from tcberner@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 457D31250; Sat, 16 Mar 2019 23:40:10 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2GNeAFV033199; Sat, 16 Mar 2019 23:40:10 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2GNeAhn033198; Sat, 16 Mar 2019 23:40:10 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201903162340.x2GNeAhn033198@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sat, 16 Mar 2019 23:40:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495999 - head/print/hplip X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: head/print/hplip X-SVN-Commit-Revision: 495999 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 54E5982AB6 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.97)[-0.965,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Mar 2019 23:40:10 -0000 Author: tcberner Date: Sat Mar 16 23:40:09 2019 New Revision: 495999 URL: https://svnweb.freebsd.org/changeset/ports/495999 Log: print/hplip: remove remnants of QT4 option Approved by: portmgr (implicit) Modified: head/print/hplip/Makefile Modified: head/print/hplip/Makefile ============================================================================== --- head/print/hplip/Makefile Sat Mar 16 23:39:05 2019 (r495998) +++ head/print/hplip/Makefile Sat Mar 16 23:40:09 2019 (r495999) @@ -35,7 +35,8 @@ CONFIGURE_ARGS= --with-cupsbackenddir=${PREFIX}/libexe --with-mimedir=${PREFIX}/share/cups/mime \ --with-docdir=${DOCSDIR} \ --with-htmldir=${DOCSDIR} \ - --with-drvdir=${PREFIX}/share/cups/drv + --with-drvdir=${PREFIX}/share/cups/drv \ + --disable-qt4 CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib @@ -68,17 +69,6 @@ XSANE_RUN_DEPENDS= xsane:graphics/xsane .include -.if ${PORT_OPTIONS:MQT4} && ${PORT_OPTIONS:MX11} -DEPRECATED= Qt4 has been EOL since december 2015 -EXPIRATION_DATE= 2019-03-15 - -USES+= pyqt:4 -USE_PYQT= core_run dbussupport_run gui_run sip -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 sip widgets_run @@ -87,7 +77,7 @@ CONFIGURE_ARGS+= --enable-qt5 CONFIGURE_ARGS+= --disable-qt5 .endif -.if ${PORT_OPTIONS:MX11} && ! ${PORT_OPTIONS:MQT4} && ! ${PORT_OPTIONS:MQT5} +.if ${PORT_OPTIONS:MX11} && ! ${PORT_OPTIONS:MQT5} BROKEN= The X11 option requires one of the QT4 or QT5 options .endif