[pkgsrc/trunk]: pkgsrc Depend on xorg-dirs where appropiate, as was done for ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d2f4ed7a6d5b
branches:  trunk
changeset: 478755:d2f4ed7a6d5b
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Thu Jul 29 07:27:43 2004 +0000

description:
Depend on xorg-dirs where appropiate, as was done for XFree86 by jmmv@.

diffstat:

 meta-pkgs/xorg/Makefile |  3 ++-
 mk/dirs.mk              |  9 ++++++++-
 x11/xorg-imake/Makefile |  3 ++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diffs (69 lines):

diff -r 96d0865b469a -r d2f4ed7a6d5b meta-pkgs/xorg/Makefile
--- a/meta-pkgs/xorg/Makefile   Thu Jul 29 07:26:31 2004 +0000
+++ b/meta-pkgs/xorg/Makefile   Thu Jul 29 07:27:43 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/29 04:48:33 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/07/29 07:27:43 xtraeme Exp $
 
 DISTNAME=      # empty
 PKGNAME=       xorg-${XORG_VER}
@@ -28,6 +28,7 @@
 NO_CHECKSUM=           # defined
 NO_MTREE=              # defined
 NO_XORG_TARGETS=       # defined
+USE_DIRS+=             xorg-1.0
 NO_CONFIGURE=          # defined
 
 do-install:
diff -r 96d0865b469a -r d2f4ed7a6d5b mk/dirs.mk
--- a/mk/dirs.mk        Thu Jul 29 07:26:31 2004 +0000
+++ b/mk/dirs.mk        Thu Jul 29 07:27:43 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.3 2004/04/14 21:15:01 jmmv Exp $
+# $NetBSD: dirs.mk,v 1.4 2004/07/29 07:27:43 xtraeme Exp $
 #
 
 .if !defined(DIRS_MK)
@@ -9,6 +9,7 @@
 _USE_XDG_DIRS=         # empty
 _USE_XDG_X11_DIRS=     # empty
 _USE_XFREE86_DIRS=     # empty
+_USE_XORG_DIRS=                # empty
 
 .for dir in ${USE_DIRS}
 pkg:=                  ${dir:C/-[^-]*$//}
@@ -24,6 +25,8 @@
 _USE_XDG_X11_DIRS:=    ${ver}
 .  elif ${pkg} == "xdg" && ${_USE_XFREE86_DIRS} < ${ver}
 _USE_XFREE86_DIRS:=    ${ver}
+.  elif ${pkg} == "xdg" && ${_USE_XORG_DIRS} < ${ver}
+_USE_XORG_DIRS:=       ${ver}
 .  endif
 
 .endfor
@@ -51,4 +54,8 @@
 .  include "../../misc/XFree86-dirs/dirs.mk"
 .endif
 
+.if !empty(_USE_XORG_DIRS)
+.  include "../../misc/xorg-dirs/dirs.mk"
+.endif
+
 .endif # !defined(DIRS_MK)
diff -r 96d0865b469a -r d2f4ed7a6d5b x11/xorg-imake/Makefile
--- a/x11/xorg-imake/Makefile   Thu Jul 29 07:26:31 2004 +0000
+++ b/x11/xorg-imake/Makefile   Thu Jul 29 07:27:43 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/07/29 06:36:34 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2004/07/29 07:27:43 xtraeme Exp $
 
 DISTNAME=      ${DISTFILES}
 PKGNAME=       xorg-imake-${XORG_VER}
@@ -13,6 +13,7 @@
 PKG_INSTALLATION_TYPES= overwrite pkgviews
 
 USE_BUILDLINK3=                yes
+USE_DIRS+=             xorg-1.0
 INSTALL_TARGET=                install install.man
 NO_XORG_TARGETS=       # defined