diff --git a/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml b/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
index 8c7fc8e9ac..165a35174d 100644
--- a/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
+++ b/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
@@ -1048,19 +1048,19 @@ PLIST_SUB+= NLS="@comment "
are:
bigreqsproto compositeproto damageproto dmx
- dmxproto dri2proto evieproto fixesproto fontcacheproto
- fontenc fontsproto fontutil glproto ice inputproto kbproto
- libfs oldx pciaccess pixman printproto randrproto
- recordproto renderproto resourceproto scrnsaverproto sm
- trapproto videoproto x11 xau xaw xaw6 xaw7 xbitmaps
- xcmiscproto xcomposite xcursor xdamage xdmcp xevie xext
- xextproto xf86bigfontproto xf86dgaproto xf86driproto
- xf86miscproto xf86rushproto xf86vidmodeproto xfixes xfont
- xfontcache xft xi xinerama xineramaproto xkbfile xkbui
- xmu xmuu xorg-server xp xpm xprintapputil xprintutil
- xproto xproxymngproto xrandr xrender xres xscrnsaver xt
- xtrans xtrap xtst xv xvmc xxf86dga xxf86misc
- xxf86vm.
+ dmxproto dri2proto dri3proto evieproto fixesproto
+ fontcacheproto fontenc fontsproto fontutil glproto ice
+ inputproto kbproto libfs oldx pciaccess pixman presentproto
+ printproto randrproto recordproto renderproto resourceproto
+ scrnsaverproto sm trapproto videoproto x11 xau xaw xaw6 xaw7
+ xbitmaps xcb xcmiscproto xcomposite xcursor xdamage xdmcp
+ xevie xext xextproto xf86bigfontproto xf86dgaproto
+ xf86driproto xf86miscproto xf86rushproto xf86vidmodeproto
+ xfixes xfont xfontcache xft xi xinerama xineramaproto
+ xkbfile xkbui xmu xmuu xorg-macros xorg-server xp xpm
+ xprintapputil xprintutil xproto xproxymngproto xrandr
+ xrender xres xscrnsaver xshmfence xt xtrans xtrap xtst xv
+ xvmc xxf86dga xxf86misc xxf86vm.
Always up-to-date list can be found in
/usr/ports/Mk/bsd.xorg.mk.
@@ -1069,7 +1069,7 @@ PLIST_SUB+= NLS="@comment "
implementation. You can specify a dependency on various
components of this project with USE_GL
variable. Valid options are:
- glut, glu, glw, glew, gl and
+ egl, gl, glesv2, glew, glu, glut, glw and
linux. For backwards compatibility, the
value of yes maps to
glu.
@@ -1120,10 +1120,10 @@ USE_XORG= x11 xpm
Users can choose
x11-toolkits/lesstif
instead by setting WANT_LESSTIF
- variable.
+ variable in their make.conf.
The MOTIFLIB variable will be set by
- bsd.port.mk to reference the
+ motif.mk to reference the
appropriate Motif library. Please patch the source of your
port to use ${MOTIFLIB} wherever
the Motif library is referenced in the original
@@ -1150,7 +1150,7 @@ USE_XORG= x11 xpm
Note that MOTIFLIB (usually) expands
- to -L/usr/local/lib -lXm or
+ to -L/usr/local/lib -lXm -lXp or
/usr/local/lib/libXm.a, so there is no
need to add -L or -l
in front.
@@ -1172,7 +1172,9 @@ USE_XORG= x11 xpm
that operate headless. When the following variable is used,
the build infrastructure will start the virtual framebuffer
X server. The working DISPLAY is then passed
- to the build.
+ to the build. See USES=display
+ for the possible arguments.
USES= display
@@ -2689,9 +2691,6 @@ _DOCSDIR= .
the value of the PYTHONPREFIX_SITELIBDIR
variable to make it relative to
PREFIX.
-
- Python 2.7 or newer is required for this. It does
- not work with Python 2.6.
@@ -2700,96 +2699,75 @@ _DOCSDIR= .
The Ports Collection supports parallel installation of
multiple Tcl/Tk versions. Ports
should try to support at least the default
- Tcl/Tk version and higher with the
- USE_TCL and USE_TK
- variables. It is possible to specify the desired version of
- tcl with the
- WITH_TCL_VER variable.
+ Tcl/Tk version and higher with
+ USES=tcl. It is possible to specify the
+ desired version of tcl by appending
+ :xx, e.g.:
+ USES=tcl:85.
- The Most Useful Variables for Ports That Use
+ The Most Useful Read-Only Variables for Ports That Use
Tcl/Tk
- USE_TCL
- The port depends on the
- Tcl library (not the
- shell). Minimal required version can be specified
- with values such as 84+. Individual unsupported
- versions can be specified with the
- INVALID_TCL_VER variable.
+ TCL_VER
+ chosen major.minor version of
+ Tcl
- USE_TCL_BUILD
- The port needs Tcl
- only during the build time.
+ TCLSH
+ full path of the Tcl
+ interpreter
- USE_TCL_WRAPPER
- Ports that require the
- Tcl shell and do not
- require a specific tclsh version
- should use this new variable. The
- tclsh wrapper is installed on the
- system. The user can specify the desired
- tcl shell to use.
+ TCL_LIBDIR
+ path of the Tcl
+ libraries
- WITH_TCL_VER
- User-defined variable that sets the desired
- Tcl version.
+ TCL_INCLUDEDIR
+ path of the Tcl C
+ header files
- UNIQUENAME_WITH_TCL_VER
- Like WITH_TCL_VER, but
- per-port.
+ TK_VER
+ chosen major.minor version of
+ Tk
- USE_TCL_THREADS
- Require a threaded build of
- Tcl/Tk.
+ WISH
+ full path of the Tk
+ interpreter
- USE_TK
- The port depends on the
- Tk library (not the wish
- shell). Implies USE_TCL with the
- same value. For more information see the description
- of USE_TCL variable.
+ TK_LIBDIR
+ path of the Tk
+ libraries
- USE_TK_BUILD
- Analog to the USE_TCL_BUILD
- variable.
-
-
-
- USE_TK_WRAPPER
- Analog to the USE_TCL_WRAPPER
- variable.
-
-
-
- WITH_TK_VER
- Analog to the WITH_TCL_VER
- variable and implies WITH_TCL_VER
- of the same value.
+ TK_INCLUDEDIR
+ path of the Tk C header
+ files
- A complete list of available variables can be found in
- /usr/ports/Mk/bsd.tcl.mk.
+ See the USES=tcl and
+ USES=tk of
+ for a full description of those
+ variables. A complete list of those variables is available in
+ /usr/ports/Mk/Uses/tcl.mk.
@@ -2865,40 +2843,40 @@ _DOCSDIR= .
Used as a PKGNAMEPREFIX to
distinguish packages for different Ruby
versions.
- ruby18-
+ ruby19-RUBY_VERSIONFull version of Ruby in the form of
- x.y.z.
- 1.8.2
+ x.y.z[.p].
+ 1.9.3.484RUBY_SITELIBDIRArchitecture independent libraries installation
path.
- /usr/local/lib/ruby/site_ruby/1.8
+ /usr/local/lib/ruby/site_ruby/1.9RUBY_SITEARCHLIBDIRArchitecture dependent libraries installation
path.
- /usr/local/lib/ruby/site_ruby/1.8/amd64-freebsd6
+ /usr/local/lib/ruby/site_ruby/1.9/amd64-freebsd10RUBY_MODDOCDIRModule documentation installation path.
- /usr/local/share/doc/ruby18/patsy
+ /usr/local/share/doc/ruby19/patsyRUBY_MODEXAMPLESDIRModule examples installation path.
- /usr/local/share/examples/ruby18/patsy
+ /usr/local/share/examples/ruby19/patsy
@@ -4751,7 +4729,10 @@ run_rc_command "$1"
perl, python, or
ruby, make certain that
command_interpreter is set
- appropriately. Otherwise,
+ appropriately, e.g., for Perl,
+ by adding PERL=${PERL} to
+ SUB_LIST and using
+ %%PERL%%. Otherwise,
&prompt.root; service name stop