From owner-svn-ports-head@FreeBSD.ORG Thu Nov 21 14:15:54 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0EEF4C84; Thu, 21 Nov 2013 14:15:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F1A422A58; Thu, 21 Nov 2013 14:15:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rALEFrhM018297; Thu, 21 Nov 2013 14:15:53 GMT (envelope-from makc@svn.freebsd.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rALEFrnt018295; Thu, 21 Nov 2013 14:15:53 GMT (envelope-from makc@svn.freebsd.org) Message-Id: <201311211415.rALEFrnt018295@svn.freebsd.org> From: Max Brazhnikov Date: Thu, 21 Nov 2013 14:15:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334494 - in head/Mk: . Uses X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.16 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: Thu, 21 Nov 2013 14:15:54 -0000 Author: makc Date: Thu Nov 21 14:15:53 2013 New Revision: 334494 URL: http://svnweb.freebsd.org/changeset/ports/334494 Log: In preparation for Qt 5 ports: bsd.qt.mk: - Deprecate QMAKEFLAGS, QMAKE_ARGS should be used instead - define LRELEASE/LUPDATE commands for general use Uses/qmake.mk: - USES=qmake now implies build dependency on qmake - Deprecate QMAKE_PRO (QMAKE_SOURCE_PATH should be used if required) - move QMAKE_ARGS definition to bsd.qt.mk Modified: head/Mk/Uses/qmake.mk head/Mk/bsd.qt.mk Modified: head/Mk/Uses/qmake.mk ============================================================================== --- head/Mk/Uses/qmake.mk Thu Nov 21 13:55:27 2013 (r334493) +++ head/Mk/Uses/qmake.mk Thu Nov 21 14:15:53 2013 (r334494) @@ -6,7 +6,7 @@ # # Feature: qmake # Usage: USES=qmake or USES=qmake:ARGS -# Must be used along with 'USE_QT4= qmake_build' +# Must be used along with 'USE_QT4=' # Valid ARGS: norecursive # ARGS description: # norecursive Don't pass -recursive argument to qmake binary @@ -15,13 +15,13 @@ # Variables for ports: # QMAKE_ENV - Environment passed to qmake. # Default: ${CONFIGURE_ENV} -# QMAKE_ARGS - Arguments passed to qmake +# QMAKE_ARGS - Arguments passed to qmake. # Default: see below -# QMAKE_PRO - qmake project file. +# QMAKE_SOURCE_PATH - Path to qmake project files. # Default: empty (autodetect) # # User defined variables: -# QMAKE_VERBOSE - Enable verbose configure output +# QMAKE_VERBOSE - Enable verbose configure output. # .if !defined(_INCLUDE_USES_QMAKE_MK) @@ -39,17 +39,11 @@ IGNORE= Incorrect 'USES+= qmake' usage: . endif .endif -.if ${USE_QT4:Mqmake_build} == "" && ${USE_QT4:Mqmake} == "" -IGNORE= 'USES+= qmake' must be accompanied with 'USE_QT4= qmake_build' +.if !defined(USE_QT4) +IGNORE= 'USES+= qmake' must be accompanied with 'USE_QT4= #' .endif -# CC is respected via QMAKESPEC (see Mk/bsd.qt.mk) -QMAKE_ARGS+= -spec ${QMAKESPEC} \ - QMAKE_CFLAGS="${CFLAGS}" \ - QMAKE_CXXFLAGS="${CXXFLAGS}" \ - QMAKE_LFLAGS="${LDFLAGS}" \ - PREFIX=${PREFIX} -QMAKE_ENV?= ${CONFIGURE_ENV} +USE_QT4+= qmake_build .if !defined(QMAKE_NORECURSIVE) QMAKE_ARGS+= -recursive @@ -59,9 +53,11 @@ QMAKE_ARGS+= -recursive QMAKE_ARGS+= -d .endif +QMAKE_SOURCE_PATH?= ${QMAKE_PRO} + .if !target(do-configure) do-configure: - @cd ${CONFIGURE_WRKSRC} && ${SETENV} ${QMAKE_ENV} ${QMAKE} ${QMAKE_ARGS} ${QMAKE_PRO} + @cd ${CONFIGURE_WRKSRC} && ${SETENV} ${QMAKE_ENV} ${QMAKE} ${QMAKE_ARGS} ${QMAKE_SOURCE_PATH} .endif .endif #!defined(_INCLUDE_USES_QMAKE_MK) Modified: head/Mk/bsd.qt.mk ============================================================================== --- head/Mk/bsd.qt.mk Thu Nov 21 13:55:27 2013 (r334493) +++ head/Mk/bsd.qt.mk Thu Nov 21 14:15:53 2013 (r334494) @@ -103,14 +103,24 @@ QT_PREFIX?= ${LOCALBASE} QT_INCDIR?= ${QT_PREFIX}/${QT_INCDIR_REL} QT_LIBDIR?= ${QT_PREFIX}/${QT_LIBDIR_REL} QT_PLUGINDIR?= ${QT_PREFIX}/${QT_PLUGINDIR_REL} +LRELEASE?= ${QT_PREFIX}/bin/lrelease-qt4 +LUPDATE?= ${QT_PREFIX}/bin/lupdate-qt4 MOC?= ${QT_PREFIX}/bin/moc-qt4 UIC?= ${QT_PREFIX}/bin/uic-qt4 RCC?= ${QT_PREFIX}/bin/rcc QMAKE?= ${QT_PREFIX}/bin/qmake-qt4 +# QMAKEFLAGS will be superseded by QMAKE_ARGS QMAKEFLAGS+= QMAKE_CC="${CC}" QMAKE_CXX="${CXX}" \ QMAKE_LINK="${CXX}" QMAKE_LINK_SHLIB="${CXX}" \ QMAKE_LINK_C="${CC}" QMAKE_LINK_C_SHLIB="${CC}" \ QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" +QMAKE_ENV?= ${CONFIGURE_ENV} +QMAKE_ARGS+= -spec ${QMAKESPEC} \ + QMAKE_CC="${CC}" QMAKE_CXX="${CXX}" \ + QMAKE_LINK="${CXX}" QMAKE_LINK_SHLIB="${CXX}" \ + QMAKE_LINK_C="${CC}" QMAKE_LINK_C_SHLIB="${CC}" \ + QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" \ + QMAKE_LFLAGS="${LDFLAGS}" PREFIX="${PREFIX}" QTCPPFLAGS?= QTCGFLIBS?= @@ -337,9 +347,6 @@ QMAKESPEC?= ${QT_PREFIX}/share/qt4/mkspe .else # If something went wrong, default to the base configuration. QMAKESPEC?= ${QT_PREFIX}/share/qt4/mkspecs/freebsd-${QMAKE_BASE_COMPILER} -QMAKE_ARGS+= QMAKE_CC="${CC}" QMAKE_CXX="${CXX}" \ - QMAKE_LINK="${CXX}" QMAKE_LINK_SHLIB="${CXX}" \ - QMAKE_LINK_C="${CC}" QMAKE_LINK_C_SHLIB="${CC}" .endif .for component in ${_USE_QT4_ALL}