svn commit: r42464 - head/en_US.ISO8859-1/books/porters-handbook

Sun Jul 28 22:49:28 UTC 2013

Author: rene
Date: Sun Jul 28 22:49:27 2013
New Revision: 42464
URL: http://svnweb.freebsd.org/changeset/doc/42464

Log:
  - Remove section about KDE3 variables.
  - Convert USE_GMAKE and USE_IMAKE to USES=gmake and USES=imake
  
  PR:		docs/180912
  Submitted by:	jgh
  Approved by:	gjb (mentor)

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	Sun Jul 28 16:50:21 2013	(r42463)
+++ head/en_US.ISO8859-1/books/porters-handbook/book.xml	Sun Jul 28 22:49:27 2013	(r42464)
@@ -559,7 +559,7 @@ PLIST_DIRS=	lib/X11/oneko</programlistin
 	  <para>The <maketarget>build</maketarget> target is run.
 	    This is responsible for descending into the port's private
 	    working directory (<makevar>WRKSRC</makevar>) and building
-	    it.  If <makevar>USE_GMAKE</makevar> is set, GNU
+	    it.  If <makevar>USES= gmake</makevar> is set, GNU
 	    <command>make</command> will be used, otherwise the system
 	    <command>make</command> will be used.</para>
 	</step>
@@ -3683,7 +3683,7 @@ ALWAYS_KEEP_DISTFILES=	yes
 	  variables, which are processed by
 	  <filename>ports/Mk/bsd.*.mk</filename> to augment initial
 	  build dependencies.  For example,
-	  <literal>USE_GMAKE=yes</literal> adds <filename
+	  <literal>USES= gmake</literal> adds <filename
 	    role="package">devel/gmake</filename> to
 	  <makevar>BUILD_DEPENDS</makevar>.  To prevent such
 	  additional dependencies from polluting
@@ -5299,7 +5299,7 @@ IGNORE=	may not be redistributed because
 	  <command>imake</command></title>
 
 	<para>If your port uses <application>GNU make</application>,
-	  set <literal>USE_GMAKE=yes</literal>.</para>
+	  set <literal>USES= gmake</literal>.</para>
 
 	<table frame="none">
 	  <title>Variables for Ports Related to
@@ -5315,7 +5315,7 @@ IGNORE=	may not be redistributed because
 
 	    <tbody>
 	      <row>
-		<entry><makevar>USE_GMAKE</makevar></entry>
+		<entry><makevar>USES= gmake</makevar></entry>
 		<entry>The port requires <command>gmake</command> to
 		  build.</entry>
 	      </row>
@@ -5333,7 +5333,7 @@ IGNORE=	may not be redistributed because
 	  <filename>Makefile</filename> files from
 	  <filename>Imakefile</filename> files using
 	  <application>imake</application>, then set
-	  <literal>USE_IMAKE=yes</literal>.  This will cause the
+	  <literal>USES= imake</literal>.  This will cause the
 	  configure stage to automatically do an <command>xmkmf
 	    -a</command>.  If the <option>-a</option> flag is a
 	  problem for your port, set <literal>XMKMF=xmkmf</literal>.
@@ -6076,7 +6076,7 @@ USE_GL=		glu</programlisting>
 	  <tgroup cols="2">
 	    <tbody>
 	      <row>
-		<entry><makevar>USE_IMAKE</makevar></entry>
+		<entry><makevar>USES= imake</makevar></entry>
 		<entry>The port uses <command>imake</command>.</entry>
 	      </row>
 
@@ -6742,36 +6742,6 @@ do-configure:
     <sect1 id="using-kde">
       <title>Using KDE</title>
 
-      <sect2 id="kde-variables">
-	<title>Variable Definitions (KDE 3.x Only)</title>
-
-	<table frame="none">
-	  <title>Variables for Ports That Use KDE 3.x</title>
-
-	  <tgroup cols="2">
-	    <tbody>
-	      <row>
-		<entry><makevar>USE_KDELIBS_VER</makevar></entry>
-		<entry>The port uses KDE libraries.  It specifies the
-		  major version of KDE to use and implies
-		  <makevar>USE_QT_VER</makevar> of the appropriate
-		  version.  The only possible value is
-		  <literal>3</literal>.</entry>
-	      </row>
-
-	      <row>
-		<entry><makevar>USE_KDEBASE_VER</makevar></entry>
-		<entry>The port uses KDE base.  It specifies the major
-		  version of KDE to use and implies
-		  <makevar>USE_QT_VER</makevar> of the appropriate
-		  version.  The only possible value is
-		  <literal>3</literal>.</entry>
-	      </row>
-	    </tbody>
-	  </tgroup>
-	</table>
-      </sect2>
-
       <sect2 id="kde4-variables">
 	<title>KDE 4 Variable Definitions</title>
 
@@ -6935,8 +6905,8 @@ do-configure:
 
 	<para>KDE 4.x ports are installed into
 	  <makevar>KDE4_PREFIX</makevar>, which is
-	  <filename>/usr/local/kde4</filename> currently, to avoid
-	  conflicts with KDE 3.x ports.  This is achieved by
+	  <filename>/usr/local/kde4</filename> currently.
+	  This is achieved by
 	  specifying the <literal>kdeprefix</literal> component, which
 	  overrides the default <makevar>PREFIX</makevar>.  The ports
 	  however respect any <makevar>PREFIX</makevar> set via
@@ -7270,7 +7240,7 @@ USE_QT4=	moc_build qmake_build rcc_build
 	  default one will be set that simply runs Ant according to
 	  <makevar>MAKE_ENV</makevar>, <makevar>MAKE_ARGS</makevar>
 	  and <makevar>ALL_TARGET</makevar>.  This is similar to the
-	  <makevar>USE_GMAKE</makevar> mechanism, which is documented
+	  <makevar>USES= gmake</makevar> mechanism, which is documented
 	  in <xref linkend="building"/>.</para>
       </sect2>
 
@@ -16844,9 +16814,9 @@ PATCH_DIST_STRIP=	-p1
 [If it requires a "configure" script generated by GNU autoconf to be run]
 GNU_CONFIGURE=	yes
 [If it requires GNU make, not /usr/bin/make, to build...]
-USE_GMAKE=	yes
+USES= gmake
 [If it is an X application and requires "xmkmf -a" to be run...]
-USE_IMAKE=	yes
+USES= imake
 [et cetera.]
 
 [non-standard variables to be used in the rules below]

Modified: head/en_US.ISO8859-1/books/porters-handbook/uses.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/uses.xml	Sun Jul 28 16:50:21 2013	(r42463)
+++ head/en_US.ISO8859-1/books/porters-handbook/uses.xml	Sun Jul 28 22:49:27 2013	(r42464)
@@ -97,6 +97,14 @@
 </row>
 
 <row>
+  <entry><literal>gmake</literal></entry>
+  <entry>(none)</entry>
+  <entry>Implies that the port uses <filename
+      role="package">devel/gmake</filename> as build-time
+    dependency.</entry>
+</row>
+
+<row>
   <entry><literal>iconv</literal></entry>
   <entry>(none)</entry>
   <entry>Implies that the port uses <filename
@@ -105,6 +113,14 @@
 </row>
 
 <row>
+  <entry><literal>imake</literal></entry>
+  <entry>(none)</entry>
+  <entry>Implies that the port uses <filename
+      role="package">devel/imake</filename> as build-time
+    dependency.</entry>
+</row>
+
+<row>
   <entry><literal>ncurses</literal></entry>
   <entry>(none), <literal>base</literal>,
     <literal>port</literal></entry>
