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

33 files changed, 33 insertions, 70 deletions

diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index df5a0b7b4c0..b50bb3ea16c 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2009/05/20 00:58:05 wiz Exp $
+# $NetBSD: Makefile,v 1.73 2009/07/22 09:01:17 wiz Exp $
 
 DISTNAME=		amarok-${VERSION}
 VERSION=		1.4.10
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 DEPENDS+=		unzip-[0-9]*:../../archivers/unzip
 
-USE_DIRS+=		xdg-1.1
 USE_TOOLS+=		gmake pkg-config msgfmt
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		yes
diff --git a/audio/audacious/Makefile b/audio/audacious/Makefile
index 94de0cc0397..0765007a07a 100644
--- a/audio/audacious/Makefile
+++ b/audio/audacious/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/11/11 12:36:58 hasso Exp $
+# $NetBSD: Makefile,v 1.5 2009/07/22 09:01:17 wiz Exp $
 #
 
 DISTNAME=		audacious-1.5.1
@@ -14,7 +14,6 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LIBTOOL=		yes
 USE_LANGUAGES=		c c++
-USE_DIRS+=		xdg-1.4
 
 CONFIGURE_ARGS+=	--enable-chardet --enable-nls
 
diff --git a/audio/bmp/Makefile.common b/audio/bmp/Makefile.common
index 65cee46b647..4df46d26bdb 100644
--- a/audio/bmp/Makefile.common
+++ b/audio/bmp/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2007/09/21 13:03:26 wiz Exp $
+# $NetBSD: Makefile.common,v 1.25 2009/07/22 09:01:17 wiz Exp $
 #
 
 DISTNAME=	bmp-0.9.7.1
@@ -17,7 +17,6 @@ PATCHFILES=		bmp-0.9.7-ipv6-simple.diff
 PATCH_DIST_STRIP+=	-p1
 
 GNU_CONFIGURE=		yes
-USE_DIRS+=		xdg-1.1
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		pkg-config
diff --git a/audio/bmpx/Makefile b/audio/bmpx/Makefile
index b3415dcab49..d44c3acbe1b 100644
--- a/audio/bmpx/Makefile
+++ b/audio/bmpx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2009/03/26 23:12:22 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2009/07/22 09:01:17 wiz Exp $
 #
 
 DISTNAME=	bmpx-0.40.14
@@ -15,7 +15,6 @@ DEPENDS+=	zip-[0-9]*:../../archivers/zip
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
-USE_DIRS+=		xdg-1.2 kde3-1.0
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LIBTOOL=		yes
diff --git a/audio/easytag-current/Makefile b/audio/easytag-current/Makefile
index b972c44c5e6..6e54512b288 100644
--- a/audio/easytag-current/Makefile
+++ b/audio/easytag-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/11/08 21:13:27 bjs Exp $
+# $NetBSD: Makefile,v 1.11 2009/07/22 09:01:17 wiz Exp $
 #
 
 DISTNAME=	easytag-2.1.6
