Date: Tue, 24 Feb 2015 21:40:33 +0000 (UTC) From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379844 - in head/devel: qt4 qt5 Message-ID: <201502242140.t1OLeX2m049774@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Tue Feb 24 21:40:33 2015 New Revision: 379844 URL: https://svnweb.freebsd.org/changeset/ports/379844 QAT: https://qat.redports.org/buildarchive/r379844/ Log: devel/qt{4,5}: - Convert to NO_ISTALL - Rework dependency handling to avoid inclusion of bsd.port.options.mk Modified: head/devel/qt4/Makefile head/devel/qt5/Makefile Modified: head/devel/qt4/Makefile ============================================================================== --- head/devel/qt4/Makefile Tue Feb 24 21:39:19 2015 (r379843) +++ head/devel/qt4/Makefile Tue Feb 24 21:40:33 2015 (r379844) @@ -3,7 +3,7 @@ PORTNAME= qt4 DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= # empty DISTFILES= # none @@ -17,8 +17,10 @@ USE_QT4= accessible clucene corelib dbus imageformats inputmethods multimedia network opengl \ phonon qt3support qtestlib script scripttools sql \ svg webkit xml xmlpatterns +USE_QT4:= ${USE_QT4:S/$/_run/} NO_BUILD= yes +NO_INSTALL= yes NO_MTREE= yes OPTIONS_DEFINE= CODECS DOCS EXAMPLES GSTREAMER NLS SQL_PLUGINS TOOLS @@ -46,14 +48,7 @@ TOOLS_USE= assistant help-tools linguist qvfb rcc uic uic3 xmlpatterns-tool .for opt in ${OPTIONS_DEFINE} -${opt}_USE:= ${${opt}_USE:S/^/QT4=/} +${opt}_USE:= ${${opt}_USE:S/^/QT4=/:S/$/_run/} .endfor -.include <bsd.port.options.mk> - -USE_QT4:= ${USE_QT4:S/$/_run/} - -do-install: - @${DO_NADA} - .include <bsd.port.mk> Modified: head/devel/qt5/Makefile ============================================================================== --- head/devel/qt5/Makefile Tue Feb 24 21:39:19 2015 (r379843) +++ head/devel/qt5/Makefile Tue Feb 24 21:40:33 2015 (r379844) @@ -2,7 +2,7 @@ PORTNAME= qt5 DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= # empty DISTFILES= # empty @@ -16,8 +16,10 @@ USE_QT5= clucene concurrent core dbus de network opengl paths printsupport qml quick quickcontrols \ script scripttools serialport sql svg testlib webkit widgets \ x11extras xml xmlpatterns +USE_QT5:= ${USE_QT5:S/$/_run/} NO_BUILD= yes +NO_INSTALL= yes NO_MTREE= yes OPTIONS_DEFINE= SQL_PLUGINS TOOLS @@ -32,14 +34,7 @@ TOOLS_USE= assistant buildtools linguist pixeltool qdbus qdbusviewer qdoc qev qmake .for opt in ${OPTIONS_DEFINE} -${opt}_USE:= ${${opt}_USE:S/^/QT5=/} +${opt}_USE:= ${${opt}_USE:S/^/QT5=/:S/$/_run/} .endfor -.include <bsd.port.options.mk> - -USE_QT5:= ${USE_QT5:S/$/_run/} - -do-install: - @${DO_NADA} - .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502242140.t1OLeX2m049774>