[pkgsrc/trunk]: pkgsrc Make sure X11_TYPE=XFree86 is defined before building ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/edb4349e3a75
branches:  trunk
changeset: 471508:edb4349e3a75
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Mon Mar 29 00:30:16 2004 +0000

description:
Make sure X11_TYPE=XFree86 is defined before building X11 packages,
this will fix wrong binary packages made by bulk builds.

diffstat:

 fonts/XFree86-fontsEncodings/Makefile        |  3 ++-
 fonts/XFree86-fontsEncodings/Makefile.common |  3 ++-
 fonts/XFree86-fontsScalable/Makefile         |  3 ++-
 meta-pkgs/XFree86/Makefile.common            |  8 +++++++-
 x11/XFree86-clients/Makefile                 |  3 ++-
 x11/XFree86-server/Makefile                  |  3 ++-
 6 files changed, 17 insertions(+), 6 deletions(-)

diffs (105 lines):

diff -r d1573185ce34 -r edb4349e3a75 fonts/XFree86-fontsEncodings/Makefile
--- a/fonts/XFree86-fontsEncodings/Makefile     Sun Mar 28 23:35:57 2004 +0000
+++ b/fonts/XFree86-fontsEncodings/Makefile     Mon Mar 29 00:30:16 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/03/28 22:06:15 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2004/03/29 00:30:16 xtraeme Exp $
 
 DISTNAME=      XFree86-4.4.0-src-4
 PKGNAME=       XFree86-fontsEncodings-${XF_VER}
@@ -13,6 +13,7 @@
 DEPENDS=       XFree86-clients>=4.4.0:../../x11/XFree86-clients
 
 NO_XFREE86_TARGETS=    # defined
+CHECK_X11_TYPE=                # defined
 WRKSRC=                        ${WRKDIR}/xc/fonts/encodings
 
 post-extract:
diff -r d1573185ce34 -r edb4349e3a75 fonts/XFree86-fontsEncodings/Makefile.common
--- a/fonts/XFree86-fontsEncodings/Makefile.common      Sun Mar 28 23:35:57 2004 +0000
+++ b/fonts/XFree86-fontsEncodings/Makefile.common      Mon Mar 29 00:30:16 2004 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile.common,v 1.1 2004/03/28 22:11:32 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.2 2004/03/29 00:30:16 xtraeme Exp $
 #
 # Makefile fragment used by XFree86-fonts* packages.
 
 NO_BUILDLINK=  # defined
 USE_LANGUAGES= # empty
+CHECK_X11_TYPE=        # defined
 
 DEPENDS+=      XFree86-fontsEncodings>=4.4.0:../../fonts/XFree86-fontsEncodings
 FILESDIR=      ${.CURDIR}/../../fonts/XFree86-fontsEncodings/files
diff -r d1573185ce34 -r edb4349e3a75 fonts/XFree86-fontsScalable/Makefile
--- a/fonts/XFree86-fontsScalable/Makefile      Sun Mar 28 23:35:57 2004 +0000
+++ b/fonts/XFree86-fontsScalable/Makefile      Mon Mar 29 00:30:16 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/03/28 22:06:15 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2004/03/29 00:30:16 xtraeme Exp $
 
 DISTNAME=      ${DISTFILES}
 PKGNAME=       XFree86-fontsScalable-${XF_VER}
@@ -16,6 +16,7 @@
 NO_BUILDLINK=          # defined
 USE_LANGUAGES=         # empty
 NO_XFREE86_TARGETS=    # defined
+CHECK_X11_TYPE=                # defined
 
 FONT_TYPES=            Speedo TTF Type1
 
diff -r d1573185ce34 -r edb4349e3a75 meta-pkgs/XFree86/Makefile.common
--- a/meta-pkgs/XFree86/Makefile.common Sun Mar 28 23:35:57 2004 +0000
+++ b/meta-pkgs/XFree86/Makefile.common Mon Mar 29 00:30:16 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2004/03/28 22:06:16 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.6 2004/03/29 00:30:17 xtraeme Exp $
 #
 # XBUILD_DIRS is the group of directories under ${WRKSRC} that will 
 #   be built in.
@@ -114,6 +114,12 @@
 PLIST_SUBST+=  MISCMAN_DIR=${MISCMAN_DIR}
 PLIST_SUBST+=  MISCMAN_SUFFIX=${MISCMAN_SUFFIX}
 
+.if defined(CHECK_X11_TYPE)
+.    if !defined(X11_TYPE) || empty(X11_TYPE:MXFree86)
+PKG_FAIL_REASON+=       "X11_TYPE=XFree86 is mandatory."
+.    endif
+.endif
+
 NO_MTREE=              # defined
 
 X11ROOT_PREFIX?=       X11R6
diff -r d1573185ce34 -r edb4349e3a75 x11/XFree86-clients/Makefile
--- a/x11/XFree86-clients/Makefile      Sun Mar 28 23:35:57 2004 +0000
+++ b/x11/XFree86-clients/Makefile      Mon Mar 29 00:30:16 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/03/28 22:06:15 xtraeme Exp $
+# $NetBSD: Makefile,v 1.8 2004/03/29 00:30:16 xtraeme Exp $
 
 DISTNAME=              ${DISTFILES}
 PKGNAME=               XFree86-clients-${XF_VER}
@@ -13,6 +13,7 @@
 
 USE_X11=               yes
 USE_BUILDLINK3=                yes
+CHECK_X11_TYPE=                # defined
 DISTINFO_FILE=         ${.CURDIR}/../../x11/XFree86-libs/distinfo
 PATCHDIR=              ${.CURDIR}/../../x11/XFree86-libs/patches
 
diff -r d1573185ce34 -r edb4349e3a75 x11/XFree86-server/Makefile
--- a/x11/XFree86-server/Makefile       Sun Mar 28 23:35:57 2004 +0000
+++ b/x11/XFree86-server/Makefile       Mon Mar 29 00:30:16 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/03/28 22:06:16 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2004/03/29 00:30:17 xtraeme Exp $
 
 DISTNAME=              ${DISTFILES}
 PKGNAME=               XFree86-server-${XF_VER}
@@ -13,6 +13,7 @@
 
 USE_X11=               yes
 USE_BUILDLINK3=                yes
+CHECK_X11_TYPE=                # defined
 DISTINFO_FILE=         ${.CURDIR}/../../x11/XFree86-libs/distinfo
 PATCHDIR=              ${.CURDIR}/../../x11/XFree86-libs/patches