[pkgsrc/trunk]: pkgsrc/mk Fixed the comments a little bit.

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/764573cb5037
branches:  trunk
changeset: 533802:764573cb5037
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Mon Oct 01 07:21:44 2007 +0000

description:
Fixed the comments a little bit.

Hey Joerg, since you made the non-modular Xorg obsolete, you could have
at least changed the comments in this file, reflecting the change to
modular Xorg.

Now, please document here how these files are really meant to be used,
since you know it better than me.

diffstat:

 mk/x11.buildlink3.mk |   8 ++++----
 mk/x11.version.mk    |  45 ++++++++++++++++++++++++++-------------------
 2 files changed, 30 insertions(+), 23 deletions(-)

diffs (81 lines):

diff -r e452849ab49f -r 764573cb5037 mk/x11.buildlink3.mk
--- a/mk/x11.buildlink3.mk      Mon Oct 01 06:46:37 2007 +0000
+++ b/mk/x11.buildlink3.mk      Mon Oct 01 07:21:44 2007 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: x11.buildlink3.mk,v 1.8 2007/08/17 20:27:30 joerg Exp $
+# $NetBSD: x11.buildlink3.mk,v 1.9 2007/10/01 07:21:44 rillig Exp $
 #
-# This Makefile fragment is meant to be included by packages that
-# require an X11 distribution.  x11.buildlink3.mk will include the
-# buildlink3.mk file from the appropriate X11 distribution.
+# This file should only be included from the buildlink3.mk files from
+# the modular Xorg packages and only in the case that the native X11
+# distribution should be used.
 #
 
 X11_BUILDLINK3_MK:=    ${X11_BUILDLINK3_MK}+
diff -r e452849ab49f -r 764573cb5037 mk/x11.version.mk
--- a/mk/x11.version.mk Mon Oct 01 06:46:37 2007 +0000
+++ b/mk/x11.version.mk Mon Oct 01 07:21:44 2007 +0000
@@ -1,27 +1,37 @@
-# $NetBSD: x11.version.mk,v 1.9 2007/09/30 12:25:48 rillig Exp $
+# $NetBSD: x11.version.mk,v 1.10 2007/10/01 07:21:44 rillig Exp $
 #
-# The following variables may be set in /etc/mk.conf:
+# This file must not be included directly.
+#
+# XXX: How is it used then?
 #
-#    X11_TYPE sets the X11 distribution used when building X11 packages.
-#      Possible values are "xorg" (use x11/xorg-libs), or "native"
-#      (use the native X11 distribution).
-#      The default X11_TYPE is "native" unless defined for a specific
-#      operating system in mk/platform/${OPSYS}.mk.
+# User-settable variables:
+#
+# X11_TYPE
+#      The X11 distribution that is used for building X11 packages.
+#
+#      Possible:
+#      * native: use the native X11 distribution
+#      * modular: use modular Xorg from pkgsrc
 #
-# The following variables are provided by this file:
+#      Default: native, unless defined for a specific operating system
+#      in mk/platform/${OPSYS}.mk.
+#
+# Variables provided by this file:
 #
-#    X11_PKGSRCDIR.${X11_TYPE} sets the pkgsrc directory location for
-#      the package which manages/represents ${X11_TYPE}.  It can be
-#      used to find the relevant buildlink3.mk or builtin.mk files.
+# X11_PKGSRCDIR.${X11_TYPE}
+#      The directory where the buildlink3.mk or builtin.mk files can
+#      be found for the X11 distribution.
 #
-#    BUILTIN_X11_TYPE.${X11_TYPE} is the X11_TYPE of the native X11
-#      distribution detected on the system.
+# BUILTIN_X11_TYPE.${X11_TYPE}
+#      The X11_TYPE of the native X11 distribution detected on the
+#      system.
 #
-# The following variables may be defined by this file.  These variables
+# Variables that _may_ be defined by this file.  These variables
 # should be checked to exist before they are used:
 #
-#    BUILTIN_X11_VERSION.${X11_TYPE} is the version number of the native
-#      X11 distribution detected on the system.
+# BUILTIN_X11_VERSION.${X11_TYPE}
+#      The version number of the native X11 distribution detected on
+#      the system.
 #
 
 _VARGROUPS+=   x11
@@ -31,7 +41,4 @@
 
 X11_PKGSRCDIR.native=  ../../pkgtools/x11-links
 
-# Makefiles that include this file can access the version of the X11
-# distribution as ${BUILTIN_X11_VERSION.${X11_TYPE}}.
-#
 .include "${X11_PKGSRCDIR.${X11_TYPE}}/version.mk"