Index: head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
===================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
+++ head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
@@ -635,9 +635,7 @@
Using cmake
For ports that use CMake,
- define USES= cmake, or
- USES= cmake:outsource to build in a
- separate directory (see below).
+ define USES= cmake.
Variables for Ports That Use
@@ -756,9 +754,10 @@
Most CMake-based projects
support an out-of-source method of building. The
- out-of-source build for a port can be requested by using the
- :outsource suffix. When enabled,
- CONFIGURE_WRKSRC,
+ out-of-source build for a port is the default setting.
+ An in-source build can be requested by using the
+ :insource suffix. With out-of-source
+ builds, CONFIGURE_WRKSRC,
BUILD_WRKSRC and
INSTALL_WRKSRC will be set to
${WRKDIR}/.build and this
@@ -776,7 +775,7 @@
in the top directory, or if only a subset of the project
is intended to be built by the port.
- USES= cmake:outsource
+ USES= cmake
CMAKE_SOURCE_PATH= ${WRKSRC}/subproject
@@ -3214,7 +3213,7 @@
USE_KDE Example
This is a simple example for a KDE 4 port.
- USES= cmake:outsource instructs the
+ USES= cmake instructs the
port to utilize CMake, a
configuration tool widely used by KDE 4 projects (see
for detailed usage).
@@ -3228,7 +3227,7 @@
Qt 4 components, specify them in
USE_QT.
- USES= cmake:outsource kde:4 qt:4
+ USES= cmake kde:4 qt:4
USE_KDE= kdelibs kdeprefix automoc4
USE_QT= moc_build qmake_build rcc_build uic_build
@@ -3287,7 +3286,7 @@
LXQt libraries. Required LXQt components and
other dependencies can be determined from the
configure log.
- USES= cmake:outsource lxqt qt:5 tar:xz
+ USES= cmake lxqt qt:5 tar:xz
USE_QT= core dbus widgets buildtools_build qmake_build
USE_LXQT= buildtools libfmqt
Index: head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
===================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
+++ head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
@@ -263,15 +263,31 @@
cmake
- Possible arguments: (none), outsource,
- run
+ Possible arguments: (none), insource,
+ noninja, run
Uses CMake for configuring and
- building. With the outsource argument, an
- out-of-source build will be performed. With the
- run argument, a run-time dependency is
- registered. For more information see .
+ building.
+
+ By default an out-of-source build is performed, leaving the
+ sources in WRKSRC free from build artifacts.
+ With the insource argument, an in-source
+ build will be performed instead. Setting it should be the
+ exception when a regular out-of-source build does not
+ work.
+
+ By default Ninja is used for
+ the build. In some cases this does not work correctly. With
+ the noninja argument, the build will
+ fallback to using regular make for builds.
+ It should only be used if a
+ Ninja-based build does not
+ work.
+
+ With the run argument, a run dependency
+ is registered in addition to a build dependency.
+
+ For more information see .