From nobody@FreeBSD.org  Tue Oct  8 15:29:55 2013
Return-Path: <nobody@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 ESMTP id 90D5DD9
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  8 Oct 2013 15:29:55 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 6DE122AB0
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  8 Oct 2013 15:29:55 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r98FTthf008780
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 8 Oct 2013 15:29:55 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r98FTtXl008774;
	Tue, 8 Oct 2013 15:29:55 GMT
	(envelope-from nobody)
Message-Id: <201310081529.r98FTtXl008774@oldred.freebsd.org>
Date: Tue, 8 Oct 2013 15:29:55 GMT
From: Max Brazhnikov <makc@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [porters-handbook]: document QMake usage, update Qt section
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         182833
>Category:       docs
>Synopsis:       [porters-handbook]: document QMake usage, update Qt section
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    rene
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 08 15:40:00 UTC 2013
>Closed-Date:    Fri Nov 22 17:17:47 UTC 2013
>Last-Modified:  Fri Nov 22 17:20:00 UTC 2013
>Originator:     Max Brazhnikov
>Release:        FreeBSD 9.2-PRERELEASE amd64
>Organization:
>Environment:
>Description:
Document new USES= qmake
Remove Qt 3.x stuff

http://people.freebsd.org/~makc/patches/ph-qmake.diff
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: en_US.ISO8859-1/books/porters-handbook/book.xml
===================================================================
--- en_US.ISO8859-1/books/porters-handbook/book.xml	(revision 42890)
+++ en_US.ISO8859-1/books/porters-handbook/book.xml	(working copy)
@@ -6539,15 +6539,6 @@
 	  <tgroup cols="2">
 	    <tbody>
 	      <row>
-		<entry><makevar>USE_QT_VER</makevar></entry>
-		<entry>The port uses the Qt toolkit.  The only
-		  possible value is <literal>3</literal>.
-		  Appropriate parameters are passed to
-		  <command>configure</command> script and
-		  <command>make</command>.</entry>
-	      </row>
-
-	      <row>
 		<entry><makevar>USE_QT4</makevar></entry>
 		<entry>Specify tool and library dependencies for ports
 		  that use Qt 4.  See
@@ -6648,19 +6639,7 @@
 	  </tgroup>
 	</table>
 
-	<para>When <makevar>USE_QT_VER</makevar> is set to
-	  <literal>3</literal>, some useful settings are passed to the
-	  <command>configure</command> script:</para>
-
-	<programlisting>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}</programlisting>
-
-	<para>If <makevar>USE_QT4</makevar> is set, the following
+	<para>When <makevar>USE_QT4</makevar> is set, the following
 	  settings are deployed:</para>
 
 	<programlisting>CONFIGURE_ARGS+=	--with-qt-includes=${QT_INCDIR} \
@@ -6677,7 +6656,7 @@
       </sect2>
 
       <sect2 id="qt4-components">
-	<title>Component Selection (Qt 4.x Only)</title>
+	<title>Component Selection</title>
 
 	<para>Individual Qt 4 tool and library dependencies must be
 	  specified in the <makevar>USE_QT4</makevar> variable.  Every
@@ -6847,29 +6826,60 @@
 	</example>
       </sect2>
 
-      <sect2 id="qt-additional">
-	<title>Additional Considerations</title>
+      <sect2 id="using-qmake">
+	<title>Using <command>qmake</command></title>
 
+	<table frame="none">
+	  <title>Variables for Ports That Use
+	    <command>qmake</command></title>
+
+	  <tgroup cols="2">
+	    <thead>
+	      <row>
+		<entry>Variable</entry>
+		<entry>Means</entry>
+	      </row>
+	    </thead>
+
+	    <tbody>
+	      <row>
+		<entry><makevar>QMAKE_ARGS</makevar></entry>
+		<entry>Port specific <application>QMake</application>
+		  flags to be passed to the <command>qmake</command>
+		  binary.</entry>
+	      </row>
+
+	      <row>
+		<entry><makevar>QMAKE_ENV</makevar></entry>
+		<entry>Environment variables to be set for
+		  <command>qmake</command> binary.  Default is
+		  <literal>&dollar;{CONFIGURE_ENV}</literal>.</entry>
+	      </row>
+
+	      <row>
+		<entry><makevar>QMAKE_PRO</makevar></entry>
+		<entry>Name of the project <filename>.pro</filename> file.
+		  Default is empty (using autodetection).</entry>
+	      </row>
+	    </tbody>
+	  </tgroup>
+	</table>
+
 	<para>If the application does not provide a
