summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2004-04-14 21:15:01 +0000
committerjmmv <jmmv@pkgsrc.org>2004-04-14 21:15:01 +0000
commitebf2fd7dbc86b70243eadec6caad1006e298a6d5 (patch)
tree1af10ef7d20a24c1a87709a2854374e5f63d92e8 /mk
parent207bf54a21e9ef949fb7f2fa783cac5d4d6137ef (diff)
downloadpkgsrc-ebf2fd7dbc86b70243eadec6caad1006e298a6d5.tar.gz
Add support for the XFree86-dirs package in mk/dirs.mk, by modifying it to
work properly with it. Agreed with xtraeme@.
Diffstat (limited to 'mk')
-rw-r--r--mk/dirs.mk9
1 files changed, 8 insertions, 1 deletions
diff --git a/mk/dirs.mk b/mk/dirs.mk
index 0894d751113..53dcd07851c 100644
--- a/mk/dirs.mk
+++ b/mk/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.2 2004/04/14 19:30:22 jmmv Exp $
+# $NetBSD: dirs.mk,v 1.3 2004/04/14 21:15:01 jmmv Exp $
#
.if !defined(DIRS_MK)
@@ -8,6 +8,7 @@ _USE_GNOME1_DIRS= # empty
_USE_GNOME2_DIRS= # empty
_USE_XDG_DIRS= # empty
_USE_XDG_X11_DIRS= # empty
+_USE_XFREE86_DIRS= # empty
.for dir in ${USE_DIRS}
pkg:= ${dir:C/-[^-]*$//}
@@ -21,6 +22,8 @@ _USE_GNOME2_DIRS:= ${ver}
_USE_XDG_DIRS:= ${ver}
. elif ${pkg} == "xdg" && ${_USE_XDG_X11_DIRS} < ${ver} && defined(USE_X11BASE)
_USE_XDG_X11_DIRS:= ${ver}
+. elif ${pkg} == "xdg" && ${_USE_XFREE86_DIRS} < ${ver}
+_USE_XFREE86_DIRS:= ${ver}
. endif
.endfor
@@ -44,4 +47,8 @@ _USE_XDG_X11_DIRS:= ${ver}
. include "../../misc/xdg-x11-dirs/dirs.mk"
.endif
+.if !empty(_USE_XFREE86_DIRS)
+. include "../../misc/XFree86-dirs/dirs.mk"
+.endif
+
.endif # !defined(DIRS_MK)