@@ -14,7 +14,6 @@ COMMENT=	GTK+ tag editor for MP3, Ogg Vorbis files, and others (development vers
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
-USE_DIRS+=		xdg-1.1
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index e3ea224cbdc..c86d57950cc 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2009/02/24 16:16:24 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2009/07/22 09:01:17 wiz Exp $
 #
 
 DISTNAME=	easytag-2.1
@@ -14,7 +14,6 @@ COMMENT=	GTK+ tag editor for MP3, Ogg Vorbis files, and others
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
-USE_DIRS+=		xdg-1.1
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/audio/exaile/Makefile b/audio/exaile/Makefile
index 675142b3bc9..0c590daf50a 100644
--- a/audio/exaile/Makefile
+++ b/audio/exaile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/04/03 07:55:23 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2009/07/22 09:01:17 wiz Exp $
 #
 
 DISTNAME=	exaile_0.2.14
@@ -16,7 +16,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		pkg-config gmake intltool msgfmt
-USE_DIRS+=		xdg-1.1
 
 PYTHON_PATCH_SCRIPTS=	exaile.py
 MAKE_ENV+=	PYTHONBIN=${PYTHONBIN}
diff --git a/audio/gimmix/Makefile b/audio/gimmix/Makefile
index 791bee26a84..f12a3399657 100644
--- a/audio/gimmix/Makefile
+++ b/audio/gimmix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/05/30 01:39:09 obache Exp $
+# $NetBSD: Makefile,v 1.7 2009/07/22 09:01:17 wiz Exp $
 #
 
 DISTNAME=	gimmix-0.5.6.1
@@ -17,7 +17,6 @@ GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=	intltool gmake msgfmt pkg-config
-USE_DIRS+=	xdg-1.1
 
 # fixes broken symbolic link to /usr/share/intltool/Makefile.in.in
 post-extract:
diff --git a/audio/glurp/Makefile b/audio/glurp/Makefile
index 6d86953b467..83b58351157 100644
--- a/audio/glurp/Makefile
+++ b/audio/glurp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/06/20 01:09:05 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2009/07/22 09:01:17 wiz Exp $
 #
 
 DISTNAME=	glurp-0.11.6
@@ -13,7 +13,6 @@ COMMENT=	Graphical GTK+2-based client for musicpd
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
-USE_DIRS+=	xdg-1.1
 USE_TOOLS+=	intltool pkg-config
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/audio/gmpc/Makefile b/audio/gmpc/Makefile
index afb41ba297b..6006e05d4af 100644
--- a/audio/gmpc/Makefile
+++ b/audio/gmpc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2009/05/30 01:25:19 obache Exp $
+# $NetBSD: Makefile,v 1.31 2009/07/22 09:01:18 wiz Exp $
 #
 
 DISTNAME=		gmpc-0.18.0
@@ -18,7 +18,6 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		intltool msgfmt pkg-config gmake
 PKGCONFIG_OVERRIDE=	data/gmpc.pc.in
 
-USE_DIRS+=		xdg-1.1
 
 .include "options.mk"
 
diff --git a/audio/gnome-audio/Makefile b/audio/gnome-audio/Makefile
index ac26257ea90..ac3d1563a0f 100644
--- a/audio/gnome-audio/Makefile
+++ b/audio/gnome-audio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2008/05/29 17:15:59 drochner Exp $
+# $NetBSD: Makefile,v 1.21 2009/07/22 09:01:18 wiz Exp $
 #
 
 DISTNAME=	gnome-audio-2.22.2
@@ -14,7 +14,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
-USE_DIRS+=	xdg-1.4
 USE_TOOLS+=	gmake
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile
index 38968c3adcf..ae51f897665 100644
--- a/audio/gqmpeg-devel/Makefile
+++ b/audio/gqmpeg-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2009/01/12 21:12:40 shattered Exp $
+# $NetBSD: Makefile,v 1.19 2009/07/22 09:01:18 wiz Exp $
 
 DISTNAME=		gqmpeg-0.91.1
 PKGREVISION=		6
@@ -16,8 +16,6 @@ DEPENDS+=		vorbis-tools>=1.0.0.6:../../audio/vorbis-tools
 DEPENDS+=		xmp>=2.0.2:../../audio/xmp
 
 USE_TOOLS+=		msgfmt pkg-config
-USE_DIRS+=		gnome2-1.5
-USE_DIRS+=		xdg-1.2
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index 06531cb0795..775756d2e55 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2009/01/12 21:12:40 shattered Exp $
+# $NetBSD: Makefile,v 1.95 2009/07/22 09:01:18 wiz Exp $
 
 DISTNAME=		gqmpeg-0.20.0
 PKGREVISION=		11
@@ -16,8 +16,6 @@ DEPENDS+=		vorbis-tools>=1.0.0.6:../../audio/vorbis-tools
 DEPENDS+=		xmp>=2.0.2:../../audio/xmp
 
 USE_TOOLS+=		msgfmt
-USE_DIRS+=		gnome1-1.5
-USE_DIRS+=		xdg-1.2
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 
diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile
index 25bbd110a6c..1ce1277e55e 100644
--- a/audio/gtkpod/Makefile
+++ b/audio/gtkpod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2009/07/14 19:29:44 hasso Exp $
+# $NetBSD: Makefile,v 1.25 2009/07/22 09:01:18 wiz Exp $
 #
 
 DISTNAME=	gtkpod-0.99.14
@@ -12,7 +12,6 @@ COMMENT=	GUI for iPod using GTK2
 
 GNU_CONFIGURE=		yes
 
-USE_DIRS=		xdg-1.4
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		intltool gmake lex msgfmt perl:run pkg-config
@@ -33,8 +32,6 @@ DEPENDS+=		bash>=3.2.9:../../shells/bash
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.4.0
 BUILDLINK_API_DEPENDS.libgpod+=	libgpod>=0.4.2
 
-USE_DIRS+=		xdg-1.4
-
 .include "options.mk"
 
 .include "../../audio/libgpod/buildlink3.mk"
diff --git a/audio/jack-rack/Makefile b/audio/jack-rack/Makefile
index 83ebd12ff4d..cc3bf436a5a 100644
--- a/audio/jack-rack/Makefile
+++ b/audio/jack-rack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/08/19 20:32:12 bjs Exp $
+# $NetBSD: Makefile,v 1.2 2009/07/22 09:01:18 wiz Exp $
 #
 
 DISTNAME=	jack-rack-1.4.7
@@ -13,7 +13,6 @@ COMMENT=	Effects "rack" for JACK
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
-USE_DIRS+=		xdg-1.4
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake msgfmt pkg-config
diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile
index d5891a26018..d18473d4f91 100644
--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/03/02 16:29:31 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2009/07/22 09:01:18 wiz Exp $
 #
 
 DISTNAME=	libcanberra-0.11
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config gmake
-USE_DIRS+=	gnome2-1.5
 GCONF_SCHEMAS+=	libcanberra.schemas
 
 PKGCONFIG_OVERRIDE+=	libcanberra-gtk.pc.in
diff --git a/audio/liteamp/Makefile b/audio/liteamp/Makefile
index ec97dd7c0d7..f4b8c787460 100644
--- a/audio/liteamp/Makefile
+++ b/audio/liteamp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2008/07/14 12:55:57 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2009/07/22 09:01:18 wiz Exp $
 
 DISTNAME=	liteamp-0.2.4.2
 PKGREVISION=	13
@@ -11,7 +11,6 @@ COMMENT=	Light-weight Music Player for GNOME2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_DIRS+=		gnome2-1.5
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake intltool msgfmt perl pkg-config
 USE_PKGLOCALEDIR=	yes
diff --git a/audio/padevchooser/Makefile b/audio/padevchooser/Makefile
index 62122ae74d2..d1948253044 100644
--- a/audio/padevchooser/Makefile
+++ b/audio/padevchooser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/12/20 18:38:30 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3 2009/07/22 09:01:18 wiz Exp $
 #
 
 DISTNAME=	padevchooser-0.9.3
@@ -15,7 +15,6 @@ GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS=	pkg-config gmake
 USE_LIBTOOL=	yes
-USE_DIRS+=	gnome2-1.5
 
 CONFIGURE_ARGS+=	--disable-lynx
 
diff --git a/audio/paman/Makefile b/audio/paman/Makefile
index cefb88b82a5..83e67f3d641 100644
--- a/audio/paman/Makefile
+++ b/audio/paman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/05/19 07:04:44 abs Exp $
+# $NetBSD: Makefile,v 1.3 2009/07/22 09:01:18 wiz Exp $
 #
 
 DISTNAME=	paman-0.9.4
@@ -12,7 +12,6 @@ COMMENT=	GTK frontend for the PulseAudio sound server
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 GNU_CONFIGURE=	yes
-USE_DIRS=	gnome2-1.5
 USE_TOOLS+=	pkg-config gmake
 USE_LANGUAGES=	c++
 
diff --git a/audio/paprefs/Makefile b/audio/paprefs/Makefile
index 0cc4dcf7639..943d9605d0f 100644
--- a/audio/paprefs/Makefile
+++ b/audio/paprefs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/05/31 15:59:03 abs Exp $
+# $NetBSD: Makefile,v 1.4 2009/07/22 09:01:19 wiz Exp $
 #
 
 DISTNAME=	paprefs-0.9.7
@@ -12,7 +12,6 @@ COMMENT=	Configuration dialog for the PulseAudio sound server
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config gmake intltool perl msgfmt
-USE_DIRS+=	gnome2-1.5
 
 CONFIGURE_ARGS+=	--disable-lynx
 
diff --git a/audio/pavucontrol/Makefile b/audio/pavucontrol/Makefile
index 9e0df97a28f..80bbc53f345 100644
--- a/audio/pavucontrol/Makefile
+++ b/audio/pavucontrol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/05/31 16:07:19 abs Exp $
+# $NetBSD: Makefile,v 1.4 2009/07/22 09:01:19 wiz Exp $
 #
 
 DISTNAME=	pavucontrol-0.9.7
@@ -12,7 +12,6 @@ COMMENT=	Volume control tool ("mixer") for the PulseAudio sound server
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config gmake intltool perl msgfmt
-USE_DIRS+=	gnome2-1.5
 
 CONFIGURE_ARGS+=	--disable-lynx
 
diff --git a/audio/pavumeter/Makefile b/audio/pavumeter/Makefile
index d63a21ea653..469ad936d1e 100644
--- a/audio/pavumeter/Makefile
+++ b/audio/pavumeter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/05/31 16:08:47 abs Exp $
+# $NetBSD: Makefile,v 1.3 2009/07/22 09:01:19 wiz Exp $
 #
 
 DISTNAME=	pavumeter-0.9.3
@@ -12,7 +12,6 @@ COMMENT=	Volume meter for the PulseAudio sound server
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config gmake intltool perl
-USE_DIRS+=	gnome2-1.5
 
 CONFIGURE_ARGS+=	--disable-lynx
 
diff --git a/audio/picard/Makefile b/audio/picard/Makefile
index 5d788247105..6948bcda909 100644
--- a/audio/picard/Makefile
+++ b/audio/picard/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/07/18 14:58:17 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2009/07/22 09:01:19 wiz Exp $
 #
 
 DISTNAME=	picard-0.11
@@ -12,7 +12,6 @@ LICENSE=	gnu-gpl-v2
 
 USE_LANGUAGES=	c c++
 PYDISTUTILSPKG=	yes
-USE_DIRS+=	xdg-1.1
 PKG_DESTDIR_SUPPORT= user-destdir
 
 USE_TOOLS+=	msgfmt
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index d9d0ae06bc0..45bad68416f 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2009/07/05 10:42:53 obache Exp $
+# $NetBSD: Makefile,v 1.25 2009/07/22 09:01:19 wiz Exp $
 
 # NOTE: Please send a copy of any patches that are not pkgsrc-specific
 # to <pulseaudio-discuss@mail.0pointer.de>
@@ -18,7 +18,6 @@ GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config gmake m4 msgfmt intltool perl \
 		autoconf automake autoreconf
-USE_DIRS+=	xdg-1.4
 
 AUTOCONF_REQD=	2.62
 
diff --git a/audio/py-karaoke/Makefile b/audio/py-karaoke/Makefile
index 0b54bdf2fa0..9b98a1c31f9 100644
--- a/audio/py-karaoke/Makefile
+++ b/audio/py-karaoke/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/07/14 09:02:41 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2009/07/22 09:01:19 wiz Exp $
 #
 
 DISTNAME=	pykaraoke-0.6
@@ -16,7 +16,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 # for .kar files, untested for lack of files
 #DEPENDS+=	timidity-[0-9]*:../../audio/timidity
 
-USE_DIRS+=	xdg-1.4
 PYTHON_VERSIONS_ACCEPTED=	25 24
 PYDISTUTILSPKG=	yes
 
diff --git a/audio/qjackctl/Makefile b/audio/qjackctl/Makefile
index ece9f034483..ea4a469241b 100644
--- a/audio/qjackctl/Makefile
+++ b/audio/qjackctl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/07/31 04:02:40 bjs Exp $
+# $NetBSD: Makefile,v 1.4 2009/07/22 09:01:19 wiz Exp $
 #
 
 DISTNAME=	qjackctl-0.3.3
@@ -12,7 +12,6 @@ COMMENT=	JACK Audio Connection Kit Qt4 GUI
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_DIRS+=	xdg-1.4
 
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 9309ab2b556..9a89bb63b26 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2009/06/04 11:44:24 drochner Exp $
+# $NetBSD: Makefile,v 1.66 2009/07/22 09:01:19 wiz Exp $
 #
 
 DISTNAME=	rhythmbox-0.12.2
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 .include "options.mk"
 
 GNU_CONFIGURE=		YES
-USE_DIRS+=		gnome2-1.5
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index 2f331845be4..b92ed85f306 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2009/07/08 13:55:58 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2009/07/22 09:01:19 wiz Exp $
 #
 
 DISTNAME=		solfege-3.14.1
@@ -12,7 +12,6 @@ COMMENT=		Practice several musical ear training exercises
 BUILD_DEPENDS+=		docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 BUILD_DEPENDS+=		txt2man-[0-9]*:../../converters/txt2man
 
-USE_DIRS+=		xdg-1.2
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
diff --git a/audio/sonata/Makefile b/audio/sonata/Makefile
index 0a05caf1d7b..1f945f02a6f 100644
--- a/audio/sonata/Makefile
+++ b/audio/sonata/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/05/26 18:24:58 drochner Exp $
+# $NetBSD: Makefile,v 1.11 2009/07/22 09:01:20 wiz Exp $
 #
 
 DISTNAME=	sonata-1.6.2
@@ -17,7 +17,6 @@ DEPENDS+=	musicpd>0:../../audio/musicpd
 PYTHON_VERSIONS_ACCEPTED=	25 24
 PY_PATCHPLIST=	yes
 PYDISTUTILSPKG=	yes
-USE_DIRS+=	xdg-1.4
 USE_TOOLS+=	pkg-config msgfmt
 
 # gtk threading bugfix
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 6878203e494..b8a2a418cad 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2009/04/07 10:38:54 drochner Exp $
+# $NetBSD: Makefile,v 1.23 2009/07/22 09:01:20 wiz Exp $
 #
 
 DISTNAME=		sound-juicer-2.26.0
@@ -14,7 +14,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_DIRS=		xdg-1.4 gnome2-1.6
 USE_TOOLS+=		gmake pkg-config intltool msgfmt
 USE_LANGUAGES=		c c++
 
diff --git a/audio/sound-theme-freedesktop/Makefile b/audio/sound-theme-freedesktop/Makefile
index ecfa4d09d2a..5b4aa635474 100644
--- a/audio/sound-theme-freedesktop/Makefile
+++ b/audio/sound-theme-freedesktop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/12/15 10:43:13 hasso Exp $
+# $NetBSD: Makefile,v 1.3 2009/07/22 09:01:20 wiz Exp $
 #
 
 DISTNAME=	sound-theme-freedesktop-0.2
@@ -13,7 +13,6 @@ COMMENT=	Set of audio files for FreeDesktop
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
-USE_DIRS+=	xdg-1.4
 USE_TOOLS+=	gmake intltool msgfmt
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index 7c145e7814d..8a0d53ef946 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2009/03/08 15:56:43 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2009/07/22 09:01:20 wiz Exp $
 #
 
 DISTNAME=	streamtuner-0.99.99
@@ -14,7 +14,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 BUILD_DEPENDS+=	hicolor-icon-theme-[0-9]*:../../graphics/hicolor-icon-theme
 
-USE_DIRS+=		gnome2-1.5
 USE_TOOLS+=		gmake msgfmt pkg-config intltool
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index 2e9f4ed41ba..ff5eebad8c6 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2009/02/21 13:22:43 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2009/07/22 09:01:20 wiz Exp $
 #
 
 DISTNAME=	sweep-0.9.3
@@ -12,7 +12,6 @@ COMMENT=	Full-featured digital sound editor
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_DIRS+=		xdg-1.1
 USE_LIBTOOL=		YES
 USE_TOOLS+=		gmake msgfmt pkg-config
 USE_PKGLOCALEDIR=	YES