[pkgsrc/trunk]: pkgsrc/mk Replaced a .sinclude with .include to catch errors ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/57dd23a6f9f7
branches:  trunk
changeset: 520713:57dd23a6f9f7
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Oct 26 17:08:08 2006 +0000

description:
Replaced a .sinclude with .include to catch errors when X11_TYPE is not
one of "native" or "xorg". Failing with an error message in the right
file is better than failing somewhere else with a completely obscure
error message.

diffstat:

 mk/x11.buildlink3.mk |  4 ++--
 mk/x11.builtin.mk    |  4 ++--
 mk/x11.version.mk    |  4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diffs (44 lines):

diff -r 0d726db45f4b -r 57dd23a6f9f7 mk/x11.buildlink3.mk
--- a/mk/x11.buildlink3.mk      Thu Oct 26 15:00:41 2006 +0000
+++ b/mk/x11.buildlink3.mk      Thu Oct 26 17:08:08 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: x11.buildlink3.mk,v 1.4 2005/08/01 00:37:21 rillig Exp $
+# $NetBSD: x11.buildlink3.mk,v 1.5 2006/10/26 17:08:08 rillig Exp $
 #
 # This Makefile fragment is meant to be included by packages that
 # require an X11 distribution.  x11.buildlink3.mk will include the
@@ -23,4 +23,4 @@
 X11_LDFLAGS+=  -L${X11BASE}/lib${LIBABISUFFIX}
 .endif # X11_BUILDLINK3_MK
 
-.sinclude "${X11_PKGSRCDIR.${X11_TYPE}}/buildlink3.mk"
+.include "${X11_PKGSRCDIR.${X11_TYPE}}/buildlink3.mk"
diff -r 0d726db45f4b -r 57dd23a6f9f7 mk/x11.builtin.mk
--- a/mk/x11.builtin.mk Thu Oct 26 15:00:41 2006 +0000
+++ b/mk/x11.builtin.mk Thu Oct 26 17:08:08 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: x11.builtin.mk,v 1.1 2005/06/01 18:03:06 jlam Exp $
+# $NetBSD: x11.builtin.mk,v 1.2 2006/10/26 17:08:08 rillig Exp $
 #
 # x11.builtin.mk will include the builtin.mk file from the appropriate
 # X11 distribution.
 #
 
 .include "../../mk/x11.version.mk"
-.sinclude "${X11_PKGSRCDIR.${X11_TYPE}}/builtin.mk"
+.include "${X11_PKGSRCDIR.${X11_TYPE}}/builtin.mk"
diff -r 0d726db45f4b -r 57dd23a6f9f7 mk/x11.version.mk
--- a/mk/x11.version.mk Thu Oct 26 15:00:41 2006 +0000
+++ b/mk/x11.version.mk Thu Oct 26 17:08:08 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: x11.version.mk,v 1.5 2006/09/27 15:18:15 joerg Exp $
+# $NetBSD: x11.version.mk,v 1.6 2006/10/26 17:08:08 rillig Exp $
 #
 # The following variables may be set in /etc/mk.conf:
 #
@@ -30,4 +30,4 @@
 # Makefiles that include this file can access the version of the X11
 # distribution as ${BUILTIN_X11_VERSION.${X11_TYPE}}.
 #
-.sinclude "${X11_PKGSRCDIR.${X11_TYPE}}/version.mk"
+.include "${X11_PKGSRCDIR.${X11_TYPE}}/version.mk"