[pkgsrc/trunk]: pkgsrc <x11>/Makefile.common should be included before dirs.m...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a8d5f39e7b7e
branches:  trunk
changeset: 478792:a8d5f39e7b7e
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Fri Jul 30 11:24:38 2004 +0000

description:
<x11>/Makefile.common should be included before dirs.mk to have
X11ROOT defined! (hi jmmv).

Bump version to 1.1, both XFree86-dirs and xorg-dirs.

diffstat:

 doc/CHANGES                |  4 +++-
 misc/XFree86-dirs/Makefile |  5 +++--
 misc/XFree86-dirs/dirs.mk  |  3 +--
 misc/xorg-dirs/Makefile    |  5 +++--
 misc/xorg-dirs/dirs.mk     |  3 +--
 5 files changed, 11 insertions(+), 9 deletions(-)

diffs (91 lines):

diff -r 4167ec560a18 -r a8d5f39e7b7e doc/CHANGES
--- a/doc/CHANGES       Fri Jul 30 10:16:52 2004 +0000
+++ b/doc/CHANGES       Fri Jul 30 11:24:38 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.6731 2004/07/30 05:23:37 minskim Exp $
+$NetBSD: CHANGES,v 1.6732 2004/07/30 11:24:38 xtraeme Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -3646,3 +3646,5 @@
        Updated uvscan to 4.24.1 [wiz 2004-07-29]
        Added m1-0.7.4c [wiz 2004-07-29]
        Updated alee-ttf to 0.4 [minskim 2004-07-30]
+       Updated XFree86-dirs to 1.1 [xtraeme 2004-07-30]
+       Updated xorg-dirs to 1.1 [xtraeme 2004-07-30]
diff -r 4167ec560a18 -r a8d5f39e7b7e misc/XFree86-dirs/Makefile
--- a/misc/XFree86-dirs/Makefile        Fri Jul 30 10:16:52 2004 +0000
+++ b/misc/XFree86-dirs/Makefile        Fri Jul 30 11:24:38 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2004/04/19 21:53:06 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2004/07/30 11:24:38 xtraeme Exp $
 #
 
-DISTNAME=      XFree86-dirs-1.0
+DISTNAME=      XFree86-dirs-1.1
 CATEGORIES=    misc
 MASTER_SITES=  # empty
 DISTFILES=     # empty
@@ -20,6 +20,7 @@
 WRKSRC=                        ${WRKDIR}
 
 XFREE86_ONLY_DIRS=     # defined
+.include "../../meta-pkgs/XFree86/Makefile.common"
 .include "../../mk/bsd.prefs.mk"
 .include "dirs.mk"
 
diff -r 4167ec560a18 -r a8d5f39e7b7e misc/XFree86-dirs/dirs.mk
--- a/misc/XFree86-dirs/dirs.mk Fri Jul 30 10:16:52 2004 +0000
+++ b/misc/XFree86-dirs/dirs.mk Fri Jul 30 11:24:38 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.2 2004/04/17 11:10:53 jmmv Exp $
+# $NetBSD: dirs.mk,v 1.3 2004/07/30 11:24:38 xtraeme Exp $
 #
 
 .if !defined(DIRS_XFREE86_MK)
@@ -6,7 +6,6 @@
 
 oldval:=               ${XFREE86_ONLY_DIRS}
 XFREE86_ONLY_DIRS:=    YES
-.include "../../meta-pkgs/XFree86/Makefile.common"
 XFREE86_ONLY_DIRS:=    ${oldval}
 .undef oldval
 
diff -r 4167ec560a18 -r a8d5f39e7b7e misc/xorg-dirs/Makefile
--- a/misc/xorg-dirs/Makefile   Fri Jul 30 10:16:52 2004 +0000
+++ b/misc/xorg-dirs/Makefile   Fri Jul 30 11:24:38 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/29 07:26:03 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/07/30 11:24:38 xtraeme Exp $
 #
 
-DISTNAME=      xorg-dirs-1.0
+DISTNAME=      xorg-dirs-1.1
 CATEGORIES=    misc
 MASTER_SITES=  # empty
 DISTFILES=     # empty
@@ -20,6 +20,7 @@
 WRKSRC=                        ${WRKDIR}
 
 XORG_ONLY_DIRS=                # defined
+.include "../../meta-pkgs/xorg/Makefile.common"
 .include "../../mk/bsd.prefs.mk"
 .include "dirs.mk"
 
diff -r 4167ec560a18 -r a8d5f39e7b7e misc/xorg-dirs/dirs.mk
--- a/misc/xorg-dirs/dirs.mk    Fri Jul 30 10:16:52 2004 +0000
+++ b/misc/xorg-dirs/dirs.mk    Fri Jul 30 11:24:38 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.1.1.1 2004/07/29 07:26:03 xtraeme Exp $
+# $NetBSD: dirs.mk,v 1.2 2004/07/30 11:24:38 xtraeme Exp $
 #
 
 .if !defined(DIRS_XORG_MK)
@@ -6,7 +6,6 @@
 
 oldval:=               ${XORG_ONLY_DIRS}
 XORG_ONLY_DIRS:=       YES
-.include "../../meta-pkgs/xorg/Makefile.common"
 XORG_ONLY_DIRS:=       ${oldval}
 .undef oldval