Cope with USE_X11 removal from ports infrastructure.

2 files changed, 9 insertions, 13 deletions

diff --git a/share/man/man5/bsd.port.mk.5 b/share/man/man5/bsd.port.mk.5
index 024b27fa4ba..2a7e5448236 100644
--- a/share/man/man5/bsd.port.mk.5
+++ b/share/man/man5/bsd.port.mk.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bsd.port.mk.5,v 1.266 2010/10/22 15:53:39 espie Exp $
+.\" $OpenBSD: bsd.port.mk.5,v 1.267 2010/10/24 20:43:31 ajacoutot Exp $
 .\"
 .\" Copyright (c) 2000-2008 Marc Espie
 .\"
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: October 22 2010 $
+.Dd $Mdocdate: October 24 2010 $
 .Dt BSD.PORT.MK 5
 .Os
 .Sh NAME
@@ -1233,7 +1233,6 @@ See also
 .Ev NOT_FOR_ARCHS ,
 .Ev NO_IGNORE ,
 .Ev ONLY_FOR_ARCHS ,
-.Ev USE_X11 .
 .It Ev IGNORE_IS_FATAL
 If set to
 .Sq Yes ,
@@ -2022,10 +2021,6 @@ User settings.
 Set to
 .Sq Yes
 to protect port building with systrace.
-.It Ev USE_X11
-Set to
-.Sq Yes
-if port requires X11 to work.
 .It Ev VMEM_WARNING
 Set to
 .Sq Yes
@@ -2497,6 +2492,8 @@ and
 Use
 .Ev CONFIGURE_STYLE
 instead.
+.It Ev USE_X11
+Presence of ${X11BASE} is now enforced by default for building ports.
 .It Ev USE_ZIP
 The framework will automatically detect the presence of
 .Pa .zip
diff --git a/share/man/man5/port-modules.5 b/share/man/man5/port-modules.5
index 31350803989..d9f73b753cd 100644
--- a/share/man/man5/port-modules.5
+++ b/share/man/man5/port-modules.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: port-modules.5,v 1.76 2010/10/24 15:54:58 sthen Exp $
+.\"	$OpenBSD: port-modules.5,v 1.77 2010/10/24 20:43:31 ajacoutot Exp $
 .\"
 .\" Copyright (c) 2008 Marc Espie
 .\"
@@ -317,7 +317,6 @@ value:
 .Ev NO_SHARED_LIBS ,
 .Ev PKGPATH ,
 .Ev PORTSDIR ,
-.Ev USE_X11 ,
 .Ev X11BASE .
 Note that this is only relevant for tests.
 It is perfectly okay to define variables or targets that depend on the
@@ -556,7 +555,7 @@ If both GNOME_PROJECT and GNOME_VERSION are set, this module defines
 DISTNAME, VERSION, MASTER_SITES, adds x11/gnome to CATEGORIES and
 EXTRACT_SUFX will default to .tar.bz2 if unset.
 Unconditionally sets DESKTOP_FILES, MODGNOME_HELP_FILES,
-MODGNOME_BUILD_DEPENDS, MODGNOME_RUN_DEPENDS, USE_GMAKE and USE_X11.
+MODGNOME_BUILD_DEPENDS, MODGNOME_RUN_DEPENDS and USE_GMAKE.
 If CONFIGURE_STYLE is set to either gnu or autoconf
 --disable-silent-rules and --disable-shave
 are appended to CONFIGURE_ARGS.
@@ -585,12 +584,12 @@ and MODTK_CONFIG.
 MODTK_VERSION is the default version used by all Tk ports and
 may be overridden.
 Automatically adds the lang/tcl module, provides a default
-MODTCL_VERSION to match MODTK_VERSION, and affects CATEGORIES,
-SUBST_VARS, and USE_X11.
+MODTCL_VERSION to match MODTK_VERSION, and affects CATEGORIES
+and SUBST_VARS.
 Note the MODTCL_WISH_ADJ shell fragment in the lang/tcl module.
 .It x11/xfce4
 Sets DIST_SUBDIR, EXTRACT_SUFX, CONFIGURE_STYLE,
-CONFIGURE_ENV, USE_X11 and USE_GMAKE.
+CONFIGURE_ENV and USE_GMAKE.
 If DESKTOP_FILES is set to yes, it adds
 .Pa devel/desktop-file-utils
 to RUN_DEPENDS.