Remove USE_DIRS infrastructure support and support packages.

See http://mail-index.netbsd.org/pkgsrc-changes/2009/07/22/msg026834.html.

2 files changed, 1 insertions, 85 deletions

diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk
index a5d7d65408c..fe2188e47b9 100644
--- a/mk/bsd.pkg.use.mk
+++ b/mk/bsd.pkg.use.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.use.mk,v 1.47 2008/05/16 20:00:09 tnn Exp $
+#	$NetBSD: bsd.pkg.use.mk,v 1.48 2009/07/22 09:05:24 wiz Exp $
 #
 # Turn USE_* macros into proper depedency logic.  Included near the top of
 # bsd.pkg.mk, after bsd.prefs.mk.
@@ -81,13 +81,6 @@ CRYPTO?=		uses Kerberos encryption code
 BUILD_DEFS+=		KERBEROS
 .endif
 
-### USE_DIRS
-
-USE_DIRS?=		# empty
-.if !empty(USE_DIRS) && ${PKG_INSTALLATION_TYPE} == "overwrite"
-.  include "dirs.mk"
-.endif
-
 ### USE_LIBTOOL, PKG_[SH]LIBTOOL
 
 #
diff --git a/mk/dirs.mk b/mk/dirs.mk
deleted file mode 100644
index 7d0c81a43e9..00000000000
--- a/mk/dirs.mk
+++ /dev/null
@@ -1,77 +0,0 @@
-# $NetBSD: dirs.mk,v 1.14 2008/11/03 10:31:46 markd Exp $
-#
-
-.if !defined(DIRS_MK)
-DIRS_MK=		# defined
-
-_USE_GNOME1_DIRS=	# empty
-_USE_GNOME2_DIRS=	# empty
-_USE_KDE3_DIRS=		# empty
-_USE_KDE4_DIRS=		# empty
-_USE_TEXMF_DIRS=	# empty
-_USE_THEME_DIRS=	# empty
-_USE_XDG_DIRS=		# empty
-_USE_XDG_X11_DIRS=	# empty
-_USE_XFREE86_DIRS=	# empty
-
-.for dir in ${USE_DIRS}
-pkg:=			${dir:C/-[^-]*$//}
-ver:=			${dir:C/^.*-//}
-
-.  if ${pkg} == "gnome1" && ${_USE_GNOME1_DIRS} < ${ver}
-_USE_GNOME1_DIRS:=	${ver}
-.  elif ${pkg} == "gnome2" && ${_USE_GNOME2_DIRS} < ${ver}
-_USE_GNOME2_DIRS:=	${ver}
-.  elif ${pkg} == "kde3" && ${_USE_KDE3_DIRS} < ${ver}
-_USE_KDE3_DIRS:=	${ver}
-.  elif ${pkg} == "kde4" && ${_USE_KDE4_DIRS} < ${ver}
-_USE_KDE4_DIRS:=	${ver}
-.  elif ${pkg} == "texmf" && ${_USE_TEXMF_DIRS} < ${ver}
-_USE_TEXMF_DIRS:=	${ver}
-.  elif ${pkg} == "theme" && ${_USE_THEME_DIRS} < ${ver}
-_USE_THEME_DIRS:=	${ver}
-.  elif ${pkg} == "xdg" && ${_USE_XDG_DIRS} < ${ver} && !defined(USE_X11BASE)
-_USE_XDG_DIRS:=		${ver}
-.  elif ${pkg} == "xdg-x11" && ${_USE_XDG_X11_DIRS} < ${ver} && \
-	defined(USE_X11BASE)
-_USE_XDG_X11_DIRS:=	${ver}
-.  endif
-
-.endfor
-.undef ver
-.undef pkg
-.undef dir
-
-.if !empty(_USE_GNOME1_DIRS)
-.  include "../../misc/gnome1-dirs/dirs.mk"
-.endif
-
-.if !empty(_USE_GNOME2_DIRS)
-.  include "../../misc/gnome2-dirs/dirs.mk"
-.endif
-
-.if !empty(_USE_KDE3_DIRS)
-.  include "../../misc/kde3-dirs/dirs.mk"
-.endif
-
-.if !empty(_USE_KDE4_DIRS)
-.  include "../../misc/kde4-dirs/dirs.mk"
-.endif
-
-.if !empty(_USE_TEXMF_DIRS)
-.  include "../../print/texmf-dirs/dirs.mk"
-.endif
-
-.if !empty(_USE_THEME_DIRS)
-.  include "../../misc/theme-dirs/dirs.mk"
-.endif
-
-.if !empty(_USE_XDG_DIRS)
-.  include "../../misc/xdg-dirs/dirs.mk"
-.endif
-
-.if !empty(_USE_XDG_X11_DIRS)
-.  include "../../misc/xdg-x11-dirs/dirs.mk"
-.endif
-
-.endif # !defined(DIRS_MK)