-	  <filename>configure</filename> file but a
+	  <filename>configure</filename> script but a
 	  <filename>.pro</filename> file, you can use the
 	  following:</para>
 
-	<programlisting>HAS_CONFIGURE=	yes
+	<programlisting>USES=	qmake
+USE_QT4=	qmake_build</programlisting>
 
-do-configure:
-	@cd ${WRKSRC} &amp;&amp; ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} texmaker.pro</programlisting>
+	<para><literal>USES= qmake</literal> instructs the port to
+	  use <command>qmake</command> for configuring.
+	  Note that <literal>USES= qmake</literal> does not imply
+	  dependency on Qt 4 <command>qmake</command>, thus
+	  <literal>USE_QT4</literal> has to be populated with
+	  <literal>qmake_build</literal> component.</para>
 
-	<para>Note the similarity to the <command>qmake</command> line
-	  from the provided <filename>BUILD.sh</filename> script.
-	  Passing <makevar>CONFIGURE_ENV</makevar> ensures
-	  <command>qmake</command> will see the
-	  <makevar>QMAKESPEC</makevar> variable, without which it
-	  cannot work.  <command>qmake</command> generates standard
-	  Makefiles, so it is not necessary to write our own
-	  <maketarget>build</maketarget> target.</para>
-
 	<para>Qt applications often are written to be cross-platform
 	  and often X11/Unix is not the platform they are developed
 	  on, which in turn often leads to certain loose ends,
@@ -6885,8 +6895,8 @@
 	      the include and library search paths via the command
 	      line, for example:</para>
 
-	    <programlisting>${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} INCLUDEPATH+=${LOCALBASE}/include \
-	LIBS+=-L${LOCALBASE}/lib sillyapp.pro</programlisting>
+	    <programlisting>QMAKE_ARGS+= INCLUDEPATH+=${LOCALBASE}/include \
+	LIBS+=-L${LOCALBASE}/lib</programlisting>
 	  </listitem>
 
 	  <listitem>
Index: en_US.ISO8859-1/books/porters-handbook/uses.xml
===================================================================
--- en_US.ISO8859-1/books/porters-handbook/uses.xml	(revision 42890)
+++ en_US.ISO8859-1/books/porters-handbook/uses.xml	(working copy)
@@ -179,6 +179,15 @@
 </row>
 
 <row>
+  <entry><literal>qmake</literal></entry>
+  <entry>(none), <literal>norecursive</literal></entry>
+
+  <entry>The port will use <application>QMake</application> for
+    configuring.  For more information see
+    <xref linkend="using-qmake"/>.</entry>
+</row>
+
+<row>
   <entry><literal>readline</literal></entry>
   <entry>(none), port</entry>
   <entry>Implies that the port uses


>Release-Note:
>Audit-Trail:

