From owner-svn-doc-all@FreeBSD.ORG Fri Nov 22 17:17:11 2013 Return-Path: Delivered-To: svn-doc-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5B49D8CA; Fri, 22 Nov 2013 17:17:11 +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 49DAE21C4; Fri, 22 Nov 2013 17:17:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAMHHB4v072910; Fri, 22 Nov 2013 17:17:11 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAMHHAiN072908; Fri, 22 Nov 2013 17:17:10 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201311221717.rAMHHAiN072908@svn.freebsd.org> From: Rene Ladan Date: Fri, 22 Nov 2013 17:17:10 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43218 - head/en_US.ISO8859-1/books/porters-handbook X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Nov 2013 17:17:11 -0000 Author: rene Date: Fri Nov 22 17:17:10 2013 New Revision: 43218 URL: http://svnweb.freebsd.org/changeset/doc/43218 Log: - Document new USES=qmake in the USES list - Remove texts about Qt 3.X - Update texts about Qt 4.X, describing new variables and integrating USES=qmake PR: docs/182833 (small language/DocBook modifications) Submitted by: makc Modified: head/en_US.ISO8859-1/books/porters-handbook/book.xml head/en_US.ISO8859-1/books/porters-handbook/uses.xml Modified: head/en_US.ISO8859-1/books/porters-handbook/book.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/book.xml Fri Nov 22 16:34:57 2013 (r43217) +++ head/en_US.ISO8859-1/books/porters-handbook/book.xml Fri Nov 22 17:17:10 2013 (r43218) @@ -5715,7 +5715,7 @@ IGNORE= may not be redistributed because CMAKE_ENV - Environment variables to be set for + Environment variables to be set for the cmake binary. Default is ${CONFIGURE_ENV}. @@ -6544,15 +6544,6 @@ USE_XORG= x11 xpm - USE_QT_VER - The port uses the Qt toolkit. The only - possible value is 3. - Appropriate parameters are passed to - configure script and - make. - - - USE_QT4 Specify tool and library dependencies for ports that use Qt 4. See @@ -6653,19 +6644,7 @@ USE_XORG= x11 xpm - When USE_QT_VER is set to - 3, some useful settings are passed to the - configure script: - - CONFIGURE_ARGS+= --with-qt-includes=${QT_PREFIX}/include \ - --with-qt-libraries=${QT_PREFIX}/lib \ - --with-extra-libs=${LOCALBASE}/lib \ - --with-extra-includes=${LOCALBASE}/include -CONFIGURE_ENV+= MOC="${MOC}" LIBS="${QTCFGLIBS}" \ - QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}" -CPPFLAGS+= ${QTCPPFLAGS} - - If USE_QT4 is set, the following + When USE_QT4 is set, the following settings are deployed: CONFIGURE_ARGS+= --with-qt-includes=${QT_INCDIR} \ @@ -6682,7 +6661,7 @@ PLIST_SUB+= QT_INCDIR_REL=${QT_INCDIR_RE - Component Selection (Qt 4.x Only) + Component Selection Individual Qt 4 tool and library dependencies must be specified in the USE_QT4 variable. Every @@ -6852,28 +6831,59 @@ PLIST_SUB+= QT_INCDIR_REL=${QT_INCDIR_RE - - Additional Considerations + + Using <command>qmake</command> + + + Variables for Ports That Use + <command>qmake</command> + + + + + Variable + Means + + + + + + QMAKE_ARGS + Port specific QMake + flags to be passed to the qmake + binary. + + + + QMAKE_ENV + Environment variables to be set for the + qmake binary. The default is + ${CONFIGURE_ENV}. + + + + QMAKE_PRO + Name of the project .pro file. + The default is empty (using autodetection). + + + +
If the application does not provide a - configure file but a + configure script but a .pro file, you can use the following: - HAS_CONFIGURE= yes + USES= qmake +USE_QT4= qmake_build -do-configure: - @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} texmaker.pro - - Note the similarity to the qmake line - from the provided BUILD.sh script. - Passing CONFIGURE_ENV ensures - qmake will see the - QMAKESPEC variable, without which it - cannot work. qmake generates standard - Makefiles, so it is not necessary to write our own - build target. + USES=qmake instructs the port to + use qmake for configuring. + Note that USES=qmake does not imply a + dependency on Qt 4 qmake, thus + USE_QT4 has to be populated with the + qmake_build component. Qt applications often are written to be cross-platform and often X11/Unix is not the platform they are developed @@ -6890,8 +6900,8 @@ do-configure: the include and library search paths via the command line, for example: - ${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} INCLUDEPATH+=${LOCALBASE}/include \ - LIBS+=-L${LOCALBASE}/lib sillyapp.pro + QMAKE_ARGS+= INCLUDEPATH+=${LOCALBASE}/include \ + LIBS+=-L${LOCALBASE}/lib Modified: head/en_US.ISO8859-1/books/porters-handbook/uses.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/uses.xml Fri Nov 22 16:34:57 2013 (r43217) +++ head/en_US.ISO8859-1/books/porters-handbook/uses.xml Fri Nov 22 17:17:10 2013 (r43218) @@ -282,6 +282,15 @@ + qmake + (none), norecursive + + The port will use QMake for + configuring. For more information see + . + + + readline (none), port Implies that the port uses