Date: Sat, 16 Mar 2019 23:40:10 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495999 - head/print/hplip Message-ID: <201903162340.x2GNeAhn033198@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk> -.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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903162340.x2GNeAhn033198>