From: Eitan Adler <lists@eitanadler.com>
To: bug-followup@freebsd.org, makc@freebsd.org
Cc:  
Subject: Re: docs/182833: [porters-handbook]: document QMake usage, update Qt section
Date: Sun, 17 Nov 2013 17:04:14 -0500

 Patch fails to apply :(
 
 Hmm...  Looks like a unified diff to me...
 The text leading up to this was:
 --------------------------
 |Index: en_US.ISO8859-1/books/porters-handbook/book.xml
 |===================================================================
 |--- en_US.ISO8859-1/books/porters-handbook/book.xml    (revision 42890)
 |+++ en_US.ISO8859-1/books/porters-handbook/book.xml    (working copy)
 --------------------------
 Patching file en_US.ISO8859-1/books/porters-handbook/book.xml using Plan A...
 Hunk #1 failed at 6539.
 Hunk #2 failed at 6639.
 Hunk #3 failed at 6656.
 Hunk #4 failed at 6826.
 Hunk #5 succeeded at 6894 (offset -1 lines).
 4 out of 5 hunks failed--saving rejects to
 en_US.ISO8859-1/books/porters-handbook/book.xml.rej
 Hmm...  The next patch looks like a unified diff to me...
 The text leading up to this was:
 --------------------------
 |Index: en_US.ISO8859-1/books/porters-handbook/uses.xml
 |===================================================================
 |--- en_US.ISO8859-1/books/porters-handbook/uses.xml    (revision 42890)
 |+++ en_US.ISO8859-1/books/porters-handbook/uses.xml    (working copy)
 --------------------------
 Patching file en_US.ISO8859-1/books/porters-handbook/uses.xml using Plan A...
 Hunk #1 succeeded at 221 (offset 42 lines).
 done
 
 
 -- 
 Eitan Adler
Responsible-Changed-From-To: freebsd-doc->rene 
Responsible-Changed-By: rene 
Responsible-Changed-When: Fri Nov 22 16:07:43 UTC 2013 
Responsible-Changed-Why:  
Take 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182833 
State-Changed-From-To: open->closed 
State-Changed-By: rene 
State-Changed-When: Fri Nov 22 17:17:27 UTC 2013 
State-Changed-Why:  
Committed with small modifications, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182833 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/182833: commit references a PR
Date: Fri, 22 Nov 2013 17:17:18 +0000 (UTC)

 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
  
  	      <row>
  		<entry><varname>CMAKE_ENV</varname></entry>
 -		<entry>Environment variables to be set for
 +		<entry>Environment variables to be set for the
  		  <command>cmake</command> binary.  Default is
  		  <literal>&dollar;{CONFIGURE_ENV}</literal>.</entry>
  	      </row>
 @@ -6544,15 +6544,6 @@ USE_XORG=	x11 xpm</programlisting>
  	  <tgroup cols="2">
  	    <tbody>
  	      <row>
 -		<entry><varname>USE_QT_VER</varname></entry>
 -		<entry>The port uses the Qt toolkit.  The only
 -		  possible value is <literal>3</literal>.
 -		  Appropriate parameters are passed to
 -		  <command>configure</command> script and
 -		  <command>make</command>.</entry>
 -	      </row>
 -
 -	      <row>
  		<entry><varname>USE_QT4</varname></entry>
  		<entry>Specify tool and library dependencies for ports
  		  that use Qt 4.  See
 @@ -6653,19 +6644,7 @@ USE_XORG=	x11 xpm</programlisting>
  	  </tgroup>
  	</table>
  
 -	<para>When <varname>USE_QT_VER</varname> is set to
 -	  <literal>3</literal>, some useful settings are passed to the
 -	  <command>configure</command> script:</para>
 -
 -	<programlisting>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}</programlisting>
 -
 -	<para>If <varname>USE_QT4</varname> is set, the following
 +	<para>When <varname>USE_QT4</varname> is set, the following
  	  settings are deployed:</para>
  
  	<programlisting>CONFIGURE_ARGS+=	--with-qt-includes=${QT_INCDIR} \
 @@ -6682,7 +6661,7 @@ PLIST_SUB+=	QT_INCDIR_REL=${QT_INCDIR_RE
        </sect2>
  
        <sect2 xml:id="qt4-components">
 -	<title>Component Selection (Qt 4.x Only)</title>
 +	<title>Component Selection</title>
  
  	<para>Individual Qt 4 tool and library dependencies must be
  	  specified in the <varname>USE_QT4</varname> variable.  Every
 @@ -6852,28 +6831,59 @@ PLIST_SUB+=	QT_INCDIR_REL=${QT_INCDIR_RE
  	</example>
        </sect2>
  
 -      <sect2 xml:id="qt-additional">
 -	<title>Additional Considerations</title>
 +      <sect2 xml:id="using-qmake">
 +	<title>Using <command>qmake</command></title>
 +
 +	<table frame="none">
 +	  <title>Variables for Ports That Use
 +	    <command>qmake</command></title>
 +
 +	  <tgroup cols="2">
 +	    <thead>
 +	      <row>
 +		<entry>Variable</entry>
 +		<entry>Means</entry>
 +	      </row>
 +	    </thead>
 +
 +	    <tbody>
 +	      <row>
 +		<entry><varname>QMAKE_ARGS</varname></entry>
 +		<entry>Port specific <application>QMake</application>
 +		  flags to be passed to the <command>qmake</command>
 +		  binary.</entry>
 +	      </row>
 +
 +	      <row>
 +		<entry><varname>QMAKE_ENV</varname></entry>
 +		<entry>Environment variables to be set for the
 +		  <command>qmake</command> binary.   The default is
 +		  <literal>&dollar;{CONFIGURE_ENV}</literal>.</entry>
 +	      </row>
 +
 +	      <row>
 +		<entry><varname>QMAKE_PRO</varname></entry>
 +		<entry>Name of the project <filename>.pro</filename> file.
 +		  The default is empty (using autodetection).</entry>
 +	      </row>
 +	    </tbody>
 +	  </tgroup>
 +	</table>
  
  	<para>If the application does not provide a
 -	  <filename>configure</filename> file but a
 +	  <filename>configure</filename> script but a
  	  <filename>.pro</filename> file, you can use the
  	  following:</para>
  
 -	<programlisting>HAS_CONFIGURE=	yes
 +	<programlisting>USES=	qmake
 +USE_QT4=	qmake_build</programlisting>
  
 -do-configure:
 -	@cd ${WRKSRC} &amp;&amp; ${SETENV} ${CONFIGURE_ENV} \
 -		${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} texmaker.pro</programlisting>
 -
 -	<para>Note the similarity to the <command>qmake</command> line
 -	  from the provided <filename>BUILD.sh</filename> script.
 -	  Passing <varname>CONFIGURE_ENV</varname> ensures
 -	  <command>qmake</command> will see the
 -	  <varname>QMAKESPEC</varname> variable, without which it
 -	  cannot work.  <command>qmake</command> generates standard
 -	  Makefiles, so it is not necessary to write our own
 -	  <buildtarget>build</buildtarget> target.</para>
 +	<para><literal>USES=qmake</literal> instructs the port to
 +	  use <command>qmake</command> for configuring.
 +	  Note that <literal>USES=qmake</literal> does not imply a
 +	  dependency on Qt 4 <command>qmake</command>, thus
 +	  <literal>USE_QT4</literal> has to be populated with the
 +	  <literal>qmake_build</literal> component.</para>
  
  	<para>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:</para>
  
 -	    <programlisting>${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} INCLUDEPATH+=${LOCALBASE}/include \
 -	LIBS+=-L${LOCALBASE}/lib sillyapp.pro</programlisting>
 +	    <programlisting>QMAKE_ARGS+= INCLUDEPATH+=${LOCALBASE}/include \
 +	LIBS+=-L${LOCALBASE}/lib</programlisting>
  	  </listitem>
  
  	  <listitem>
 
 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 @@
  </row>
  
  <row>
 +  <entry><literal>qmake</literal></entry>
 +  <entry>(none), <literal>norecursive</literal></entry>
 +
 +  <entry>The port will use <application>QMake</application> for
 +    configuring.  For more information see
 +    <xref linkend="using-qmake"/>.</entry>
 +</row>
 +
 +<row>
    <entry><literal>readline</literal></entry>
    <entry>(none), port</entry>
    <entry>Implies that the port uses
 _______________________________________________
 svn-doc-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-doc-all
 To unsubscribe, send any mail to "svn-doc-all-unsubscribe@freebsd.org"
 
>Unformatted:
