Remove USE_DIRS from pkgsrc.

Shared directories can now be created independently by the pacakges
needing them and will be removed automatically by pkg_delete when empty.

Packages needing empty directories can use the @pkgdir command in PLIST.

Discussed and ok'd in thread starting at
http://mail-index.netbsd.org/tech-pkg/2009/06/30/msg003546.html

39 files changed, 39 insertions, 78 deletions

diff --git a/x11/Xaw-Xpm/Makefile b/x11/Xaw-Xpm/Makefile
index 9f226ed407f..630fb9cb562 100644
--- a/x11/Xaw-Xpm/Makefile
+++ b/x11/Xaw-Xpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2008/06/12 02:14:56 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2009/07/22 09:01:51 wiz Exp $
 #
 
 DISTNAME=		Xaw-XPM-1.1
@@ -16,7 +16,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 CONFLICTS=		Xaw3d-[0-9]*
 
 WRKSRC=			${WRKDIR}/XawXpm
-USE_DIRS+=		xdg-1.1
 USE_IMAKE=		YES
 PLIST_SRC=		${WRKDIR}/.PLIST_SRC
 
diff --git a/x11/alacarte/Makefile b/x11/alacarte/Makefile
index 3258cb3ee2d..a668d8f0d72 100644
--- a/x11/alacarte/Makefile
+++ b/x11/alacarte/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2009/07/08 08:44:36 abs Exp $
+# $NetBSD: Makefile,v 1.19 2009/07/22 09:01:52 wiz Exp $
 #
 
 DISTNAME=	alacarte-0.12.1
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	intltool perl pkg-config gmake msgfmt
-USE_DIRS+=	xdg-1.1
 
 PYTHON_VERSIONS_ACCEPTED=	26 25 24
 PY_PATCHPLIST=	yes
diff --git a/x11/driconf/Makefile b/x11/driconf/Makefile
index f4520b40da1..1f2a13a0738 100644
--- a/x11/driconf/Makefile
+++ b/x11/driconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/02/09 22:56:28 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2009/07/22 09:01:52 wiz Exp $
 #
 
 DISTNAME=	driconf-0.9.1
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 DEPENDS+= 	${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 DEPENDS+= 	xdriinfo>=1.0.2:../../x11/xdriinfo
 
-USE_DIRS+=		xdg-1.4
 USE_PKGLOCALEDIR= 	yes
 USE_TOOLS+=		msgfmt msgmerge xgettext
 
diff --git a/x11/fast-user-switch-applet/Makefile b/x11/fast-user-switch-applet/Makefile
index 292542a2018..a89c9ac0fe3 100644
--- a/x11/fast-user-switch-applet/Makefile
+++ b/x11/fast-user-switch-applet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2009/03/26 16:49:45 roy Exp $
+# $NetBSD: Makefile,v 1.24 2009/07/22 09:01:52 wiz Exp $
 #
 
 DISTNAME=	fast-user-switch-applet-2.24.0
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 DEPENDS+=		gdm>=2.16.0:../../x11/gdm
 
 GNU_CONFIGURE=		yes
-USE_DIRS+=		gnome2-1.6
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index d49406701e6..e75e7ee8bc3 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.151 2009/04/07 11:40:20 drochner Exp $
+# $NetBSD: Makefile,v 1.152 2009/07/22 09:01:52 wiz Exp $
 #
 
 DISTNAME=	gdm-2.20.10
@@ -14,7 +14,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 DEPENDS+=	zenity>=2.16.0:../../x11/zenity
 
-USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 27e3eb02f8a..dc280f8552d 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2009/07/09 18:07:01 drochner Exp $
+# $NetBSD: Makefile,v 1.75 2009/07/22 09:01:52 wiz Exp $
 #
 
 DISTNAME=		gnome-applets-2.26.3
@@ -16,7 +16,6 @@ BUILD_DEPENDS+=		gst-plugins0.10-esound>=0.10.0:../../audio/gst-plugins0.10-esou
 BUILD_DEPENDS+=		gst-plugins0.10-oss>=0.10.0:../../audio/gst-plugins0.10-oss
 
 GNU_CONFIGURE=		yes
-USE_DIRS+=		gnome2-1.5
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
diff --git a/x11/gnome-control-center/Makefile b/x11/gnome-control-center/Makefile
index 690c39f01b4..50b9d7de6b4 100644
--- a/x11/gnome-control-center/Makefile
+++ b/x11/gnome-control-center/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2009/03/22 19:01:41 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2009/07/22 09:01:52 wiz Exp $
 #
 
 DISTNAME=	gnome-control-center-2.26.0
@@ -13,7 +13,6 @@ COMMENT=	GNOME2 configuration utility
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
-USE_DIRS+=		gnome2-1.6
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LIBTOOL=		yes
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index c82ff4f32fa..78470e7060d 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2009/07/09 17:50:16 drochner Exp $
+# $NetBSD: Makefile,v 1.95 2009/07/22 09:01:52 wiz Exp $
 #
 
 DISTNAME=		gnome-desktop-2.26.3
@@ -13,7 +13,6 @@ COMMENT=		Common GNOME2 desktop files and libgnome-desktop library
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
-USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake intltool msgfmt perl:run pkg-config
 USE_TOOLS+=		automake autoconf aclocal autoreconf m4
diff --git a/x11/gnome-mag/Makefile b/x11/gnome-mag/Makefile
index 651d7af117c..f59a3b813d5 100644
--- a/x11/gnome-mag/Makefile
+++ b/x11/gnome-mag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2009/05/19 08:59:38 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2009/07/22 09:01:52 wiz Exp $
 #
 
 DISTNAME=		gnome-mag-0.15.6
@@ -13,7 +13,6 @@ LICENSE=		gnu-lgpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_DIRS+=		gnome2-1.5
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 48157ed58a1..ace77a013d9 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.112 2009/07/09 17:54:37 drochner Exp $
+# $NetBSD: Makefile,v 1.113 2009/07/22 09:01:52 wiz Exp $
 #
 
 DISTNAME=		gnome-panel-2.26.3
@@ -17,7 +17,6 @@ CONF_FILES+=	${PREFIX}/share/examples/gnome-panel/org.gnome.ClockApplet.Mechanis
 		${PKG_SYSCONFDIR}/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
 
 GNU_CONFIGURE=		YES
-USE_DIRS+=		gnome2-1.5
 USE_TOOLS+=		gmake intltool msgfmt perl:run pkg-config
 USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index eda7fa7d1eb..00b51455782 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2009/05/19 08:59:38 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2009/07/22 09:01:52 wiz Exp $
 #
 
 DISTNAME=	gnome-screensaver-2.26.1
@@ -15,7 +15,6 @@ BUILD_DEPENDS+=	xmlto-[0-9]*:../../textproc/xmlto
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
-USE_DIRS+=		xdg-1.3
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 018836c590a..32d4aff68d0 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.114 2009/07/09 18:02:54 drochner Exp $
+# $NetBSD: Makefile,v 1.115 2009/07/22 09:01:53 wiz Exp $
 #
 
 DISTNAME=		gnome-session-2.26.2
@@ -20,7 +20,6 @@ CONFLICTS+=		gnome-core<1.4.2nb4
 
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 GNU_CONFIGURE=		yes
-USE_DIRS+=		gnome2-1.5
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake intltool msgfmt perl pkg-config
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 7a61ab0aa65..0c57e8436ab 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2009/07/09 18:42:35 drochner Exp $
+# $NetBSD: Makefile,v 1.25 2009/07/22 09:01:53 wiz Exp $
 #
 
 DISTNAME=		gnome-terminal-2.26.3.1
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 CONFLICTS=		gnome-core-[0-9]* gnome2-terminal-[0-9]*
 
 GNU_CONFIGURE=		YES
-USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
 USE_TOOLS+=		gmake intltool msgfmt perl pkg-config
 USE_LIBTOOL=		YES
diff --git a/x11/gnome-themes-extras/Makefile b/x11/gnome-themes-extras/Makefile
index f1046ff837c..54675c1d893 100644
--- a/x11/gnome-themes-extras/Makefile
+++ b/x11/gnome-themes-extras/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2008/08/20 23:46:43 bjs Exp $
+# $NetBSD: Makefile,v 1.40 2009/07/22 09:01:53 wiz Exp $
 #
 
 DISTNAME=	gnome-themes-extras-2.22.0
@@ -17,7 +17,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 EXTRACT_USING=		bsdtar
 
-USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
diff --git a/x11/gnome-themes/Makefile b/x11/gnome-themes/Makefile
index 4d00c4121d8..9b293857416 100644
--- a/x11/gnome-themes/Makefile
+++ b/x11/gnome-themes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2009/07/09 18:41:26 drochner Exp $
+# $NetBSD: Makefile,v 1.73 2009/07/22 09:01:53 wiz Exp $
 #
 
 DISTNAME=		gnome-themes-2.26.3.1
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 CONFLICTS+=		clearlooks-metacity-[0-9]*
 
-USE_DIRS+=		gnome2-1.5 theme-1.0 xdg-1.4
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/x11/gnopernicus/Makefile b/x11/gnopernicus/Makefile
index d52e8da1278..dc3c3bea115 100644
--- a/x11/gnopernicus/Makefile
+++ b/x11/gnopernicus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2009/03/08 15:56:48 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2009/07/22 09:01:53 wiz Exp $
 #
 
 DISTNAME=		gnopernicus-1.1.1
@@ -13,7 +13,6 @@ COMMENT=		Collection of accessibility apps for GNOME 2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_DIRS+=		gnome2-1.5
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
diff --git a/x11/grandr_applet/Makefile b/x11/grandr_applet/Makefile
index 658b6b1d2e0..678201ed8da 100644
--- a/x11/grandr_applet/Makefile
+++ b/x11/grandr_applet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/09/06 20:54:34 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2009/07/22 09:01:53 wiz Exp $
 #
 
 DISTNAME=	grandr_applet-0.4
@@ -16,7 +16,6 @@ GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		pkg-config gmake msgfmt
-USE_DIRS+=		xdg-1.1
 
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../x11/gnome-panel/buildlink3.mk"
diff --git a/x11/gtk-engines/Makefile b/x11/gtk-engines/Makefile
index fa3ebce4040..0ccfcc49ffc 100644
--- a/x11/gtk-engines/Makefile
+++ b/x11/gtk-engines/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2008/06/20 01:09:44 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2009/07/22 09:01:53 wiz Exp $
 
 DISTNAME=		gtk-engines-0.12
 PKGREVISION=		9
@@ -14,7 +14,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 CONFLICTS+=		gtk2-engines-*
 
 GNU_CONFIGURE=		yes
-USE_DIRS+=		xdg-1.1
 USE_X11BASE=		yes
 USE_LIBTOOL=		yes
 SHLIBTOOL_OVERRIDE=	# empty
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index 201179a9ebb..a3ea17c1195 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.124 2008/11/18 18:25:50 chuck Exp $
+# $NetBSD: Makefile,v 1.125 2009/07/22 09:01:53 wiz Exp $
 
 DISTNAME=		gtk+-1.2.10
 PKGREVISION=		9
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_DIRS+=		xdg-1.1
 USE_X11BASE=		yes
 USE_TOOLS+=		gmake msgfmt perl
 USE_PKGLOCALEDIR=	yes
diff --git a/x11/gtk2-engines-bluecurve/Makefile b/x11/gtk2-engines-bluecurve/Makefile
index 20ae3d10c41..4c72cb9b86b 100644
--- a/x11/gtk2-engines-bluecurve/Makefile
+++ b/x11/gtk2-engines-bluecurve/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2008/07/14 12:56:15 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2009/07/22 09:01:53 wiz Exp $
 #
 
 DISTNAME=	GTK2-Wonderland-Engine-1.0
@@ -15,7 +15,6 @@ COMMENT=	Port of the famous Bluecurve theme for GTK2+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
-USE_DIRS+=		xdg-1.1
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		yes
diff --git a/x11/gtk2-engines-murrine/Makefile b/x11/gtk2-engines-murrine/Makefile
index 4d93e02f53b..dc91ef990a0 100644
--- a/x11/gtk2-engines-murrine/Makefile
+++ b/x11/gtk2-engines-murrine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/03/20 18:36:59 hasso Exp $
+# $NetBSD: Makefile,v 1.4 2009/07/22 09:01:53 wiz Exp $
 
 DISTNAME=	murrine-0.90.2
 PKGNAME=	${DISTNAME:S/^/gtk2-engines-/}
@@ -13,7 +13,6 @@ COMMENT=	GTK2+ engine featuring a modern glassy look
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
-USE_DIRS+=		xdg-1.4
 USE_TOOLS+=		gmake pkg-config intltool msgfmt
 USE_LIBTOOL=		yes
 
diff --git a/x11/gtk2-engines/Makefile b/x11/gtk2-engines/Makefile
index 4698470a120..c5a314b322a 100644
--- a/x11/gtk2-engines/Makefile
+++ b/x11/gtk2-engines/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2009/05/19 23:22:10 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2009/07/22 09:01:54 wiz Exp $
 
 DISTNAME=		gtk-engines-2.18.2
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
@@ -23,7 +23,6 @@ BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.10.0
 
 USE_TOOLS+=		gmake intltool pkg-config msgfmt
 GNU_CONFIGURE=		yes
-USE_DIRS+=		theme-1.1 xdg-1.1
 USE_LIBTOOL=		yes
 
 CONFIGURE_ARGS+=	--enable-animation
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 4798f57903a..c0f8061d041 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.181 2009/07/18 19:19:55 wiz Exp $
+# $NetBSD: Makefile,v 1.182 2009/07/22 09:01:54 wiz Exp $
 
 DISTNAME=		gtk+-2.16.5
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
@@ -19,7 +19,6 @@ CONFLICTS+=		gail-[0-9]*
 
 SUPERSEDES=		gail-[0-9]*
 
-USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake msgfmt perl pkg-config
 USE_LANGUAGES=		c c++
diff --git a/x11/gtkstep/Makefile b/x11/gtkstep/Makefile
index 67003142bc0..3c5c6b560a4 100644
--- a/x11/gtkstep/Makefile
+++ b/x11/gtkstep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/10/04 22:06:57 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2009/07/22 09:01:54 wiz Exp $
 
 DISTNAME=		gtkstep-1.10
 PKGREVISION=		6
@@ -10,7 +10,6 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		# gone AWOL in 2001 or so
 COMMENT=		GTK theme-engine to yield a NEXTSTEP(tm) look and feel
 
-USE_DIRS+=		xdg-1.1
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index 41ef71affc6..fbeadf84fe7 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2009/03/15 14:49:01 jmcneill Exp $
+# $NetBSD: Makefile,v 1.15 2009/07/22 09:01:54 wiz Exp $
 #
 
 DISTNAME=	libgnomekbd-2.26.0
@@ -20,7 +20,6 @@ CONFIGURE_ENV+=	GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/
 MAKE_ENV+=	GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config intltool gmake msgfmt
-USE_DIRS+=	xdg-1.1
 
 GCONF_SCHEMAS+=	desktop_gnome_peripherals_keyboard_xkb.schemas
 PKGCONFIG_OVERRIDE+=	libgnomekbd.pc.in
diff --git a/x11/matchbox-panel-manager/Makefile b/x11/matchbox-panel-manager/Makefile
index 4297d11e707..09306098113 100644
--- a/x11/matchbox-panel-manager/Makefile
+++ b/x11/matchbox-panel-manager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2009/07/16 21:46:39 zafer Exp $
+# $NetBSD: Makefile,v 1.10 2009/07/22 09:01:54 wiz Exp $
 #
 
 DISTNAME=	matchbox-panel-manager-0.1
@@ -13,7 +13,6 @@ COMMENT=	Manager panel for the Matchbox desktop
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_DIRS+=	gnome2-1.5
 USE_TOOLS+=	pkg-config
 GNU_CONFIGURE=	yes
 
diff --git a/x11/matchbox-panel/Makefile b/x11/matchbox-panel/Makefile
index e240fd6ea21..5f17dd845a8 100644
--- a/x11/matchbox-panel/Makefile
+++ b/x11/matchbox-panel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/07/16 21:44:08 zafer Exp $
+# $NetBSD: Makefile,v 1.17 2009/07/22 09:01:54 wiz Exp $
 #
 
 DISTNAME=		matchbox-panel-0.9.2
@@ -13,7 +13,6 @@ COMMENT=		Panel for Matchbox
 
 BROKEN_GETTEXT_DETECTION=	yes
 
-USE_DIRS+=		gnome2-1.5
 USE_TOOLS+=		gmake msgfmt pkg-config
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
diff --git a/x11/matchbox-themes-extra/Makefile b/x11/matchbox-themes-extra/Makefile
index 83626ebb317..150a1e2d3f0 100644
--- a/x11/matchbox-themes-extra/Makefile
+++ b/x11/matchbox-themes-extra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/07/16 21:48:49 zafer Exp $
+# $NetBSD: Makefile,v 1.7 2009/07/22 09:01:54 wiz Exp $
 #
 
 DISTNAME=	matchbox-themes-extra-0.3
@@ -13,7 +13,6 @@ COMMENT=	Collection of themes for Matchbox
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_DIRS+=	gnome2-1.5 xdg-1.4
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/x11/tile/Makefile b/x11/tile/Makefile
index ba7fc6e4c51..64880502c77 100644
--- a/x11/tile/Makefile
+++ b/x11/tile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/07/07 18:18:11 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2009/07/22 09:01:54 wiz Exp $
 #
 
 DISTNAME=		tile_0.7.3
@@ -15,7 +15,6 @@ COMMENT=		X11 Window Tiler
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
-USE_DIRS+=		xdg-1.2
 GNU_CONFIGURE=		yes
 
 INSTALL_MAKE_FLAGS=	PREFIX=${DESTDIR}${PREFIX}
diff --git a/x11/vte/Makefile b/x11/vte/Makefile
index b59ef4b2d9a..e2a861eab76 100644
--- a/x11/vte/Makefile
+++ b/x11/vte/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2009/06/11 08:09:28 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2009/07/22 09:01:54 wiz Exp $
 #
 
 DISTNAME=	vte-0.20.5
@@ -13,7 +13,6 @@ LICENSE=	gnu-lgpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_DIRS+=		gnome2-1.2
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index 7d08603d7da..d4dc32e11ac 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2007/02/02 15:23:46 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2009/07/22 09:01:54 wiz Exp $
 
 DISTNAME=		wdm-1.28
 CATEGORIES=		x11 windowmaker
@@ -9,7 +9,6 @@ HOMEPAGE=		http://voins.program.ru/wdm/
 COMMENT=		WINGs display manager
 
 USE_TOOLS+=		msgfmt
-USE_DIRS+=		xdg-1.1
 USE_X11BASE=		YES
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
diff --git a/x11/x11vnc/Makefile b/x11/x11vnc/Makefile
index ec5b29a6089..5fd48906f1e 100644
--- a/x11/x11vnc/Makefile
+++ b/x11/x11vnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2009/07/09 11:17:10 obache Exp $
+# $NetBSD: Makefile,v 1.22 2009/07/22 09:01:55 wiz Exp $
 #
 
 DISTNAME=	x11vnc-0.9.8
@@ -12,7 +12,6 @@ LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_DIRS+=	xdg-1.1
 
 GNU_CONFIGURE=	yes
 
diff --git a/x11/xdesktopwaves/Makefile b/x11/xdesktopwaves/Makefile
index 8469430135b..c2cdd70506d 100644
--- a/x11/xdesktopwaves/Makefile
+++ b/x11/xdesktopwaves/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/07/07 17:56:35 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2009/07/22 09:01:55 wiz Exp $
 #
 
 DISTNAME=	xdesktopwaves-1.1
@@ -12,7 +12,6 @@ COMMENT=	Simulates water waves on the X Windows desktop
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_DIRS+=		xdg-1.1
 
 MAKE_FLAGS+=		CFLAGS=${CFLAGS:M*:Q}
 MAKE_FLAGS+=		LFLAGS=${LDFLAGS:M*:Q}
diff --git a/x11/xfce4-gtk2-engine/Makefile b/x11/xfce4-gtk2-engine/Makefile
index debef932399..dbe96c2e3ab 100644
--- a/x11/xfce4-gtk2-engine/Makefile
+++ b/x11/xfce4-gtk2-engine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/12/17 12:50:03 hira Exp $
+# $NetBSD: Makefile,v 1.11 2009/07/22 09:01:55 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -11,7 +11,6 @@ PKGNAME=	xfce4-gtk2-engine-${XFCE4_VERSION}
 CATEGORIES=	x11
 COMMENT=	Xfce GTK2 themes
 
-USE_DIRS+=	xdg-1.1
 
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-session/Makefile b/x11/xfce4-session/Makefile
index 0952167cac7..b9872304e06 100644
--- a/x11/xfce4-session/Makefile
+++ b/x11/xfce4-session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2008/12/19 23:58:18 hira Exp $
+# $NetBSD: Makefile,v 1.24 2009/07/22 09:01:55 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -26,7 +26,6 @@ OWN_DIRS+=              ${PKG_SYSCONFDIR}/xdg/xfce4-session
 OWN_DIRS+=              ${PKG_SYSCONFDIR}/xdg/autostart
 
 USE_TOOLS+=		iceauth:run
-USE_DIRS+=		xdg-1.4
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
diff --git a/x11/xpad/Makefile b/x11/xpad/Makefile
index 1c1c7de7958..86d3fd645be 100644
--- a/x11/xpad/Makefile
+++ b/x11/xpad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2008/07/14 12:56:20 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2009/07/22 09:01:55 wiz Exp $
 #
 
 DISTNAME=	xpad-1.12
@@ -14,7 +14,6 @@ COMMENT=	Sticky notes application in GTK 2
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
-USE_DIRS+=		xdg-1.1
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_PKGLOCALEDIR=	yes
 
diff --git a/x11/xscreensaver-demo/Makefile b/x11/xscreensaver-demo/Makefile
index 5f410ac2573..d853ecb83e4 100644
--- a/x11/xscreensaver-demo/Makefile
+++ b/x11/xscreensaver-demo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2009/07/07 17:28:04 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2009/07/22 09:01:55 wiz Exp $
 #
 
 PKGNAME=	${DISTNAME:S/-/-demo-/}
@@ -8,7 +8,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 CONFLICTS+=	xscreensaver<4.14 xscreensaver-gnome-[0-9]*
 
-USE_DIRS+=	xdg-1.1
 
 .include "../../x11/xscreensaver/Makefile.common"
 
diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile
index 808fbadf4fe..15c7811926e 100644
--- a/x11/xterm/Makefile
+++ b/x11/xterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2009/05/22 19:52:02 tnn Exp $
+# $NetBSD: Makefile,v 1.53 2009/07/22 09:01:55 wiz Exp $
 
 DISTNAME=	xterm-243
 CATEGORIES=	x11
@@ -13,7 +13,6 @@ COMMENT=	Latest terminal emulator for the X Window System
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
-USE_DIRS+=		xdg-1.4
 USE_TOOLS+=		tbl
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 2a583448b5f..7f69bae7f5b 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2009/03/16 23:00:17 jmcneill Exp $
+# $NetBSD: Makefile,v 1.56 2009/07/22 09:01:55 wiz Exp $
 #
 
 DISTNAME=	zenity-2.26.0
@@ -12,7 +12,6 @@ COMMENT=	Display GNOME dialogs from the command line
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake intltool msgfmt pkg-config