Date: Sun, 28 Jul 2013 21:32:07 GMT From: Jason Helfman <jgh@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Subject: docs/180912: [patch][porters-handbook] document gmake/imake in Uses, trim kde3 Message-ID: <201307282132.r6SLW71i080887@freefall.freebsd.org> Resent-Message-ID: <201307282140.r6SLe0er081030@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 180912
>Category: docs
>Synopsis: [patch][porters-handbook] document gmake/imake in Uses, trim kde3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-doc
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Jul 28 21:40:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Jason Helfman
>Release: FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD freefall.freebsd.org 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r253323: Sat Jul 13 18:26:21 UTC 2013 peter@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL amd64
>Description:
update uses to include gmake and imake and trim kde3 ( no longer in tree )
>How-To-Repeat:
>Fix:
Index: en_US.ISO8859-1/books/porters-handbook/uses.xml
===================================================================
--- en_US.ISO8859-1/books/porters-handbook/uses.xml (revision 42463)
+++ en_US.ISO8859-1/books/porters-handbook/uses.xml (working copy)
@@ -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>
Index: en_US.ISO8859-1/books/porters-handbook/book.xml
===================================================================
--- en_US.ISO8859-1/books/porters-handbook/book.xml (revision 42463)
+++ en_US.ISO8859-1/books/porters-handbook/book.xml (working copy)
@@ -559,7 +559,7 @@
<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 @@
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 @@
<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 @@
<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 @@
<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 @@
<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 @@
<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,10 +6905,10 @@
<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
- specifying the <literal>kdeprefix</literal> component, which
- overrides the default <makevar>PREFIX</makevar>. The ports
+ <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
<envar>MAKEFLAGS</envar> environment variable and/or
<command>make</command> arguments.</para>
@@ -7270,7 +7240,7 @@
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 @@
[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]
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307282132.r6SLW71i080887>