[pkgsrc/trunk]: pkgsrc Fix broken includes. Pointed out by kristerw@.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bab241c83ed9
branches:  trunk
changeset: 473194:bab241c83ed9
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Sat Apr 17 11:10:53 2004 +0000

description:
Fix broken includes.  Pointed out by kristerw@.

diffstat:

 meta-pkgs/XFree86/Makefile.common |  6 +++---
 misc/XFree86-dirs/Makefile        |  3 +--
 misc/XFree86-dirs/dirs.mk         |  8 ++++++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diffs (61 lines):

diff -r e1db4d6f6ff6 -r bab241c83ed9 meta-pkgs/XFree86/Makefile.common
--- a/meta-pkgs/XFree86/Makefile.common Sat Apr 17 11:08:12 2004 +0000
+++ b/meta-pkgs/XFree86/Makefile.common Sat Apr 17 11:10:53 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2004/04/14 21:15:01 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.8 2004/04/17 11:10:53 jmmv Exp $
 #
 # XBUILD_DIRS is the group of directories under ${WRKSRC} that will 
 #   be built in.
@@ -98,7 +98,7 @@
 
 .endif # NetBSD
 
-.if !defined(XFREE86_ONLY_DIRS)
+.if !defined(XFREE86_ONLY_DIRS) || empty(XFREE86_ONLY_DIRS:M[Yy][Ee][Ss])
 
 PLIST_SUBST+=  XTHRSTUB_MINOR=${XTHRSTUB_MINOR}
 PLIST_SUBST+=  LIBXTHRSTUB=${LIBXTHRSTUB}
@@ -256,6 +256,6 @@
 
 .endif # NO_XFREE86_TARGETS
 
-.endif # !defined(XFREE86_ONLY_DIRS)
+.endif # !defined(XFREE86_ONLY_DIRS) || empty(XFREE86_ONLY_DIRS:M[Yy][Ee][Ss])
 
 .endif # !defined(XFREE86_MAKEFILE_COMMON)
diff -r e1db4d6f6ff6 -r bab241c83ed9 misc/XFree86-dirs/Makefile
--- a/misc/XFree86-dirs/Makefile        Sat Apr 17 11:08:12 2004 +0000
+++ b/misc/XFree86-dirs/Makefile        Sat Apr 17 11:10:53 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/04/14 21:15:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/04/17 11:10:53 jmmv Exp $
 #
 
 DISTNAME=      XFree86-dirs-1.0
@@ -29,5 +29,4 @@
 
 do-install:    # nothing
 
-.include "Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff -r e1db4d6f6ff6 -r bab241c83ed9 misc/XFree86-dirs/dirs.mk
--- a/misc/XFree86-dirs/dirs.mk Sat Apr 17 11:08:12 2004 +0000
+++ b/misc/XFree86-dirs/dirs.mk Sat Apr 17 11:10:53 2004 +0000
@@ -1,10 +1,14 @@
-# $NetBSD: dirs.mk,v 1.1 2004/04/14 21:15:01 jmmv Exp $
+# $NetBSD: dirs.mk,v 1.2 2004/04/17 11:10:53 jmmv Exp $
 #
 
 .if !defined(DIRS_XFREE86_MK)
 DIRS_XFREE86_MK=       # defined
 
-.include "../../misc/XFree86-dirs/Makefile.common"
+oldval:=               ${XFREE86_ONLY_DIRS}
+XFREE86_ONLY_DIRS:=    YES
+.include "../../meta-pkgs/XFree86/Makefile.common"
+XFREE86_ONLY_DIRS:=    ${oldval}
+.undef oldval
 
 XFREE86_DIRS=          bin
 XFREE86_DIRS+=         include